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

package/ios/Avatar/Avatar.swift

@@ -74,12 +74,12 @@ public struct Avatar: View {
             .clipShape(RoundedRectangle(cornerRadius: cornerRadius))
             .overlay(
                 RoundedRectangle(cornerRadius: cornerRadius)
-                    .stroke(theme.colors.border.default, lineWidth: 1)
+                    .strokeBorder(theme.colors.border.default, lineWidth: 1)
             )
 
             // Badge icons — outside clip so they are not cut by border
             if shouldShowIconTop {
-                ImageView(LOGO_MOMO_URL)
+                ImageView(LOGO_MOMO_URL, contentMode: .fill)
                     .frame(width: badgeSizeDp, height: badgeSizeDp)
                     .clipShape(RoundedRectangle(cornerRadius: badgeCornerRadius))
                     .offset(x: 1, y: -1)
@@ -92,7 +92,7 @@ public struct Avatar: View {
             }
 
             if shouldShowIconBottom {
-                ImageView(iconSupport)
+                ImageView(iconSupport, contentMode: .fill)
                     .frame(width: badgeSizeDp, height: badgeSizeDp)
                     .clipShape(RoundedRectangle(cornerRadius: badgeCornerRadius))
                     .offset(x: 1, y: 1)
@@ -107,6 +107,7 @@ public struct Avatar: View {
         .frame(width: size.sizeDp, height: size.sizeDp)
         .accessibilityElement(children: .ignore)
         .accessibilityLabel(automationId)
+        .accessibilityIdentifier(automationId)
     }
 
     // MARK: Internal

package/ios/Badge/Badge.swift

@@ -33,7 +33,8 @@ public struct Badge: View {
     }
     
     private func formatTitle(_ text: String) -> String {
-        if isNumber(text), let number = Int(text), number > 99 {
+        // Digits too long for Int are well over 99.
+        if isNumber(text), (Int(text) ?? .max) > 99 {
             return "99+"
         }
         return text
@@ -54,14 +55,15 @@ public struct Badge: View {
     }
     
     public var body: some View {
-        MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01)
+        MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01, maxLines: 1)
             .padding(.horizontal, Spacing.XS)
-            .frame(minWidth: fontScale(16), minHeight: fontScale(16))
+            .frame(minWidth: fontScale(16))
+            .frame(height: fontScale(16))
             .background(badgeColor)
             .cornerRadius(Radius.M)
             .overlay(
                 RoundedRectangle(cornerRadius: Radius.M)
-                    .stroke(Colors.black01, lineWidth: 1)
+                    .strokeBorder(Colors.black01, lineWidth: 1)
             )
     }
 }

package/ios/Badge/BadgeDot.swift

@@ -25,7 +25,7 @@ public struct BadgeDot: View {
             .frame(width: size.size, height: size.size)
             .overlay(
                 Circle()
-                    .stroke(Colors.black01, lineWidth: 1)
+                    .strokeBorder(Colors.black01, lineWidth: 1)
             )
     }
 }

package/ios/Badge/BadgeRibbon.swift

@@ -160,7 +160,6 @@ public struct BadgeRibbon: View {
             MomoText(label, typography: .labelXsMedium, color: Colors.black01, maxLines: 1)
                 .rotationEffect(rotation)
                 .frame(height: RibbonConstants.skewBodyHeight)
-                .padding(.horizontal, 8)
                 .background(backgroundColor)
             
             rightTail
@@ -204,7 +203,9 @@ public struct BadgeRibbon: View {
 /// rotation) — the label gets the same scale applied a second time so it stays right-reading
 /// while only the ribbon shape flips.
 public struct RoundedBadgeRibbon: View {
+    @Environment(\.appTheme) private var theme
     @Environment(\.momoFontScale) private var fontScale
+    @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
     let text: String
     let position: RibbonPosition
 
@@ -224,7 +225,12 @@ public struct RoundedBadgeRibbon: View {
 
     private var measuredTextSize: CGSize {
         let fontSize = fontScale(TypographyStyle.labelXsMedium.fontSize)
-        let font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+        let font = momoUIFont(
+            size: fontSize,
+            weight: .medium,
+            family: theme.font,
+            isWhiteList: designSystemKitsConfigs.isWhiteList
+        )
         return text.size(withAttributes: [.font: font])
     }
 

package/ios/Button/Button.swift

@@ -51,15 +51,17 @@ public extension ButtonType {
     }
 
     func contentColor(loading: Bool, theme: Theme) -> Color {
+        let color: Color
         switch self {
-        case .disabled: return theme.colors.text.disable.opacity(loading ? 0.75 : 1)
-        case .primary: return Colors.black01
-        case .secondary: return theme.colors.text.default
-        case .outline: return theme.colors.primary
-        case .tonal: return theme.colors.primary
-        case .danger: return Colors.black01
-        case .text: return theme.colors.primary
+        case .disabled: color = theme.colors.text.disable
+        case .primary: color = Colors.black01
+        case .secondary: color = theme.colors.text.default
+        case .outline: color = theme.colors.primary
+        case .tonal: color = theme.colors.primary
+        case .danger: color = Colors.black01
+        case .text: color = theme.colors.primary
         }
+        return color.opacity(loading ? 0.75 : 1)
     }
 
     var borderColor: Color? {
@@ -219,9 +221,8 @@ public struct Button: View {
         let color: Color? = useTintColor ? textColor : nil
 
         if forceLoading {
-            LottieView(name: "lottie_circle_loader", loopMode: .loop)
+            LottieView(name: "lottie_circle_loader", loopMode: .loop, tintColor: color.map { UIColor($0) })
                 .frame(width: size.iconSize, height: size.iconSize)
-                .colorMultiply(color ?? Colors.black01)
         } else if !icon.isEmpty {
             Icon(source: icon, size: size.iconSize, color: color)
         }
@@ -229,8 +230,8 @@ public struct Button: View {
 }
 
 /// Mirrors Compose's press feedback: the background shrinks via an animated
-/// horizontal inset while the content fades, rather than a plain opacity dim on
-/// the whole button (matching `animatedPadding`/`alpha` in Button.kt).
+/// horizontal inset and the whole button (background included) fades to 0.5,
+/// matching `animatedPadding`/`alpha` in Button.kt.
 private struct ButtonPressFeedbackStyle: ButtonStyle {
     let isEnabled: Bool
     let background: Color
@@ -245,7 +246,6 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
 
         configuration.label
             .modifier(HugContentOnLegacyOS(isFull: isFull))
-            .opacity(pressed ? 0.5 : 1)
             .background(
                 RoundedRectangle(cornerRadius: radius)
                     .fill(background)
@@ -257,6 +257,9 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
             )
             .frame(height: height)
             .clipShape(RoundedRectangle(cornerRadius: radius))
+            // `.text` has a clear background, which SwiftUI does not hit-test.
+            .contentShape(RoundedRectangle(cornerRadius: radius))
+            .opacity(pressed ? 0.5 : 1)
             .animation(.easeInOut(duration: 0.1), value: pressed)
     }
 }

package/ios/CalculatorKeyboard/CalculatorKeyboard.swift

@@ -16,55 +16,101 @@ extension String {
 public struct CalculatorKeyboard: View {
     // MARK: Lifecycle
     @Binding var value: String
-    @State var tempValue: String = ""
     
     public init(_ value: Binding<String>) {
         self._value = value
     }
+
+    // Derived from `value` so a host write to the binding (prefill, reset after submit) is honoured.
+    private var expression: String {
+        value.replacingOccurrences(of: "x", with: "*").replacingOccurrences(of: "÷", with: "/")
+    }
     
     func onPressBack(){
         if (value.count > 0 ){
             value.removeLast()
         }
-        
     }
     
     func onPressClear(key: String){
         value = ""
-        tempValue = ""
     }
     
     func onPressEqual(key: String){
-        if (tempValue == "") {
+        var expression = self.expression
+        if (expression == "") {
             return
         }
-        if (tempValue.last?.isNumber == false){
-            tempValue.removeLast()
+        if (expression.last?.isNumber == false){
+            expression.removeLast()
         }
-        let expression = NSExpression(format: tempValue)
-        
-        value = String(expression.expressionValue(with: nil, context: nil) as! Int)
-        if (Int(value) ?? 0 < 0){
+        // Overflow and division by zero are treated like a negative result: cleared.
+        if let result = Self.evaluate(expression), result >= 0 {
+            value = String(result)
+        } else {
             value = ""
         }
     }
+
+    /// Integer `+ - * /` with the usual precedence, as NSExpression did, but nil instead of a
+    /// crash when a number or result leaves `Int` range.
+    static func evaluate(_ expression: String) -> Int? {
+        var numbers: [Int] = []
+        var operators: [Character] = []
+        var digits = ""
+        for char in expression {
+            if ("0"..."9").contains(char) {
+                digits.append(char)
+                continue
+            }
+            guard let number = Int(digits) else { return nil }
+            numbers.append(number)
+            operators.append(char)
+            digits = ""
+        }
+        guard let last = Int(digits) else { return nil }
+        numbers.append(last)
+
+        var terms = [numbers[0]]
+        var signs: [Character] = []
+        for (op, number) in zip(operators, numbers.dropFirst()) {
+            switch op {
+            case "*":
+                let (product, overflow) = terms[terms.count - 1].multipliedReportingOverflow(by: number)
+                if overflow { return nil }
+                terms[terms.count - 1] = product
+            case "/":
+                guard number != 0 else { return nil }
+                terms[terms.count - 1] /= number
+            case "+", "-":
+                terms.append(number)
+                signs.append(op)
+            default:
+                return nil
+            }
+        }
+
+        var result = terms[0]
+        for (sign, term) in zip(signs, terms.dropFirst()) {
+            let (next, overflow) = sign == "+"
+                ? result.addingReportingOverflow(term)
+                : result.subtractingReportingOverflow(term)
+            if overflow { return nil }
+            result = next
+        }
+        return result
+    }
     
     func onPressKey(key:String){
-        if (tempValue.last?.isNumber == false){
+        if (value.last?.isNumber == false){
             if (key.isNumber == false){
                 return
             }
         }
-        var convertedKey = key
-        if (key == "x") {convertedKey = "*"}
-        if (key == "÷") {convertedKey = "/"}
         if (value == "" && (key == "0" || key == "000" || key.isNumber == false)) {
             return
         }
-        else {
-            value.append(key)
-            tempValue.append(convertedKey)
-        }
+        value.append(key)
     }
     
     // MARK: Public

package/ios/Carousel/Carousel.swift

@@ -1,4 +1,3 @@
-import Combine
 import SwiftUI
 
 /// Native SwiftUI port of the Compose `Carousel` component.
@@ -10,9 +9,9 @@ import SwiftUI
 /// snap behavior, and scroll enable/disable. Snap / scroll-index callbacks
 /// report the real item index.
 ///
-/// Available iOS 14+ (uses a custom paging ScrollView so behavior is identical
+/// Uses a custom drag-driven pager (not a ScrollView) so behavior is identical
 /// across versions and supports the loop virtualization + transform effects
-/// that `TabView(.page)` cannot express).
+/// that `TabView(.page)` cannot express.
 public struct Carousel<Content: View>: View {
     // MARK: Lifecycle
 
@@ -82,7 +81,7 @@ public struct Carousel<Content: View>: View {
     @State private var currentPage: Int
     @State private var dragOffset: CGFloat = 0
     @State private var isDragging: Bool = false
-    @State private var autoplayTick: Int = 0
+    @GestureState private var dragActive = false
 
     private func realIndex(_ page: Int) -> Int {
         ((page % itemCount) + itemCount) % itemCount
@@ -124,9 +123,20 @@ public struct Carousel<Content: View>: View {
         }
         .frame(width: viewportWidth)
         .clipped()
-        .onReceive(autoplayTimer) { _ in
-            guard autoplay, itemCount > 1, !isDragging else { return }
-            advance()
+        // Restarts on drag like Compose's LaunchedEffect(autoplayInterval, isUserScrolling).
+        .task(id: AutoplayKey(enabled: autoplay && itemCount > 1 && !isDragging, interval: autoplayInterval)) { @MainActor in
+            guard autoplay, itemCount > 1, !isDragging, autoplayInterval > 0 else { return }
+            while !Task.isCancelled {
+                try? await Task.sleep(nanoseconds: UInt64(autoplayInterval * 1_000_000_000))
+                guard !Task.isCancelled else { return }
+                advance()
+            }
+        }
+        // A drag stolen by a parent scroll view never reaches `onEnded`; settle on the current page.
+        .onChange(of: dragActive) { active in
+            guard !active, isDragging else { return }
+            isDragging = false
+            withAnimation(.easeInOut(duration: 0.25)) { dragOffset = 0 }
         }
     }
 
@@ -147,9 +157,14 @@ public struct Carousel<Content: View>: View {
 
     private func dragGesture(step: CGFloat) -> some Gesture {
         DragGesture(minimumDistance: 5)
+            .updating($dragActive) { _, active, _ in active = true }
             .onChanged { value in
                 isDragging = true
-                dragOffset = value.translation.width
+                var offset = value.translation.width
+                // No slide exists past either end, as with HorizontalPager bounds.
+                if currentPage == 0 { offset = min(offset, 0) }
+                if currentPage == virtualPageCount - 1 { offset = max(offset, 0) }
+                dragOffset = offset
             }
             .onEnded { value in
                 isDragging = false
@@ -167,7 +182,8 @@ public struct Carousel<Content: View>: View {
                     let moved = step > 0 ? Int((-dragOffset / step).rounded()) : 0
                     target = min(max(currentPage + moved, 0), virtualPageCount - 1)
                 }
-                dragOffset = 0
+                // Animated so a drag that stays on the same page eases back too.
+                withAnimation(.easeInOut(duration: 0.25)) { dragOffset = 0 }
                 setPage(target)
             }
     }
@@ -189,8 +205,9 @@ public struct Carousel<Content: View>: View {
             onScrollIndexChanged(real)
         }
     }
+}
 
-    private var autoplayTimer: Publishers.Autoconnect<Timer.TimerPublisher> {
-        Timer.publish(every: autoplayInterval, on: .main, in: .common).autoconnect()
-    }
+private struct AutoplayKey: Equatable {
+    let enabled: Bool
+    let interval: TimeInterval
 }

package/ios/Checkbox/Checkbox.swift

@@ -21,8 +21,10 @@ public struct Checkbox: View{
     }
 
     func onCheck(){
-        checked.toggle()
-        onChange?(checked)
+        // Not re-read from the binding: a `.constant` / one-way binding would report the stale value.
+        let newValue = !checked
+        checked = newValue
+        onChange?(newValue)
     }
 
     public var body: some View {
@@ -35,13 +37,15 @@ public struct Checkbox: View{
                         .frame(width: 20, height: 20)
                         .overlay(
                             RoundedRectangle(cornerRadius: Radius.XS)
-                                .stroke(borderColor, lineWidth: Spacing.XXS)
+                                .strokeBorder(borderColor, lineWidth: Spacing.XXS)
                         )
 
                     if checked {
                         Icon(source: indeterminate ? "navigation_minus" : "ic_checked", size: 20, color: Colors.black01)
                     }
                 }
+                // The unchecked fill is clear, which SwiftUI does not hit-test.
+                .contentShape(RoundedRectangle(cornerRadius: Radius.XS))
             }
             .buttonStyle(ActiveOpacityButtonStyle(activeOpacity: 0.8))
             .disabled(disabled)

package/ios/Chip/Chip.swift

@@ -89,18 +89,19 @@ public struct Chip: View {
             .padding(.horizontal, horizontal)
             .frame(height: height)
             .background(
-                RoundedRectangle(cornerRadius: radius, style: .continuous)
+                RoundedRectangle(cornerRadius: radius)
                     .fill(bg)
             )
             .overlay(
                 Group {
                     if selected {
-                        RoundedRectangle(cornerRadius: radius, style: .continuous)
-                            .stroke(theme.colors.secondary, lineWidth: 2)
+                        // Inside the bounds, like Compose `border`.
+                        RoundedRectangle(cornerRadius: radius)
+                            .strokeBorder(theme.colors.secondary, lineWidth: 2)
                     }
                 }
             )
-            .contentShape(RoundedRectangle(cornerRadius: radius, style: .continuous))
+            .contentShape(RoundedRectangle(cornerRadius: radius))
         }
         .buttonStyle(ActiveOpacityButtonStyle())
         .modifier(ChipAccessibilityModifier(accessibilityLabel: accessibilityLabel))

package/ios/Collapse/Collapse.swift

@@ -32,7 +32,7 @@ public struct Collapse<Content: View>: View {
     private let titleColor: Color?
     private let accessibilityId: String?
     private let onPress: ((Bool) -> Void)?
-    private let content: (() -> Content)?
+    private var content: (() -> Content)?
 
     @State private var expanded: Bool
 
@@ -87,31 +87,36 @@ public struct Collapse<Content: View>: View {
             header
 
             if let content {
-                if expanded {
-                    VStack(spacing: 0) {
-                        content()
+                // Compose's expandVertically: the clip grows with the panel while it slides in from the top.
+                VStack(spacing: 0) {
+                    if expanded {
+                        VStack(spacing: 0) {
+                            content()
+                        }
+                        .frame(maxWidth: .infinity)
+                        .overlay(
+                            showBorder
+                                ? Rectangle().strokeBorder(theme.colors.border.default, lineWidth: 1)
+                                : nil
+                        )
+                        .transition(.move(edge: .top))
                     }
-                    .frame(maxWidth: .infinity)
-                    .overlay(
-                        showBorder
-                            ? RoundedRectangle(cornerRadius: 0)
-                                .stroke(theme.colors.border.default, lineWidth: 1)
-                            : nil
-                    )
-                    .transition(.move(edge: .top).combined(with: .opacity))
                 }
+                .clipped()
             }
         }
         .frame(maxWidth: .infinity)
         .background(resolvedBackgroundColor)
         .clipShape(RoundedRectangle(cornerRadius: Radius.S, style: .continuous))
-        .accessibilityIdentifier(automationId)
         .overlay(
             showBorder
                 ? RoundedRectangle(cornerRadius: Radius.S, style: .continuous)
-                    .stroke(theme.colors.border.default, lineWidth: 1)
+                    .strokeBorder(theme.colors.border.default, lineWidth: 1)
                 : nil
         )
+        // `.contain` keeps the children's own identifiers instead of overriding them.
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier(automationId)
     }
 
     private var header: some View {
@@ -126,6 +131,7 @@ public struct Collapse<Content: View>: View {
                     ImageView(image, contentMode: .fill)
                         .frame(width: imageSize, height: imageSize)
                         .clipShape(RoundedRectangle(cornerRadius: Radius.XS, style: .continuous))
+                        .accessibilityIdentifier("\(automationId)|img")
                     Spacer().frame(width: Spacing.S)
                 }
 
@@ -133,15 +139,17 @@ public struct Collapse<Content: View>: View {
                     MomoText(
                         title,
                         typography: titleSize.typography,
-                        color: titleColor ?? theme.colors.text.default
+                        color: titleColor ?? theme.colors.text.default,
+                        accessibilityId: "\(automationId)|text"
                     )
                     if let description {
                         MomoText(
                             description,
                             typography: .bodyDefaultRegular,
-                            color: theme.colors.text.secondary
+                            color: theme.colors.text.secondary,
+                            maxLines: 2,
+                            accessibilityId: "\(automationId)|description-text"
                         )
-                        .lineLimit(2)
                     }
                 }
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -152,9 +160,10 @@ public struct Collapse<Content: View>: View {
                         MomoText(
                             subTitle,
                             typography: .bodyDefaultRegular,
-                            color: theme.colors.text.secondary
+                            color: theme.colors.text.secondary,
+                            maxLines: 1,
+                            accessibilityId: "\(automationId)|sub-title-text"
                         )
-                        .lineLimit(1)
                     } else if let tagLabel {
                         Tag(label: tagLabel, color: tagColor)
                     }
@@ -187,6 +196,48 @@ public struct Collapse<Content: View>: View {
                     .rotationEffect(.degrees(expanded ? 180 : 0))
             }
         }
+        .accessibilityIdentifier("\(automationId)|icon")
         .animation(.easeInOut(duration: 0.3), value: expanded)
     }
 }
+
+public extension Collapse where Content == EmptyView {
+    /// Header-only collapse, mirroring Compose's `content = null`.
+    init(
+        title: String,
+        description: String? = nil,
+        image: String? = nil,
+        imageSize: CGFloat = 24,
+        subTitle: String? = nil,
+        tagLabel: String? = nil,
+        tagColor: Tag.TagColor = .default,
+        showBorder: Bool = false,
+        expandDefault: Bool = false,
+        titleSize: CollapseTitleSize = .medium,
+        useBackgroundCollapseButton: Bool = false,
+        backgroundColor: Color? = nil,
+        titleColor: Color? = nil,
+        accessibilityId: String? = nil,
+        onPress: ((Bool) -> Void)? = nil
+    ) {
+        self.init(
+            title: title,
+            description: description,
+            image: image,
+            imageSize: imageSize,
+            subTitle: subTitle,
+            tagLabel: tagLabel,
+            tagColor: tagColor,
+            showBorder: showBorder,
+            expandDefault: expandDefault,
+            titleSize: titleSize,
+            useBackgroundCollapseButton: useBackgroundCollapseButton,
+            backgroundColor: backgroundColor,
+            titleColor: titleColor,
+            accessibilityId: accessibilityId,
+            onPress: onPress,
+            content: { EmptyView() }
+        )
+        self.content = nil
+    }
+}

package/ios/Colors+Radius+Spacing/Colors.swift

@@ -133,7 +133,7 @@ public enum Colors {
     public static let yellow06 = Color(hex: "ffe066")
     public static let yellow05 = Color(hex: "ffd633")
     public static let yellow04 = Color(hex: "ffd119")
-    public static let yellow03 = Color(hex: "fc0")
+    public static let yellow03 = Color(hex: "ffcc00")
     public static let yellow02 = Color(hex: "e6b800")
     public static let yellow01 = Color(hex: "cca300")
 
@@ -172,4 +172,13 @@ public enum Colors {
     public static let red03 = Color(hex: "f5222d")
     public static let red02 = Color(hex: "dd1f29")
     public static let red01 = Color(hex: "c41b24")
+
+    public static let opacityBlack20 = Color(hex: "00000033")
+    public static let opacityBlack40 = Color(hex: "00000066")
+    public static let opacityBlack60 = Color(hex: "00000099")
+    public static let opacityBlack80 = Color(hex: "000000cc")
+    public static let opacityWhite20 = Color(hex: "ffffff33")
+    public static let opacityWhite40 = Color(hex: "ffffff66")
+    public static let opacityWhite60 = Color(hex: "ffffff99")
+    public static let opacityWhite80 = Color(hex: "ffffffcc")
 }

package/ios/Colors+Radius+Spacing/Radius.swift

@@ -15,6 +15,12 @@ public struct RoundedCorner: Shape {
     var radius: CGFloat = .infinity
     var corners: UIRectCorner = .allCorners
 
+    /// iOS 15 stand-in for `UnevenRoundedRectangle`.
+    public init(radius: CGFloat = .infinity, corners: UIRectCorner = .allCorners) {
+        self.radius = radius
+        self.corners = corners
+    }
+
     public func path(in rect: CGRect) -> Path {
         let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
         return Path(path.cgPath)