@momo-kits/native-kits 0.156.4-debug → 0.156.5-debug

package/compose/build.gradle.kts

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

package/compose/src/commonMain/kotlin/vn/momo/kits/components/PopupPromotion.kt

@@ -50,7 +50,7 @@ fun PopupPromotion(
                         indication = null,
                         onClick = onPress
                     ),
-                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Crop)
+                options = Options(alignment =  Alignment.Center, contentScale = ContentScale.Fit)
             ), null
         )
         Box(

package/gradle.properties

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

package/ios/Button/Button.swift

@@ -106,11 +106,12 @@ extension ButtonSize {
         }
     }
 
-    var font: Font {
+    var typographyStyle: TypographyStyle {
         switch self {
-        case .large: return .system(size: 16, weight: .bold)
-        case .medium: return .system(size: 14, weight: .bold)
-        case .small: return .system(size: 12, weight: .bold)
+        case .large: return .actionDefaultBold
+        case .medium: return .actionSBold
+        case .small: return .actionXsBold
+        default : return .actionDefaultBold
         }
     }
 }
@@ -180,9 +181,7 @@ public struct Button: View {
                     iconLeft.frame(width: size.iconSize, height: size.iconSize)
                 }
 
-                Text(title)
-                    .font(size.font)
-                    .foregroundColor(fg)
+                MomoText(title, typography: size.typographyStyle, color: fg)
                     .lineLimit(1)
                     .truncationMode(.tail)
 

package/ios/Input/Input.swift

@@ -1,5 +1,6 @@
 import Foundation
 import SwiftUI
+import Combine
 
 public struct Input: View {
     @Binding public var text: String
@@ -31,7 +32,7 @@ public struct Input: View {
     
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
-    @FocusState private var isTextFieldFocused: Bool
+    @State private var lastTextValue: String = ""
     
     public init(
         text: Binding<String>,
@@ -89,6 +90,22 @@ public struct Input: View {
 
     // MARK: - Body
     public var body: some 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)
+            }
+        )
+        
         VStack(alignment: .leading, spacing: 4) {
             ZStack(alignment: .topLeading) {
                 // Floating label
@@ -127,34 +144,35 @@ public struct Input: View {
                         }
                         
                         if secureTextEntry && isPasswordHidden {
-                            SecureField("", text: $text, onCommit: {})
-                                .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
-                                .foregroundColor(getTextColor())
-                                .disabled(disabled || readOnly)
-                                .applyPrimaryCursorColor()
-                                .focused($isTextFieldFocused)
-                                .onChange(of: text) { newValue in
-                                    onChangeText?(newValue)
-                                }
+                            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()
+                            })
                         } else {
-                            TextField("", text: $text, onEditingChanged: { focused in
+                            TextField("", text: textBinding, onEditingChanged: { focused in
                                 handleFocusChange(focused)
                             })
-                            .keyboardType(secureTextEntry ? .default : keyboardType)
+                            .keyboardType(keyboardType)
                             .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
-                            .focused($isTextFieldFocused)
-                            .onChange(of: text) { newValue in
-                                onChangeText?(newValue)
-                            }
                         }
                     }
                     
                     // Clear button (only show when focused and has text)
                     if isFocused && !text.isEmpty {
-                        SwiftUI.Button(action: { text = "" }) {
+                        SwiftUI.Button(action: {
+                            text = ""
+                            onChangeText?("")
+                        }) {
                             Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
                                 .padding(.leading, Spacing.S)
                         }
@@ -169,13 +187,15 @@ public struct Input: View {
                     
                     // Right icon (password toggle or custom icon)
                     if secureTextEntry {
-                        SwiftUI.Button(action: togglePasswordVisibility) {
-                            Icon(
-                                source: isPasswordHidden ? "24_security_eye_off" : "24_security_eye_open",
-                                size: 24,
-                                color: rightIconColor
-                            )
-                            .padding(.leading, Spacing.S)
+                        if !text.isEmpty {
+                            SwiftUI.Button(action: togglePasswordVisibility) {
+                                Icon(
+                                    source: isPasswordHidden ? "24_security_eye_off" : "24_security_eye_open",
+                                    size: 24,
+                                    color: rightIconColor
+                                )
+                                .padding(.leading, Spacing.S)
+                            }
                         }
                     } else if !rightIcon.isEmpty {
                         SwiftUI.Button(action: { onRightIconPressed?() }) {
@@ -204,18 +224,26 @@ public struct Input: View {
             )
         }
         .onAppear {
-            if autofocus {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    isTextFieldFocused = true
+            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)
+                    }
                 }
             }
         }
-        .onChange(of: isTextFieldFocused) { newValue in
-            isFocused = newValue
-            if newValue {
-                onFocus?()
-            } else {
-                onBlur?()
+        .onReceive(NotificationCenter.default.publisher(for: UITextField.textDidEndEditingNotification)) { _ in
+            // Reset focus when any text field ends editing
+            if isFocused && secureTextEntry {
+                DispatchQueue.main.async {
+                    self.handleSecureFieldBlur()
+                }
             }
         }
     }
@@ -224,7 +252,6 @@ public struct Input: View {
     
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
-        isTextFieldFocused = focused
         if focused {
             onFocus?()
         } else {
@@ -232,6 +259,18 @@ public struct Input: View {
         }
     }
     
+    private func handleSecureFieldFocus() {
+        if !isFocused {
+            isFocused = true
+            onFocus?()
+        }
+    }
+    
+    private func handleSecureFieldBlur() {
+        isFocused = false
+        onBlur?()
+    }
+    
     private func togglePasswordVisibility() {
         isPasswordHidden.toggle()
         onRightIconPressed?()

package/ios/Input/InputPhoneNumber.swift

@@ -6,7 +6,6 @@
 //
 
 import SwiftUI
-
 public struct InputPhoneNumber: View {
     @Binding public var text: String
     
@@ -18,12 +17,12 @@ public struct InputPhoneNumber: View {
     public var rightIcon: String
     public var rightIconColor: Color
     public var autofocus: Bool
+    public var onChangeText: ((String) -> Void)?
     public var onFocus: (() -> Void)?
     public var onBlur: (() -> Void)?
     public var onRightIconPressed: (() -> Void)?
     
     @State private var isFocused: Bool = false
-    @FocusState private var isTextFieldFocused: Bool
     
     public init(
         text: Binding<String>,
@@ -36,6 +35,7 @@ public struct InputPhoneNumber: View {
         rightIcon: String = "",
         rightIconColor: Color = Colors.black12,
         autofocus: Bool = false,
+        onChangeText: ((String) -> Void)? = nil,
         onFocus: (() -> Void)? = nil,
         onBlur: (() -> Void)? = nil,
         onRightIconPressed: (() -> Void)? = nil
@@ -49,6 +49,7 @@ public struct InputPhoneNumber: View {
         self.rightIcon = rightIcon
         self.rightIconColor = rightIconColor
         self.autofocus = autofocus
+        self.onChangeText = onChangeText
         self.onFocus = onFocus
         self.onBlur = onBlur
         self.onRightIconPressed = onRightIconPressed
@@ -56,6 +57,14 @@ public struct InputPhoneNumber: View {
     
     // MARK: - Body
     public var body: some View {
+        let textBinding = Binding<String>(
+            get: { self.text },
+            set: { newValue in
+                self.text = newValue
+                self.onChangeText?(newValue)
+            }
+        )
+        
         VStack(alignment: .leading, spacing: 4) {
             HStack(spacing: 0) {
                 // 🇻🇳 Flag
@@ -77,7 +86,7 @@ public struct InputPhoneNumber: View {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
-                    TextField("", text: $text, onEditingChanged: { focused in
+                    TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
                     .keyboardType(.numberPad)
@@ -85,13 +94,14 @@ public struct InputPhoneNumber: View {
                     .foregroundColor(Colors.black17)
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
-                    .focused($isTextFieldFocused)
-                    
                 }
                 
                 // Clear button
                 if isFocused && !text.isEmpty {
-                    SwiftUI.Button(action: { text = "" }) {
+                    SwiftUI.Button(action: {
+                        text = ""
+                        onChangeText?("")
+                    }) {
                         Icon(source: "24_navigation_close_circle_full", size: 16, color: Colors.black12)
                             .padding(.leading, Spacing.S)
                     }
@@ -129,21 +139,12 @@ public struct InputPhoneNumber: View {
                 hintText: hintText
             )
         }
-        .onAppear {
-            if autofocus {
-                // Small delay to ensure the view is fully loaded
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    isTextFieldFocused = true
-                }
-            }
-        }
     }
     
     // MARK: - Helpers
     
     private func handleFocusChange(_ focused: Bool) {
         isFocused = focused
-        isTextFieldFocused = focused
         if focused {
             onFocus?()
         } else {

package/package.json

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