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

package/ios/IconButton/IconButton.swift

@@ -28,7 +28,7 @@ public enum IconSize {
 
 // MARK: - IconShape
 
-public enum IconShape {
+public enum IconShape: Sendable {
     case circle
     case square
 }
@@ -68,8 +68,7 @@ public struct IconButton: View {
     public var body: some View {
         let bg = backgroundColor
         let fg = contentColor
-        // OUTLINE allows an override color for its border, mirroring Compose `color ?? theme.colors.primary`.
-        let border: Color? = type == .outline ? (color ?? theme.colors.primary) : borderColor
+        let border = borderColor
         let borderWidth = type.borderWidth
 
         SwiftUI.Button(action: {
@@ -82,9 +81,11 @@ public struct IconButton: View {
                 .background(bg)
                 .clipShape(IconButtonShape(shape))
                 .overlay(
+                    // Inside the bounds, like Compose `border`.
                     IconButtonShape(shape)
-                        .stroke(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
+                        .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
                 )
+                .contentShape(IconButtonShape(shape))
         }
         .buttonStyle(.plain)
         .disabled(!isEnabled)
@@ -122,8 +123,9 @@ public struct IconButton: View {
 /// Type-erased shape switch (`Circle` vs a fixed `Radius.S` rounded rect) — mirrors
 /// Compose's `IconShape.toShape()`. `AnyShape` needs iOS 17+, so this hand-rolls the same
 /// erasure at the deployment target's iOS 15 floor.
-private struct IconButtonShape: Shape {
+private struct IconButtonShape: InsettableShape {
     let shape: IconShape
+    var insetAmount: CGFloat = 0
 
     init(_ shape: IconShape) {
         self.shape = shape
@@ -132,9 +134,15 @@ private struct IconButtonShape: Shape {
     func path(in rect: CGRect) -> Path {
         switch shape {
         case .circle:
-            return Circle().path(in: rect)
+            return Circle().inset(by: insetAmount).path(in: rect)
         case .square:
-            return RoundedRectangle(cornerRadius: Radius.S).path(in: rect)
+            return RoundedRectangle(cornerRadius: Radius.S).inset(by: insetAmount).path(in: rect)
         }
     }
+
+    func inset(by amount: CGFloat) -> IconButtonShape {
+        var shape = self
+        shape.insetAmount += amount
+        return shape
+    }
 }

package/ios/Image/Image.swift

@@ -2,7 +2,6 @@
 
 import Foundation
 import SDWebImageSwiftUI
-import SkeletonUI
 import SwiftUI
 
 public enum ImageState {
@@ -39,26 +38,23 @@ public struct ImageView: View {
             .resizable()
             .renderingMode(color != nil ? .template : .original)
             .placeholder {
-                VStack(alignment: .center, content: {
+                VStack(alignment: .center) {
                     if error {
-                        Image("media_fail")
-                            .resizable()
-                            .renderingMode(.template)
-                            .foregroundColor(theme.colors.text.disable)
-                            .frame(width: 24, height: 24)
-                    } else if placeholder != nil {
+                        Icon(source: "media_fail", color: theme.colors.text.disable)
+                    } else if let placeholder {
                         placeholder
+                    } else if loading {
+                        Skeleton()
                     }
-                })
+                }
                 .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .skeleton(with: loading && !error && placeholder == nil)
-                .shape(type: .rectangle)
             }
             .scaledToFit()
             .transition(.fade)
             .aspectRatio(aspectRatio, contentMode: contentMode)
             .foregroundColor(color)
             .onAppear { onStateChanged?(.loading) }
+            .onChange(of: url) { _ in error = false }
     }
 
     // MARK: Internal
@@ -73,15 +69,3 @@ public struct ImageView: View {
     @State var error: Bool = false
     var url: String
 }
-
-private struct ColorMultiplyModifier: ViewModifier {
-    let color: Color?
-
-    func body(content: Content) -> some View {
-        if let color {
-            content.colorMultiply(color)
-        } else {
-            content
-        }
-    }
-}

package/ios/Information/Information.swift

@@ -19,6 +19,7 @@ public struct Information: View {
     private let showIconClose: Bool
     private let onPressClose: (() -> Void)?
     private let highlightText: [String]
+    private let accessibilityLabel: String?
 
     public init(
         title: String? = nil,
@@ -30,7 +31,8 @@ public struct Information: View {
         action: String? = nil,
         showIconClose: Bool = true,
         onPressClose: (() -> Void)? = nil,
-        highlightText: [String] = []
+        highlightText: [String] = [],
+        accessibilityLabel: String? = nil
     ) {
         self.title = title
         self.description = description
@@ -42,6 +44,11 @@ public struct Information: View {
         self.showIconClose = showIconClose
         self.onPressClose = onPressClose
         self.highlightText = highlightText
+        self.accessibilityLabel = accessibilityLabel
+    }
+
+    private var automationId: String {
+        accessibilityLabel ?? "Information\(title.map { "/\($0)" } ?? "")"
     }
 
     private var borderColor: Color {
@@ -80,20 +87,23 @@ public struct Information: View {
         VStack(alignment: .leading, spacing: 0) {
             HStack(alignment: .top, spacing: 0) {
                 if let image {
-                    ImageView(image)
+                    ImageView(image, contentMode: .fill)
                         .frame(width: 40, height: 40)
                         .clipShape(RoundedRectangle(cornerRadius: Radius.S))
+                        .accessibilityIdentifier("\(automationId)|img")
                         .padding(.trailing, Spacing.S)
                 } else if showIcon {
                     Icon(source: iconSource, size: 16, color: accentColor)
+                        .accessibilityIdentifier("\(automationId)|icon")
                         .padding(.trailing, Spacing.S)
                 }
 
                 VStack(alignment: .leading, spacing: 0) {
                     if let title {
-                        MomoText(title, typography: .labelDefaultMedium)
+                        MomoText(title, typography: .labelDefaultMedium, accessibilityId: "\(automationId)|title-text")
                     }
                     MomoText(description, typography: .descriptionDefaultRegular, highlightText: highlightText)
+                        .accessibilityIdentifier("\(automationId)|description-text")
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
 
@@ -101,15 +111,21 @@ public struct Information: View {
                     Icon(source: "navigation_close", size: 16, color: theme.colors.text.default)
                         .contentShape(Rectangle())
                         .onTapGesture(perform: onPressClose)
+                        .accessibilityAddTraits(.isButton)
+                        .accessibilityIdentifier("\(automationId)|close-icon-touch")
                 }
             }
 
             if let action, let onPressAction {
-                MomoText(action, typography: .actionXsBold, color: accentColor)
-                    .frame(maxWidth: .infinity, alignment: .trailing)
-                    .contentShape(Rectangle())
-                    .onTapGesture(perform: onPressAction)
-                    .padding(.top, Spacing.S)
+                HStack(spacing: 0) {
+                    MomoText(action, typography: .actionXsBold, color: accentColor, accessibilityId: "\(automationId)|cta-text")
+                }
+                .frame(maxWidth: .infinity, alignment: .trailing)
+                .contentShape(Rectangle())
+                .onTapGesture(perform: onPressAction)
+                .accessibilityElement(children: .contain)
+                .accessibilityIdentifier("\(automationId)|cta-touch")
+                .padding(.top, Spacing.S)
             }
         }
         .padding(Spacing.M)
@@ -119,8 +135,10 @@ public struct Information: View {
         )
         .overlay(
             RoundedRectangle(cornerRadius: Radius.S)
-                .stroke(borderColor, lineWidth: 0.5)
+                .strokeBorder(borderColor, lineWidth: 0.5)
         )
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier(automationId)
     }
 }
 

package/ios/Input/ErrorView.swift

@@ -37,9 +37,9 @@ public struct ErrorView: View {
             }
             .padding(.top, Spacing.XS)
         } else if errorSpacing {
-            Spacer()
-                .padding(.top, Spacing.XS)
+            Color.clear
                 .frame(height: 18)
+                .padding(.top, Spacing.XS)
         }
     }
     

package/ios/Input/Input.swift

@@ -37,8 +37,7 @@ public struct Input: View {
     @State private var isFocused: Bool = false
     @State private var isPasswordHidden: Bool = true
     @FocusState private var isFieldFocused: Bool
-    @State private var floatingLabelHeight: CGFloat = 16
-    
+
     public init(
         text: Binding<String>,
         placeholder: String = "",
@@ -112,142 +111,115 @@ public struct Input: View {
             }
         )
 
-        VStack(alignment: .leading, spacing: 4) {
-            ZStack(alignment: .topLeading) {
-                // Floating label
-                if !floatingValue.isEmpty || !floatingIcon.isEmpty {
-                    HStack(spacing: Spacing.XS) {
-                        MomoText(floatingValue, typography: .labelSMedium, color: getFloatingColor())
-                        if required {
-                            MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
-                        }
-                        if !floatingIcon.isEmpty {
-                            Icon(source: floatingIcon, size: 16, color: getFloatingIconColor())
-                        }
-                    }
-                    .padding(.horizontal, Spacing.S)
-                    .background(
-                        GeometryReader { geo in
-                            Color.clear.onAppear { floatingLabelHeight = geo.size.height }
-                        }
-                    )
-                    .background(theme.colors.background.surface)
-                    // Kotlin centers the label within the (box-height-tall) decorationBox
-                    // by default, then applies `offsetY = -size.values.height / 2` — net
-                    // effect: the label ends up centered exactly on the box's top border
-                    // (spanning -labelHeight/2 ... +labelHeight/2 around y=0). Our ZStack
-                    // anchors top-leading instead, so reproducing that requires offsetting
-                    // by half the label's OWN measured height, not half the box height.
-                    .offset(x: Spacing.S, y: -floatingLabelHeight / 2)
-                    .zIndex(10)
+        VStack(alignment: .leading, spacing: 0) {
+            // Input container
+            HStack(alignment: .center, spacing: 0) {
+                // Leading icon
+                if !leadingIcon.isEmpty {
+                    Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: leadingIconColor ?? theme.colors.text.hint)
+                        .padding(.trailing, Spacing.M)
                 }
-                
-                // Input container
-                HStack(alignment: .center, spacing: 0) {
-                    // Leading icon
-                    if !leadingIcon.isEmpty {
-                        Icon(source: leadingIcon, size: size == .small ? 24 : 32, color: getLeadingIconColor())
-                            .padding(.trailing, Spacing.M)
+
+                // Text input field
+                ZStack(alignment: .leading) {
+                    if text.isEmpty {
+                        MomoText(
+                            placeholder + (required && floatingValue.isEmpty ? " *" : ""),
+                            typography: fontWeight == .bold ? .actionSBold : .bodyDefaultRegular,
+                            color: getPlaceholderColor()
+                        )
                     }
-                    
-                    // Text input field
-                    ZStack(alignment: .leading) {
-                        if text.isEmpty {
-                            MomoText(
-                                placeholder + (required && floatingValue.isEmpty ? " *" : ""),
-                                typography: fontWeight == .bold ? .actionSBold : .bodyDefaultRegular,
-                                color: getPlaceholderColor()
-                            )
-                        }
-                        
-                        if secureTextEntry && isPasswordHidden {
-                            SecureInputField(
-                                text: $text,
-                                keyboardType: keyboardType,
-                                fontSize: fontScale(14),
-                                fontWeight: fontWeight == .bold ? .bold : .regular,
-                                textColor: UIColor(getTextColor()),
-                                cursorColor: UIColor(theme.colors.primary),
-                                isDisabled: disabled || readOnly,
-                                maxLength: maxLength,
-                                autofocus: autofocus,
-                                onFocusChange: { focused in
-                                    handleFocusChange(focused)
-                                },
-                                onChangeText: onChangeText
-                            )
-                        } else {
-                            TextField("", text: textBinding, onEditingChanged: { focused in
+
+                    // One UITextField for both states: swapping views on the eye toggle would drop focus.
+                    if secureTextEntry {
+                        SecureInputField(
+                            text: $text,
+                            isSecure: isPasswordHidden,
+                            keyboardType: keyboardType,
+                            fontSize: fontScale(14),
+                            fontWeight: fontWeight == .bold ? .bold : .regular,
+                            textColor: UIColor(getTextColor()),
+                            cursorColor: UIColor(theme.colors.primary),
+                            isDisabled: disabled || readOnly,
+                            maxLength: maxLength,
+                            autofocus: autofocus,
+                            onFocusChange: { focused in
                                 handleFocusChange(focused)
-                            })
-                            .keyboardType(keyboardType)
-                            .font(fontWeight == .bold ? .action_s_bold : .body_default_regular)
-                            .ignoreBoldTextSetting()
-                            .foregroundColor(getTextColor())
-                            .disabled(disabled || readOnly)
-                            .applyCursorColor(theme.colors.primary)
-                            .focused($isFieldFocused)
-                            .onAppear {
-                                if autofocus { isFieldFocused = true }
-                            }
-                            // SwiftUI reads a TextField's UIKit input traits only when it
-                            // builds the backing UITextField, so a later `keyboardType`
-                            // change is silently dropped. The secure path can call
-                            // `reloadInputViews()` in `updateUIView`; here the only lever
-                            // is to force a rebuild.
-                            .id(keyboardType.rawValue)
+                            },
+                            onChangeText: onChangeText
+                        )
+                    } else {
+                        TextField("", text: textBinding, onEditingChanged: { focused in
+                            handleFocusChange(focused)
+                        })
+                        .keyboardType(keyboardType)
+                        .kitFont(fontWeight == .bold ? .actionSBold : .bodyDefaultRegular)
+                        .ignoreBoldTextSetting()
+                        .foregroundColor(getTextColor())
+                        .disabled(disabled || readOnly)
+                        .applyCursorColor(theme.colors.primary)
+                        .focused($isFieldFocused)
+                        .onAppear {
+                            if autofocus { isFieldFocused = true }
                         }
+                        // SwiftUI reads a TextField's UIKit input traits only when it
+                        // builds the backing UITextField, so a later `keyboardType`
+                        // change is silently dropped. The secure path can call
+                        // `reloadInputViews()` in `updateUIView`; here the only lever
+                        // is to force a rebuild.
+                        .id(keyboardType.rawValue)
                     }
-                    
-                    // Clear button (only show when focused and has text)
-                    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.S).accessibility(identifier: "ic_clear")
-                        }
+                }
+
+                // Clear button (only show when focused and has text)
+                if isFocused && !text.isEmpty {
+                    SwiftUI.Button(action: {
+                        text = ""
+                        onChangeText?("")
+                    }) {
+                        Icon(source: "24_navigation_close_circle_full", size: 16, color: theme.colors.text.hint)
+                            .padding(.horizontal, Spacing.XS)
                     }
-                    
-                    // Loading indicator
-                    if loading {
-                        ActivityIndicator(isAnimating: .constant(true), style: .medium)
-                            .frame(width: 16, height: 16)
-                            .padding(.leading, Spacing.S)
+                    .accessibilityIdentifier("ic_clear")
+                }
+
+                // Loading indicator
+                if loading {
+                    ActivityIndicator(isAnimating: .constant(true), style: .medium, color: getRightIconColor())
+                        .frame(width: 16, height: 16)
+                        .padding(.leading, Spacing.S)
+                }
+
+                // Right icon: password toggle once there is text, otherwise the custom icon (as Compose)
+                if secureTextEntry && !text.isEmpty {
+                    SwiftUI.Button(action: togglePasswordVisibility) {
+                        Icon(
+                            source: isPasswordHidden ? "24_security_eye_off" : "24_security_eye_open",
+                            size: 24,
+                            color: getRightIconColor()
+                        )
+                        .padding(.leading, Spacing.S)
                     }
-                    
-                    // Right icon (password toggle or custom icon)
-                    if secureTextEntry {
-                        if !text.isEmpty {
-                            SwiftUI.Button(action: togglePasswordVisibility) {
-                                Icon(
-                                    source: isPasswordHidden ? "24_security_eye_off" : "24_security_eye_open",
-                                    size: 24,
-                                    color: getRightIconColor()
-                                )
-                                .padding(.leading, Spacing.S).accessibility(identifier: "ic_show_hide")
-                            }
-                        }
-                    } else if !rightIcon.isEmpty {
-                        SwiftUI.Button(action: { onRightIconPressed?() }) {
-                            Icon(source: rightIcon, size: 24, color: getRightIconColor())
-                                .padding(.leading, Spacing.S)
-                        }
+                    .accessibilityIdentifier("ic_show_hide")
+                } else if !rightIcon.isEmpty {
+                    SwiftUI.Button(action: { onRightIconPressed?() }) {
+                        Icon(source: rightIcon, size: 24, color: getRightIconColor())
+                            .padding(.leading, Spacing.S)
                     }
                 }
-                .padding(.horizontal, Spacing.M)
-                .frame(height: fontScale(size == .small ? 48 : 56))
-                .background(
-                    RoundedRectangle(cornerRadius: Radius.S)
-                        .fill(theme.colors.background.surface)
-                )
-                .overlay(
-                    RoundedRectangle(cornerRadius: Radius.S)
-                        .stroke(borderColor(), lineWidth: 1)
-                )
             }
-            
+            .padding(.horizontal, Spacing.M)
+            .frame(height: fontScale(size == .small ? 48 : 56))
+            .background(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .fill(theme.colors.background.surface)
+            )
+            .overlay(
+                RoundedRectangle(cornerRadius: Radius.S)
+                    .stroke(borderColor(), lineWidth: 1)
+            )
+            .overlay(alignment: .topLeading) { floatingLabel }
+
             // Error or hint
             ErrorView(
                 errorMessage: error,
@@ -263,10 +235,33 @@ public struct Input: View {
             }
         }
     }
-    
+
+    /// 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: getFloatingColor())
+                if required {
+                    MomoText("*", typography: .labelSMedium, color: theme.colors.error.primary)
+                }
+                if !floatingIcon.isEmpty {
+                    Icon(source: floatingIcon, size: 16, color: getFloatingIconColor())
+                        .padding(.leading, Spacing.XS)
+                }
+            }
+            .padding(.horizontal, Spacing.S)
+            .background(theme.colors.background.surface)
+            .alignmentGuide(.top) { $0[VerticalAlignment.center] }
+            .offset(x: Spacing.S)
+        }
+    }
+
     // MARK: - Helpers
-    
+
     private func handleFocusChange(_ focused: Bool) {
+        // The keyboard-hide fallback can report a blur the field already reported.
+        guard focused != isFocused else { return }
         isFocused = focused
         if focused {
             onFocus?()
@@ -316,10 +311,6 @@ public struct Input: View {
         return disabled ? theme.colors.text.disable : (floatingIconColor ?? theme.colors.text.default)
     }
 
-    private func getLeadingIconColor() -> Color {
-        return disabled ? theme.colors.text.disable : (leadingIconColor ?? theme.colors.text.hint)
-    }
-
     private func getRightIconColor() -> Color {
         return disabled ? theme.colors.text.disable : (rightIconColor ?? theme.colors.text.default)
     }
@@ -329,6 +320,7 @@ public struct Input: View {
 // MARK: - Secure Input Field (UIViewRepresentable)
 private struct SecureInputField: UIViewRepresentable {
     @Binding var text: String
+    var isSecure: Bool
     var keyboardType: UIKeyboardType
     var fontSize: CGFloat
     var fontWeight: UIFont.Weight
@@ -346,10 +338,19 @@ private struct SecureInputField: UIViewRepresentable {
 
     func makeUIView(context: Context) -> UITextField {
         let textField = UITextField()
-        textField.isSecureTextEntry = true
+        textField.isSecureTextEntry = isSecure
+        // Stays a password field while revealed: keep it out of autocorrect / QuickType learning.
+        textField.autocorrectionType = .no
+        textField.autocapitalizationType = .none
+        textField.spellCheckingType = .no
         textField.delegate = context.coordinator
         textField.keyboardType = keyboardType
-        textField.font = UIFont.systemFont(ofSize: fontSize, weight: fontWeight)
+        textField.font = momoUIFont(
+            size: fontSize,
+            weight: fontWeight,
+            family: context.environment.appTheme.font,
+            isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
+        )
         textField.textColor = textColor
         textField.isEnabled = !isDisabled
         textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
@@ -374,6 +375,15 @@ private struct SecureInputField: UIViewRepresentable {
         if textField.text != text {
             textField.text = text
         }
+        let font = momoUIFont(
+            size: fontSize,
+            weight: fontWeight,
+            family: context.environment.appTheme.font,
+            isWhiteList: context.environment.designSystemKitsConfigs.isWhiteList
+        )
+        if textField.font != font {
+            textField.font = font
+        }
         textField.isEnabled = !isDisabled
         textField.textColor = textColor
         textField.tintColor = cursorColor
@@ -381,6 +391,12 @@ private struct SecureInputField: UIViewRepresentable {
             textField.keyboardType = keyboardType
             textField.reloadInputViews()
         }
+        if textField.isSecureTextEntry != isSecure {
+            textField.isSecureTextEntry = isSecure
+            if textField.isFirstResponder {
+                context.coordinator.reinsertText(in: textField)
+            }
+        }
     }
 
     class Coordinator: NSObject, UITextFieldDelegate {
@@ -391,19 +407,21 @@ private struct SecureInputField: UIViewRepresentable {
             self.parent = parent
         }
 
-        func textFieldDidBeginEditing(_ textField: UITextField) {
+        // When a secure text field regains focus (or turns secure while editing),
+        // iOS marks the existing text as "committed" and the next keystroke would
+        // replace ALL of it. Re-inserting via insertText() puts it back into an
+        // "active editing" state (and moves the caret to the end).
+        func reinsertText(in 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
-            }
+            guard !existingText.isEmpty else { return }
+            isResettingText = true
+            textField.text = ""
+            textField.insertText(existingText)
+            isResettingText = false
+        }
+
+        func textFieldDidBeginEditing(_ textField: UITextField) {
+            reinsertText(in: textField)
             parent.onFocusChange(true)
         }
 
@@ -460,12 +478,17 @@ private extension View {
 struct ActivityIndicator: UIViewRepresentable {
     @Binding var isAnimating: Bool
     let style: UIActivityIndicatorView.Style
+    /// Compose tints the spinner with the right-icon color; nil keeps the system gray.
+    var color: Color? = nil
 
     func makeUIView(context: UIViewRepresentableContext<ActivityIndicator>) -> UIActivityIndicatorView {
         return UIActivityIndicatorView(style: style)
     }
 
     func updateUIView(_ uiView: UIActivityIndicatorView, context: UIViewRepresentableContext<ActivityIndicator>) {
+        if let color {
+            uiView.color = UIColor(color)
+        }
         isAnimating ? uiView.startAnimating() : uiView.stopAnimating()
     }
 }