@momo-kits/native-kits 0.160.5-debug → 0.160.6-debug

package/compose/build.gradle.kts

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

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

@@ -221,6 +221,7 @@ fun Input(
     onBlur: () -> Unit = {},
     loading: Boolean = false,
     required: Boolean = false,
+    maxLength: Int? = null,
     fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
@@ -319,7 +320,10 @@ fun Input(
                         onBlur()
                     }
                 },
-            onValueChange = onChangeText,
+            onValueChange = { newText ->
+                val limitedText = maxLength?.let { newText.take(it) } ?: newText
+                onChangeText(limitedText)
+            },
             decorationBox = { innerTextField ->
                 // Floating label
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {

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

@@ -129,8 +129,9 @@ fun InputOTP(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            decorationBox = { _ ->
+            decorationBox = { innerTextField ->
                 Box {
+                    Box(modifier = Modifier.size(0.dp)) { innerTextField() }
                     if (floatingValue.isNotEmpty()) {
                         Box(
                             modifier = Modifier.wrapContentSize()

package/gradle.properties

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

package/ios/Input/Input.swift

@@ -22,6 +22,7 @@ public struct Input: View {
     public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
+    public var maxLength: Int?
     public var fontWeight: InputFontWeight
     public var keyboardType: UIKeyboardType
     public var autofocus: Bool
@@ -52,6 +53,7 @@ public struct Input: View {
         leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
+        maxLength: Int? = nil,
         fontWeight: InputFontWeight = .regular,
         keyboardType: UIKeyboardType = .default,
         autofocus: Bool = false,
@@ -78,6 +80,7 @@ public struct Input: View {
         self.leadingIconColor = leadingIconColor
         self.loading = loading
         self.required = required
+        self.maxLength = maxLength
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
         self.autofocus = autofocus
@@ -93,10 +96,10 @@ public struct Input: View {
             get: { self.text },
             set: { newValue in
                 self.text = newValue
-                self.onChangeText?(newValue)
+                self.onChangeText?(limitText(newValue))
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             ZStack(alignment: .topLeading) {
                 // Floating label
@@ -142,6 +145,7 @@ public struct Input: View {
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
                                 isDisabled: disabled || readOnly,
+                                maxLength: maxLength,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -156,6 +160,12 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
+                            .onChange(of: text) { newValue in
+                                let limited = limitText(newValue)
+                                if limited != newValue {
+                                    text = limited
+                                }
+                            }
                         }
                     }
                     
@@ -239,6 +249,13 @@ public struct Input: View {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
+
+    private func limitText(_ value: String) -> String {
+        guard let maxLength = maxLength else {
+            return value
+        }
+        return String(value.prefix(maxLength))
+    }
     
     private func borderColor() -> Color {
         if disabled {
@@ -279,6 +296,7 @@ private struct SecureInputField: UIViewRepresentable {
     var fontWeight: UIFont.Weight
     var textColor: UIColor
     var isDisabled: Bool
+    var maxLength: Int?
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -307,6 +325,7 @@ private struct SecureInputField: UIViewRepresentable {
     }
 
     func updateUIView(_ textField: UITextField, context: Context) {
+        context.coordinator.parent = self
         if textField.text != text {
             textField.text = text
         }
@@ -342,7 +361,7 @@ private struct SecureInputField: UIViewRepresentable {
         }
 
         func textFieldDidEndEditing(_ textField: UITextField) {
-            parent.text = textField.text ?? ""
+            parent.text = limitText(textField.text ?? "")
             parent.onFocusChange(false)
         }
 
@@ -357,7 +376,10 @@ private struct SecureInputField: UIViewRepresentable {
 
         @objc func textFieldDidChange(_ textField: UITextField) {
             if isResettingText { return }
-            let newText = textField.text ?? ""
+            let newText = limitText(textField.text ?? "")
+            if textField.text != newText {
+                textField.text = newText
+            }
             parent.text = newText
             parent.onChangeText?(newText)
         }
@@ -366,6 +388,13 @@ private struct SecureInputField: UIViewRepresentable {
             textField.resignFirstResponder()
             return true
         }
+
+        private func limitText(_ value: String) -> String {
+            guard let maxLength = parent.maxLength else {
+                return value
+            }
+            return String(value.prefix(maxLength))
+        }
     }
 }
 

package/package.json

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