@momo-kits/native-kits 0.300.3 → 0.300.4-debug

package/ios/Input/InputTextArea.swift

@@ -16,22 +16,24 @@ struct UITextViewWrapper: UIViewRepresentable {
     var textColor: Color
     var cursorColor: Color
     var fontWeight: Font.Weight
+    var keyboardType: UIKeyboardType = .default
     var disabled: Bool
     var onChangeText: (String) -> Void
-    var onDone: (() -> Void)?
     var onFocus: (() -> Void)?
     var onBlur: (() -> Void)?
-    
+
     func makeUIView(context: Context) -> UITextView {
         let textView = UITextView()
         textView.delegate = context.coordinator
         textView.backgroundColor = .clear
         textView.textContainerInset = .zero
         textView.textContainer.lineFragmentPadding = 0
+        textView.keyboardType = keyboardType
         return textView
     }
-    
+
     func updateUIView(_ uiView: UITextView, context: Context) {
+        context.coordinator.parent = self
         if uiView.text != text {
             uiView.text = text
         }
@@ -39,24 +41,30 @@ struct UITextViewWrapper: UIViewRepresentable {
         uiView.tintColor = UIColor(cursorColor)
         // Read through `context.environment` rather than the global `scaleSize`: that is what makes
         // SwiftUI re-run updateUIView when the font scale changes.
-        uiView.font = UIFont.systemFont(
-            ofSize: context.environment.momoFontScale(16),
-            weight: fontWeight == .bold ? .bold : .regular
+        uiView.font = momoUIFont(
+            size: context.environment.momoFontScale(16),
+            weight: fontWeight == .bold ? .bold : .regular,
+            family: context.environment.appTheme.font,
+            isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
         )
         uiView.isEditable = !disabled
+        if uiView.keyboardType != keyboardType {
+            uiView.keyboardType = keyboardType
+            uiView.reloadInputViews()
+        }
     }
-    
+
     func makeCoordinator() -> Coordinator {
         Coordinator(self)
     }
-    
+
     class Coordinator: NSObject, UITextViewDelegate {
         var parent: UITextViewWrapper
-        
+
         init(_ parent: UITextViewWrapper) {
             self.parent = parent
         }
-        
+
         func textViewDidChange(_ textView: UITextView) {
             let limited = String(textView.text.prefix(parent.maxLength))
             if textView.text != limited {
@@ -65,20 +73,17 @@ struct UITextViewWrapper: UIViewRepresentable {
             parent.text = limited
             parent.onChangeText(limited)
         }
-        
+
         func textViewDidBeginEditing(_ textView: UITextView) {
             parent.onFocus?()
         }
-        
+
         func textViewDidEndEditing(_ textView: UITextView) {
             parent.onBlur?()
         }
-        
+
+        // Like Compose's `onValueChange`, an edit that would exceed maxLength is rejected whole.
         func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
-            if text == "\n" {
-                parent.onDone?()
-                return false
-            }
             let current = textView.text ?? ""
             guard let range = Range(range, in: current) else { return false }
             let proposed = current.replacingCharacters(in: range, with: text)
@@ -90,6 +95,7 @@ struct UITextViewWrapper: UIViewRepresentable {
 // Make the struct public
 public struct InputTextArea: View {
     @Environment(\.appTheme) private var theme
+    @Environment(\.momoFontScale) private var fontScale
     @Binding var text: String
     var maxLength: Int = MAX_LENGTH
     var height: CGFloat = DEFAULT_HEIGHT
@@ -111,11 +117,9 @@ public struct InputTextArea: View {
     var required: Bool = false
     var fontWeight: Font.Weight = .regular
     var keyboardType: UIKeyboardType = .default
-    
+
     @State private var isFocused = false
-    @State private var isBlurred = false
-    @State private var floatingLabelHeight: CGFloat = 16
-    
+
     // Make the initializer public
     public init(
         text: Binding<String>,
@@ -162,147 +166,128 @@ public struct InputTextArea: View {
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
     }
-    
+
     public var body: some View {
         VStack(alignment: .leading, spacing: 0) {
+            // Compose: `height` is the whole box (text, counter and paddings), scaled.
+            VStack(spacing: 0) {
+                HStack(alignment: .top, spacing: 0) {
                     ZStack(alignment: .topLeading) {
-                        if !floatingValue.isEmpty || !floatingIcon.isEmpty {
-                            HStack(spacing: 4) {
-                                MomoText(
-                                    floatingValue,
-                                    typography: .labelSMedium,
-                                    color: disabled ? theme.colors.text.disable : (floatingValueColor ?? theme.colors.text.hint)
-                                )
-                                
-                                if required {
-                                    MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
-                                }
-                                
-                                if !floatingIcon.isEmpty {
-                                    Icon(
-                                        source: floatingIcon,
-                                        size: 16,
-                                        color: disabled ? theme.colors.text.disable : (floatingIconColor ?? theme.colors.text.default)
-                                    )
-                                    .padding(.leading, Spacing.XS)
-                                }
-                            }
-                            .padding(.horizontal, Spacing.S)
-                            .background(
-                                GeometryReader { geo in
-                                    Color.clear.onAppear { floatingLabelHeight = geo.size.height }
-                                }
+                        if text.isEmpty {
+                            MomoText(
+                                placeholder,
+                                typography: fontWeight == .bold ? .actionSBold : .bodyDefaultRegular,
+                                color: disabled ? theme.colors.text.disable : theme.colors.text.hint
                             )
-                            .background(theme.colors.background.surface)
-                            // Kotlin centers the label within the box-height-tall decorationBox
-                            // by default, then applies `offsetY = -scaleHeight / 2` — net effect:
-                            // the label ends up centered exactly on the box's top border. Our
-                            // ZStack anchors top-leading instead, so matching that requires
-                            // offsetting by half the label's OWN measured height, not half the
-                            // (104pt-tall) text-area box height.
-                            .offset(x: Spacing.S, y: -floatingLabelHeight / 2)
-                            .zIndex(10)
+                            .fontSize(16, lineHeight: 24)
                         }
 
-                        VStack {
-                            HStack(alignment: .top, spacing: 0) {
-                                ZStack(alignment: .topLeading) {
-                                    if text.isEmpty {
-                                        Text(placeholder)
-                                            .foregroundColor(disabled ? theme.colors.text.disable : theme.colors.text.hint)
-                                            .font(.system(size: 16, weight: fontWeight))
-                                            .padding(.horizontal, 16)
-                                            .padding(.vertical, 12)
-                                    }
-
-                                    UITextViewWrapper(
-                                        text: $text,
-                                        maxLength: maxLength,
-                                        textColor: disabled ? theme.colors.text.disable : theme.colors.text.default,
-                                        cursorColor: theme.colors.primary,
-                                        fontWeight: fontWeight,
-                                        disabled: disabled,
-                                        onChangeText: onChangeText,
-                                        onDone: {
-                                        // Handle done action if needed
-                                    },
-                                    onFocus: {
-                                        isFocused = true
-                                        onFocus()
-                                    }, onBlur: {
-                                        isFocused = false
-                                        isBlurred = true
-                                        onBlur()
-                                    })
-                                    .frame(height: height)
-                                    .padding(.horizontal, 12)
-                                    .padding(.vertical, 8)
-                                    .disabled(disabled)
-                                }
-                                .frame(maxWidth: .infinity)
-
-                                // Clear button (mirrors Compose: focused + non-empty).
-                                if isFocused && !text.isEmpty {
-                                    SwiftUI.Button(action: {
-                                        text = ""
-                                        onChangeText("")
-                                    }) {
-                                        Icon(source: "24_navigation_close_circle_full", size: 16, color: theme.colors.text.hint)
-                                    }
-                                    .padding(.leading, Spacing.XS)
-                                    .padding(.top, 12)
-                                }
-
-                                // Loading indicator and right icon (independent, mirrors
-                                // Compose's RenderRightIcon: both can render at once).
-                                if loading {
-                                    ActivityIndicator(isAnimating: .constant(true), style: .medium)
-                                        .frame(width: 16, height: 16)
-                                        .padding(.leading, Spacing.XS)
-                                        .padding(.top, 12)
-                                }
-                                if !icon.isEmpty {
-                                    SwiftUI.Button(action: onRightIconPressed) {
-                                        Icon(source: icon, size: 24, color: disabled ? theme.colors.text.disable : (iconColor ?? theme.colors.text.default))
-                                    }
-                                    .padding(.leading, Spacing.XS)
-                                    .padding(.top, 12)
-                                }
+                        UITextViewWrapper(
+                            text: $text,
+                            maxLength: maxLength,
+                            textColor: disabled ? theme.colors.text.disable : theme.colors.text.default,
+                            cursorColor: theme.colors.primary,
+                            fontWeight: fontWeight,
+                            keyboardType: keyboardType,
+                            disabled: disabled,
+                            onChangeText: onChangeText,
+                            onFocus: {
+                                isFocused = true
+                                onFocus()
+                            },
+                            onBlur: {
+                                isFocused = false
+                                onBlur()
                             }
+                        )
+                        .disabled(disabled)
+                    }
+                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
 
-                            HStack {
-                                Spacer()
-                                MomoText("\(text.count)/\(maxLength)", typography: .descriptionXsRegular, color: theme.colors.text.hint)
-                            }
-                            .padding(.horizontal, 16)
-                            .padding(.bottom, 12)
+                    // Clear button (mirrors Compose: focused + non-empty).
+                    if isFocused && !text.isEmpty {
+                        SwiftUI.Button(action: {
+                            text = ""
+                            onChangeText("")
+                        }) {
+                            Icon(source: "24_navigation_close_circle_full", size: 16, color: theme.colors.text.hint)
                         }
-                        .background(theme.colors.background.surface)
-                        .cornerRadius(Radius.S)
-                        .overlay(
-                            RoundedRectangle(cornerRadius: Radius.S)
-                                .stroke(borderColor, lineWidth: 1)
-                        )
+                        .padding(.leading, Spacing.XS)
                     }
-                    
-                    ErrorView(errorMessage: error, errorSpacing: errorSpacing, hintText: "")
-                }
-                .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillShowNotification)) { _ in
-                    if !isBlurred {
-                        isFocused = true
-                        onFocus()
+
+                    // Loading indicator and right icon (independent, mirrors
+                    // Compose's RenderRightIcon: both can render at once).
+                    if loading {
+                        ActivityIndicator(isAnimating: .constant(true), style: .medium, color: iconTintColor)
+                            .frame(width: 16, height: 16)
+                            .padding(.leading, Spacing.XS)
                     }
-                }
-                .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { _ in
-                    if isFocused {
-                        isFocused = false
-                        isBlurred = true
-                        onBlur()
+                    if !icon.isEmpty {
+                        SwiftUI.Button(action: onRightIconPressed) {
+                            Icon(source: icon, size: 24, color: iconTintColor)
+                        }
+                        .padding(.leading, Spacing.XS)
                     }
                 }
-                .ignoreBoldTextSetting()
+                .padding([.horizontal, .top], Spacing.M)
+                .frame(maxHeight: .infinity, alignment: .top)
+
+                MomoText("\(text.count)/\(maxLength)", typography: .descriptionXsRegular, color: theme.colors.text.hint)
+                    .frame(maxWidth: .infinity, alignment: .trailing)
+                    .padding(.trailing, Spacing.M)
+                    .padding(.bottom, Spacing.M)
+            }
+            .frame(height: fontScale(height))
+            .background(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .fill(theme.colors.background.surface)
+            )
+            .overlay(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .stroke(borderColor, lineWidth: 1)
+            )
+            .overlay(alignment: .topLeading) { floatingLabel }
+
+            ErrorView(errorMessage: error, errorSpacing: errorSpacing, hintText: "")
+        }
+        .ignoreBoldTextSetting()
     }
-    
+
+    /// Centered on the box's top border, like Compose's `FloatingLabel` (offset by -height / 2).
+    @ViewBuilder
+    private var floatingLabel: some View {
+        if !floatingValue.isEmpty || !floatingIcon.isEmpty {
+            HStack(spacing: 0) {
+                MomoText(
+                    floatingValue,
+                    typography: .labelSMedium,
+                    color: disabled ? theme.colors.text.disable : (floatingValueColor ?? theme.colors.text.hint)
+                )
+
+                if required {
+                    MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
+                }
+
+                if !floatingIcon.isEmpty {
+                    Icon(
+                        source: floatingIcon,
+                        size: 16,
+                        color: disabled ? theme.colors.text.disable : (floatingIconColor ?? theme.colors.text.default)
+                    )
+                    .padding(.leading, Spacing.XS)
+                }
+            }
+            .padding(.horizontal, Spacing.S)
+            .background(theme.colors.background.surface)
+            .alignmentGuide(.top) { $0[VerticalAlignment.center] }
+            .offset(x: Spacing.S)
+        }
+    }
+
+    private var iconTintColor: Color {
+        disabled ? theme.colors.text.disable : (iconColor ?? theme.colors.text.default)
+    }
+
     private var borderColor: Color {
         if disabled {
             return theme.colors.border.disable

package/ios/InputDropDown/InputDropDown.swift

@@ -19,7 +19,7 @@ private struct RenderRightIcon: View {
         // Mirrors Compose's two independent `if` blocks: loading spinner and icon
         // can both render at once, not exclusively (not an if/else).
         if loading {
-            ActivityIndicator(isAnimating: .constant(true), style: .medium)
+            ActivityIndicator(isAnimating: .constant(true), style: .medium, color: color)
                 .frame(width: 16, height: 16)
         }
         if !icon.isEmpty {
@@ -98,7 +98,7 @@ public struct InputDropDown: View {
     }
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 4) {
+        VStack(alignment: .leading, spacing: 0) {
             ZStack(alignment: .topLeading) {
                 // Floating label
                 if !floatingValue.isEmpty || !floatingIcon.isEmpty {
@@ -114,7 +114,7 @@ public struct InputDropDown: View {
                     }
                     .padding(.horizontal, Spacing.S)
                     .background(theme.colors.background.surface)
-                    .offset(x: Spacing.S, y: -8)
+                    .offset(x: Spacing.S, y: -Spacing.S)
                     .zIndex(10)
                 }
 
@@ -130,6 +130,7 @@ public struct InputDropDown: View {
                         typography: .bodyDefaultRegular,
                         color: value.isEmpty ? placeholderColor : textColor
                     )
+                    .fontSize(16, lineHeight: 24)
                     .frame(maxWidth: .infinity, alignment: .leading)
 
                     RenderRightIcon(
@@ -146,10 +147,6 @@ public struct InputDropDown: View {
                         .stroke(getBorderColor(isFocused: false, error: error, disabled: disabled), lineWidth: 1)
                 )
             }
-            .contentShape(Rectangle())
-            .onTapGesture {
-                if !disabled { onPress() }
-            }
 
             ErrorView(
                 errorMessage: error,
@@ -157,8 +154,14 @@ public struct InputDropDown: View {
                 hintText: hintText
             )
         }
+        // Compose makes the whole column clickable, error/hint row included.
+        .contentShape(Rectangle())
+        .onTapGesture {
+            if !disabled { onPress() }
+        }
         .accessibilityElement(children: .combine)
         .accessibility(label: Text(floatingValue))
+        .accessibilityIdentifier(disabled ? "input_\(floatingValue)_disabled" : "input_\(floatingValue)")
     }
 
     // MARK: - Computed colors

package/ios/InputMoney/InputMoney.swift

@@ -3,9 +3,8 @@
 //  MoMoUIKits
 //
 //  Native SwiftUI reimplementation of Compose `InputMoney`.
-//  The bound `text` holds RAW DIGITS only (mirrors Compose, where the
-//  field stores the numeric string and a VisualTransformation renders the
-//  thousands-separated currency). Display formatting is applied live.
+//  The bound `text` holds RAW DIGITS only, as in Compose; the field shows
+//  the thousands-separated currency and edits apply at the caret.
 //
 
 import Foundation
@@ -165,17 +164,18 @@ public struct InputMoney: View {
     // MARK: - Body
 
     public var body: some View {
-        VStack(alignment: .leading, spacing: 4) {
+        VStack(alignment: .leading, spacing: 0) {
             ZStack(alignment: .topLeading) {
                 // Floating label
                 if !floatingValue.isEmpty || !floatingIcon.isEmpty {
-                    HStack(spacing: Spacing.XS) {
+                    HStack(spacing: 0) {
                         MomoText(floatingValue, typography: .labelSMedium, color: floatingTitleColor)
                         if required {
                             MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
                         }
                         if !floatingIcon.isEmpty {
                             Icon(source: floatingIcon, size: 16, color: floatingIconTintColor)
+                                .padding(.leading, Spacing.XS)
                         }
                     }
                     .padding(.horizontal, Spacing.S)
@@ -204,17 +204,19 @@ public struct InputMoney: View {
 
                     // Money field
                     ZStack(alignment: .leading) {
-                        if text.filter({ $0.isNumber }).isEmpty {
+                        if !hasDigits {
                             MomoText(
                                 placeholder,
                                 typography: fontWeight == .bold ? .actionSBold : .bodyDefaultRegular,
                                 color: placeholderColor
                             )
+                            .fontSize(20, lineHeight: 24)
                         }
                         MoneyTextField(
                             digits: $text,
                             keyboardType: keyboardType,
                             fontWeight: fontWeight == .bold ? .bold : .regular,
+                            fontFamily: theme.font,
                             textColor: UIColor(textColor),
                             cursorColor: UIColor(theme.colors.primary),
                             isDisabled: disabled,
@@ -225,7 +227,7 @@ public struct InputMoney: View {
                     .frame(maxWidth: .infinity, alignment: .leading)
 
                     // Clear button (focused + has value)
-                    if isFocused && !text.filter({ $0.isNumber }).isEmpty {
+                    if isFocused && hasDigits {
                         SwiftUI.Button(action: {
                             text = ""
                             onChangeText?("")
@@ -239,7 +241,7 @@ public struct InputMoney: View {
                     // Loading indicator and right icon can both render (mirrors
                     // Compose's two independent `if` blocks, not if/else).
                     if loading {
-                        ActivityIndicator(isAnimating: .constant(true), style: .medium)
+                        ActivityIndicator(isAnimating: .constant(true), style: .medium, color: iconTintColor)
                             .frame(width: 16, height: 16)
                             .padding(.leading, Spacing.S)
                     }
@@ -264,6 +266,9 @@ public struct InputMoney: View {
 
             ErrorView(errorMessage: error, errorSpacing: errorSpacing, hintText: "")
         }
+        .accessibilityElement(children: .contain)
+        .accessibilityLabel(floatingValue)
+        .accessibilityIdentifier(disabled ? "input_\(floatingValue)_disabled" : "input_\(floatingValue)")
         .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)) { _ in
             if isFocused {
                 DispatchQueue.main.async { handleFocusChange(false) }
@@ -273,6 +278,8 @@ public struct InputMoney: View {
 
     // MARK: - Helpers
 
+    private var hasDigits: Bool { text.contains(where: isMoneyDigit) }
+
     private func handleFocusChange(_ focused: Bool) {
         guard isFocused != focused else { return }
         isFocused = focused
@@ -303,6 +310,7 @@ private struct MoneyTextField: UIViewRepresentable {
     @Binding var digits: String
     var keyboardType: UIKeyboardType
     var fontWeight: UIFont.Weight
+    var fontFamily: String
     var textColor: UIColor
     var cursorColor: UIColor
     var isDisabled: Bool
@@ -315,7 +323,7 @@ private struct MoneyTextField: UIViewRepresentable {
         let field = UITextField()
         field.delegate = context.coordinator
         field.keyboardType = keyboardType
-        field.font = UIFont.systemFont(ofSize: context.environment.momoFontScale(20), weight: fontWeight)
+        field.font = font(context)
         field.textColor = textColor
         field.isEnabled = !isDisabled
         field.tintColor = cursorColor
@@ -328,10 +336,14 @@ private struct MoneyTextField: UIViewRepresentable {
     func updateUIView(_ field: UITextField, context: Context) {
         context.coordinator.parent = self
         // Re-applied here, not just in makeUIView, so a font-scale change reaches an existing field.
-        field.font = UIFont.systemFont(ofSize: context.environment.momoFontScale(20), weight: fontWeight)
+        field.font = font(context)
         field.isEnabled = !isDisabled
         field.textColor = textColor
         field.tintColor = cursorColor
+        if field.keyboardType != keyboardType {
+            field.keyboardType = keyboardType
+            field.reloadInputViews()
+        }
         let expected = displayValue(digits)
         if field.text != expected {
             field.text = expected
@@ -340,10 +352,19 @@ private struct MoneyTextField: UIViewRepresentable {
     }
 
     fileprivate func displayValue(_ raw: String) -> String {
-        let numeric = raw.filter { $0.isNumber }
+        let numeric = raw.filter(isMoneyDigit)
         return numeric.isEmpty ? "" : formatNumberToMoney(numeric)
     }
 
+    private func font(_ context: Context) -> UIFont {
+        momoUIFont(
+            size: context.environment.momoFontScale(20),
+            weight: fontWeight,
+            family: fontFamily,
+            isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
+        )
+    }
+
     final class Coordinator: NSObject, UITextFieldDelegate {
         var parent: MoneyTextField
 

package/ios/InputOTP/InputOTP.swift

@@ -48,6 +48,7 @@ public struct InputOTP: View {
 
     @FocusState private var isFocused: Bool
     @State private var hasBeenFocused: Bool = false
+    @State private var fieldText: String
 
     private var maxLength: Int { length ?? 10 }
 
@@ -64,6 +65,7 @@ public struct InputOTP: View {
         onBlur: (() -> Void)? = nil
     ) {
         self._value = value
+        self._fieldText = State(initialValue: value.wrappedValue)
         self.length = length
         self.errorMessage = errorMessage
         self.errorSpacing = errorSpacing
@@ -105,7 +107,7 @@ public struct InputOTP: View {
                 HStack {
                     Spacer()
                     SwiftUI.Button(action: clearText) {
-                        Icon(source: "24_navigation_close_circle_full", size: 12, color: theme.colors.text.hint)
+                        Icon(source: "24_navigation_close_circle_full", size: 12, color: theme.colors.text.default)
                             .padding(.trailing, 12)
                     }
                 }
@@ -122,17 +124,24 @@ public struct InputOTP: View {
     // MARK: Subviews
 
     private var hiddenField: some View {
-        TextField("", text: Binding(
-            get: { value },
-            set: { handleChangeText($0) }
-        ))
+        TextField("", text: $fieldText)
         .keyboardType(dataType == "number" ? .numberPad : .asciiCapable)
+        .textInputAutocapitalization(.never)
+        .autocorrectionDisabled()
         .focused($isFocused)
         .foregroundColor(.clear)
         .accentColor(.clear)
         .frame(maxWidth: .infinity)
         .frame(height: 56)
         .opacity(0.01)
+        // Writes a rejected edit back, so the field stays in step with `value` like Compose's
+        // controlled field instead of keeping the extra character and swallowing the next key.
+        .onChange(of: fieldText) { text in
+            if text != value && !handleChangeText(text) { fieldText = value }
+        }
+        .onChange(of: value) { newValue in
+            if fieldText != newValue { fieldText = newValue }
+        }
         .onChange(of: isFocused) { focused in
             if focused {
                 onFocus?()
@@ -147,7 +156,7 @@ public struct InputOTP: View {
     private var cells: some View {
         if let length = length {
             HStack(spacing: Spacing.L) {
-                ForEach(0 ..< length, id: \.self) { i in
+                ForEach(0 ..< max(length, 0), id: \.self) { i in
                     cell(at: i)
                 }
             }
@@ -155,7 +164,7 @@ public struct InputOTP: View {
         } else {
             HStack(spacing: Spacing.L) {
                 if value.isEmpty && !isFocused && !placeholder.isEmpty {
-                    MomoText(placeholder, typography: .descriptionDefaultRegular, color: theme.colors.text.hint)
+                    MomoText(placeholder, typography: .bodyDefaultRegular, color: theme.colors.text.hint)
                 } else {
                     ForEach(Array(value.enumerated()), id: \.offset) { _, ch in
                         MomoText(String(ch), typography: .headerDefaultBold, color: theme.colors.text.default)
@@ -186,13 +195,14 @@ public struct InputOTP: View {
 
     // MARK: Logic
 
-    private func handleChangeText(_ text: String) {
+    @discardableResult
+    private func handleChangeText(_ text: String) -> Bool {
         let validData = dataType != "number" || text.allSatisfy { $0.isNumber }
         let changed = text.count != value.count
-        if text.count <= maxLength && validData && changed {
-            value = text
-            onChangeText?(text)
-        }
+        guard text.count <= maxLength && validData && changed else { return false }
+        value = text
+        onChangeText?(text)
+        return true
     }
 
     private func clearText() {