@momo-kits/native-kits 0.157.4-debug → 0.157.5-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.4-debug"
+        version = "0.157.5-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.157.4
+version=0.157.5
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

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 {
+            if isFocused && !secureTextEntry {
                 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 {
-                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,104 @@ 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
+        if textField.keyboardType != keyboardType {
+            textField.keyboardType = keyboardType
+            textField.reloadInputViews()
+        }
+    }
+
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.157.4-debug",
+  "version": "0.157.5-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},