@momo-kits/native-kits 0.157.0 → 0.157.1-beta.10-debug

package/ios/Input/Input.swift

@@ -32,7 +32,6 @@ public struct Input: View {
     
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
-    @State private var lastTextValue: String = ""
     
     public init(
         text: Binding<String>,
@@ -93,14 +92,6 @@ public struct Input: View {
         let textBinding = Binding<String>(
             get: { self.text },
             set: { newValue in
-                // For SecureField, infer focus when text changes
-                if self.secureTextEntry && !self.isFocused && newValue != self.lastTextValue {
-                    DispatchQueue.main.async {
-                        self.isFocused = true
-                        self.onFocus?()
-                    }
-                }
-                self.lastTextValue = newValue
                 self.text = newValue
                 self.onChangeText?(newValue)
             }
@@ -144,17 +135,18 @@ public struct Input: View {
                         }
                         
                         if secureTextEntry && isPasswordHidden {
-                            SecureField("", text: textBinding, onCommit: {
-                                handleSecureFieldBlur()
-                            })
-                            .keyboardType(keyboardType)
-                            .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
-                            .foregroundColor(getTextColor())
-                            .disabled(disabled || readOnly)
-                            .applyPrimaryCursorColor()
-                            .simultaneousGesture(TapGesture().onEnded {
-                                handleSecureFieldFocus()
-                            })
+                            SecureInputField(
+                                text: $text,
+                                keyboardType: keyboardType,
+                                fontSize: scaleSize(14),
+                                fontWeight: fontWeight == .bold ? .bold : .regular,
+                                textColor: UIColor(getTextColor()),
+                                isDisabled: disabled || readOnly,
+                                onFocusChange: { focused in
+                                    handleFocusChange(focused)
+                                },
+                                onChangeText: onChangeText
+                            )
                         } else {
                             TextField("", text: textBinding, onEditingChanged: { focused in
                                 handleFocusChange(focused)
@@ -223,26 +215,10 @@ public struct Input: View {
                 hintText: hintText
             )
         }
-        .onAppear {
-            lastTextValue = text
-        }
         .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { _ in
-            // Reset focus when keyboard is dismissed
-            if isFocused {
-                DispatchQueue.main.async {
-                    if secureTextEntry {
-                        handleSecureFieldBlur()
-                    } else {
-                        handleFocusChange(false)
-                    }
-                }
-            }
-        }
-        .onReceive(NotificationCenter.default.publisher(for: UITextField.textDidEndEditingNotification)) { _ in
-            // Reset focus when any text field ends editing
-            if isFocused && secureTextEntry {
+            if isFocused && !secureTextEntry {
                 DispatchQueue.main.async {
-                    self.handleSecureFieldBlur()
+                    handleFocusChange(false)
                 }
             }
         }
@@ -259,18 +235,6 @@ public struct Input: View {
         }
     }
     
-    private func handleSecureFieldFocus() {
-        if !isFocused {
-            isFocused = true
-            onFocus?()
-        }
-    }
-    
-    private func handleSecureFieldBlur() {
-        isFocused = false
-        onBlur?()
-    }
-    
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()
@@ -307,6 +271,100 @@ public struct Input: View {
 }
 
 
+// MARK: - Secure Input Field (UIViewRepresentable)
+private struct SecureInputField: UIViewRepresentable {
+    @Binding var text: String
+    var keyboardType: UIKeyboardType
+    var fontSize: CGFloat
+    var fontWeight: UIFont.Weight
+    var textColor: UIColor
+    var isDisabled: Bool
+    var onFocusChange: (Bool) -> Void
+    var onChangeText: ((String) -> Void)?
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(self)
+    }
+
+    func makeUIView(context: Context) -> UITextField {
+        let textField = UITextField()
+        textField.isSecureTextEntry = true
+        textField.delegate = context.coordinator
+        textField.keyboardType = keyboardType
+        textField.font = UIFont.systemFont(ofSize: fontSize, weight: fontWeight)
+        textField.textColor = textColor
+        textField.isEnabled = !isDisabled
+        textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
+        textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        textField.text = text
+        textField.tintColor = UIColor(Colors.primary)
+        textField.addTarget(
+            context.coordinator,
+            action: #selector(Coordinator.textFieldDidChange(_:)),
+            for: .editingChanged
+        )
+        return textField
+    }
+
+    func updateUIView(_ textField: UITextField, context: Context) {
+        if textField.text != text {
+            textField.text = text
+        }
+        textField.isEnabled = !isDisabled
+    }
+
+    class Coordinator: NSObject, UITextFieldDelegate {
+        var parent: SecureInputField
+        private var isResettingText = false
+
+        init(_ parent: SecureInputField) {
+            self.parent = parent
+        }
+
+        func textFieldDidBeginEditing(_ textField: UITextField) {
+            let existingText = textField.text ?? ""
+            if !existingText.isEmpty {
+                // When a secure text field regains focus, iOS marks the
+                // existing text as "committed". The next keystroke would
+                // replace ALL committed text with the new character.
+                // Prevent this by clearing and re-inserting via insertText(),
+                // which puts the text into an "active editing" state.
+                isResettingText = true
+                textField.text = ""
+                textField.insertText(existingText)
+                isResettingText = false
+            }
+            parent.onFocusChange(true)
+        }
+
+        func textFieldDidEndEditing(_ textField: UITextField) {
+            parent.text = textField.text ?? ""
+            parent.onFocusChange(false)
+        }
+
+        func textField(
+            _ textField: UITextField,
+            shouldChangeCharactersIn range: NSRange,
+            replacementString string: String
+        ) -> Bool {
+            if isResettingText { return true }
+            return true
+        }
+
+        @objc func textFieldDidChange(_ textField: UITextField) {
+            if isResettingText { return }
+            let newText = textField.text ?? ""
+            parent.text = newText
+            parent.onChangeText?(newText)
+        }
+
+        func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+            textField.resignFirstResponder()
+            return true
+        }
+    }
+}
+
 // MARK: - Helper Extension
 private extension View {
     func applyPrimaryCursorColor() -> some View {

package/ios/Input/InputPhoneNumber.swift

@@ -89,7 +89,7 @@ public struct InputPhoneNumber: View {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
-                    TextField(placeholder, text: textBinding, onEditingChanged: { focused in
+                    TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
                     .keyboardType(.numberPad)
@@ -98,6 +98,7 @@ public struct InputPhoneNumber: View {
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
                     .accessibility(identifier: accessibilityLabel ?? "")
+                    .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
                 }
                 
                 // Clear button

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Jan 09 10:43:10 ICT 2025
+sdk.dir=/Users/sophia/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.157.0",
+  "version": "0.157.1-beta.10-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish.sh

@@ -185,7 +185,32 @@ phase_publish_maven() {
     
     ./gradlew :compose:publishAllPublicationsToGitLabPackagesRepository
     
-    echo "✅ Maven publishing completed successfully!"
+    echo "✅ compose Maven publishing completed successfully!"
+    
+    echo "📦 Publishing sample/shared KMP artifacts to Maven (version ${VERSION})..."
+    
+    # Temporarily remove composeResources and compose { resources { ... } } block
+    echo "📦 Backing up sample/shared composeResources and build.gradle.kts..."
+    if [ -d "sample/shared/src/commonMain/composeResources" ]; then
+        mv sample/shared/src/commonMain/composeResources sample/shared/src/commonMain/composeResources.backup
+    fi
+    cp sample/shared/build.gradle.kts sample/shared/build.gradle.kts.backup
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        sed -i '' '/^compose {$/,/^}$/d' sample/shared/build.gradle.kts
+    else
+        sed -i '/^compose {$/,/^}$/d' sample/shared/build.gradle.kts
+    fi
+    
+    ./gradlew :sample:shared:publishAllPublicationsToGitLabPackagesRepository
+    
+    # Restore composeResources and build.gradle.kts
+    echo "📦 Restoring sample/shared composeResources and build.gradle.kts..."
+    mv sample/shared/build.gradle.kts.backup sample/shared/build.gradle.kts
+    if [ -d "sample/shared/src/commonMain/composeResources.backup" ]; then
+        mv sample/shared/src/commonMain/composeResources.backup sample/shared/src/commonMain/composeResources
+    fi
+    
+    echo "✅ sample/shared Maven publishing completed successfully!"
     echo "✅ PHASE 2 COMPLETED"
     echo ""
 }

package/settings.gradle.kts

@@ -0,0 +1,52 @@
+import org.gradle.kotlin.dsl.maven
+
+rootProject.name = "momo-native-kits"
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+pluginManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        }
+        maven {
+            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google {
+            mavenContent {
+                includeGroupAndSubgroups("androidx")
+                includeGroupAndSubgroups("com.android")
+                includeGroupAndSubgroups("com.google")
+            }
+        }
+        mavenCentral()
+        maven {
+            url = uri("https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven")
+            credentials {username = "download_packages"; password = "gldt-bjDqLpU_sPcHDuXau2ws" }
+        }
+        maven {
+            url = uri("http://nexus.mservice.com.vn:8081/repository/maven-public/")
+            isAllowInsecureProtocol = true
+        }
+    }
+}
+
+include(":compose")
+
+include(":sample:androidApp")
+include(":sample:shared")