@momo-kits/native-kits 0.167.1-duo.1-debug → 0.167.1-duo.10

package/CLAUDE.md

@@ -35,6 +35,13 @@ No unit-test suite is configured. Validate changes by compiling the relevant tar
 ./gradlew :sample:androidApp:installDebug                 # run demo on device/emulator
 ```
 
+The SwiftUI kit (`ios/`, pod `MoMoUIKits`) compiles on its own through the sample's Pods project (`pod install` in `sample/iosApp` first when files are added):
+
+```bash
+xcodebuild -project sample/iosApp/Pods/Pods.xcodeproj -scheme MoMoUIKits -sdk iphonesimulator \
+  -destination 'generic/platform=iOS Simulator' build
+```
+
 Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do not publish manually unless asked: `sh publish.sh beta` / `sh publish.sh release` (Maven→GitLab + NPM).
 
 ## Architecture essentials
@@ -47,6 +54,31 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.
 - **iOS swipe-back:** the host owns the only edge-pan recogniser and replays it through `HostBackGestureBridge` (`navigation/HostBackGestureBridge.kt`; the kit framework is never exported, so the host reaches it through its own Koin-provided facade): `checkCanPop` / `canPopInner` / `pop` route the back into the kit stack, `started` / `progressed` / `completed` / `cancelled` seek the NavHost transition, `shouldUseFloatingArrowBack` is set by bottom tabs. `NavigationContainer` attaches itself automatically (`AttachHostBackGesture`, iOS only, detached by identity on dispose) — hosts need no wrapper and no `setNavigator`. `maxApi` is a required parameter of `NavigationContainer` — every container, nested or root, is handed its host bridge explicitly.
 
+## SwiftUI kit (`ios/`)
+
+- **Layout mirrors Compose:** `ios/Navigation/` follows `navigation/` file for file (`NavigationContainer`, `Navigator`, `Navigation` (options + per-screen `Navigation`), `StackScreen` (incl. `NavigationFooter`), `BottomSheet`, `ModalScreen`, `HostBackGestureBridge`, `BottomTab/`, `Component/`, `Tracking/`); `ios/Layout/ScreenLayout.swift` mirrors `layout/`. `ios/Application/` keeps only context (`ApplicationEnvironment`), `Localize*`, `MaxApi` and the deprecated `Screen` / `LegacyHeader` (Compose `application/`). Change a navigation piece on both sides together.
+- **File basenames must be unique across the pod** — Swift fails with "filename used twice" even in different folders (hence `LegacyHeader.swift` next to `Navigation/Component/Header.swift`). New folders under `ios/` must be added to `source_files` in `ios/native-kits.podspec`.
+- Screens update their own chrome at runtime through `@EnvironmentObject var navigation: Navigation` → `setOptions { $0.title = … }` (Compose `LocalNavigation`); bottom tabs keep one `Navigation` per tab. The host back bridge is `HostBackGestureBridge.shared` (`NavigatorManager` is a deprecated alias); a bottom tab off its first tab routes back to the first tab (`Navigator.tabBackHandler`, keyed by the hosting screen).
+- The pod's minimum is **iOS 15**, but the navigation shell (`NavigationContainer`, `Navigator`, `HostBackGestureBridge`, `BottomTab`, overplay views) is **iOS 16+** (`@available(iOS 16.0, *)`) because it is built on `NavigationStack`. Keep components outside that shell iOS 15-compatible.
+- `present` opens one `fullScreenCover` that hosts its own `NavigationStack` (`Navigator.presentedPath`): pushes and pops act on the presented flow while it is up, and each overplay (modal / bottom sheet / snackbar) renders in the context it was shown over (`OverplayItem.presentedId`).
+- Icons are compiled in: `ios/Icon/Icons.swift` is generated from Compose `utils/Icons.kt` by `node scripts/gen-ios-icons.mjs` — don't hand-edit it. A host `icon.json` in the main bundle only adds keys the kit lacks.
+- Bundled assets (colors, Lottie JSON) live in `ios/Resources` and ship in the `MoMoUIKitsResources` bundle; load them through `MoMoUIKitsResources.bundle`, never `Bundle.main`.
+
+## Screen layout / iPhone Duo (port of RN `useScreenLayout`, momo-kits !664)
+
+- `layout/ScreenLayout.kt`: `getScreenLayout()` returns window size, raw top/bottom + side insets, `contentWidth`, header geometry, the iPhone Duo `sideBar` and `duoTopInset`. `NavigationContainer` computes it once and provides `LocalScreenLayout`; reactive to fold/unfold and rotation (window size + `WindowInsets`). Metrics (`DuoMetrics`, 72pt iPhone header floor, 20pt status-bar threshold) mirror RN `Layout/utils.ts` — change both together.
+- iPhone-only: everything gates on `isPhoneIdiom()` (`platform/`), never on "iOS", so iPad windows keep the regular layout. Two detectors, as in RN: `isIPhoneDuo` (window aspect < 1.6 or asymmetric side insets) drives layout; `isIPhoneDuoDevice` (short side of screen or window > 440, RN `device.ts`) drives popups, modal and bottom sheet.
+- Header height is `headerHeight` (not `AppStatusBar + HEADER_HEIGHT`); the bar row is `headerBarHeight` and starts `headerStatusBarHeight` below the window top. When the status bar is off the top edge (iPhone landscape, iPhone Duo) `headerStatusBarHeight` is 0 so the title stays centered — except on the Duo outer display in portrait, where the header is 76pt and the row starts at 14pt so the title centers on the camera punchout.
+- iPhone Duo with a side strip ≥ 60pt: back + toolkit leave the bar for `HeaderSideBar` (`navigation/component/SideBar.kt`, 48pt glass controls); custom header-right stays in the bar. `sideBar.top` is 170pt in portrait, 120pt on the inner display in landscape (height ≥ 600), 24pt on the outer display in landscape, or below the header when the status bar is on top; UIKit's `statusBarFrame` is useless on Duo. Unlike RN the column is clamped above footer (24pt gap) / rail (12pt gap).
+- Reserved regions (iOS 27.1 `reservedRegionsOfKind:`, reached through the ObjC runtime so older SDKs still build): a probe `UIView` (`platform/ReservedRegions.ios.kt` on the Compose root view; `ReservedRegionsProbe` inside SwiftUI `momoScreenLayout()`) re-reads them in `layoutSubviews`, which UIKit re-runs when they change. They push `sideBar.top` below the status cluster as it grows for calls / Live Activities, and `sideBar.bottom` (≥ 24pt) above a camera at the bottom end of the strip.
+- Tab bar on Duo is `bottomtab/DuoTabBar.kt`: a rail in the side strip (`sideBar.bottom` above the window bottom, QR below it) or, without a side bar, a floating bar spanning 6/8 grid columns. Both overlay the content; `duoFloatingTabBarInset` pads tab content, footer and FAB.
+- Bar compression (`bottomtab/DuoBarCompression.kt`, HIG "Vertical controls"): when toolbar + rail don't fit in the strip, one is compressed — the toolkit into a `navigation_menu` button, the rail into one button showing the current tab — and tapping it swaps them; `BottomTab(compressionBehavior)` picks which starts compressed. If neither fits beside the other compressed, both rest compressed and a tap opens one for a moment. Side bar columns report their full height so the decision follows each screen's toolkit.
+- Glass header: on Duo with a side bar, Default/Extended headers without search and with a `ScrollState` let content scroll under the bar (`usesDuoGlassHeader`); the bar fades in a translucent surface + hairline over 16pt (Compose has no backdrop blur — RN's fallback look), the gradient leaves with the content.
+- Quick return header: glass headers and Animated headers (with a `ScrollState`) on the Duo side bar layout slide out with the content and back in on a reverse scroll; a half-shown header settles in or out once the scroll stops. The side bar is drawn apart from the header, so it stays put.
+- Overlays on Duo: popups cap at 440pt wide and the room between `duoTopInset` and the bottom inset (body scrolls, actions stay); modal centers inside that room; bottom sheet uses the window height, centers at width ≥ 600 and pads by side insets in landscape.
+- Font scale deliberately uses the short side (`min(w, h)`), unlike RN which reads the window width — landscape must not inflate every font.
+- `StackScreen` pads content/footer/search/FAB by the side insets and provides an inset-consumed layout to its content; a bottom-tab root stays full width (tab bar + each tab's StackScreen handle insets). Grid columns use `contentWidth`.
+
 ## i18n / Localize (port of RN `Localize`)
 
 - `application/Localize.kt`: everything i18n. `LocalizationObject` is a data class with required `vi` / `en` maps (`LocalizationObject(vi = mapOf(…), en = mapOf(…))`). `Localize` constructors take a `LocalizationObject` or a `(vi, en)` map pair; the constructor **merges** the kit defaults with the host data (host wins on key clash). Methods: `translate(key)` (missing/empty → returns the key), `translateData(map)` / `translateData(vi, en)`, `addTranslations` (existing keys win), `changeLanguage(lang)`. Default language `"vi"`, `"en"` only on exact match; language is snapshot state so a switch recomposes consumers.

package/ios/Application/ApplicationEnvironment.swift

@@ -41,6 +41,12 @@ public class KitConfig {
     public var trustBanner: TrustBannerData? = nil
     public var headerBar: String? = nil
     public var headerGradient: String? = nil
+
+    public init(trustBanner: TrustBannerData? = nil, headerBar: String? = nil, headerGradient: String? = nil) {
+        self.trustBanner = trustBanner
+        self.headerBar = headerBar
+        self.headerGradient = headerGradient
+    }
 }
 
 public class ApplicationEnvironment: ObservableObject {
@@ -59,6 +65,17 @@ public class ApplicationEnvironment: ObservableObject {
     }
 }
 
+extension ApplicationEnvironment {
+    /// Closes the mini app: through `composeApi` as before, else `maxApi` (Compose `maxApi.dismiss`).
+    func requestDismiss() {
+        if let composeApi {
+            composeApi.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+        } else {
+            maxApi?.dismiss(completion: nil)
+        }
+    }
+}
+
 private struct ApplicationEnvironmentKey: EnvironmentKey {
     static let defaultValue = ApplicationEnvironment()
 }

package/ios/Application/ComposeApi.swift

@@ -1,11 +1,12 @@
 import Foundation
 
+@available(*, deprecated, message: "Use KitComposeApi or MaxApi")
 public protocol ComposeApi {
     func request(funcName: String, params: Any, _ completion: ((String) -> Void)?)
     func request(funcName: String, params: Any) -> String
 }
 
-// Default implementation
+@available(*, deprecated, message: "Use KitComposeApi or MaxApi")
 public class ComposeApiImpl: ComposeApi {
     public static let shared = ComposeApiImpl()
     

package/ios/Application/{Components.swift → LegacyHeader.swift}

@@ -1,55 +1,13 @@
 //
-//  Components.swift
-//  Pods
+//  LegacyHeader.swift
+//  MoMoUIKits
 //
-//  Created by sophia on 24/1/25.
+//  Header pieces of the deprecated `Screen` (Compose `application/Header.kt`,
+//  `application/HeaderBackground.kt`). New screens get theirs from `StackScreen`.
 //
 
 import SwiftUI
 
-// MARK: - Enums
-
-public enum TitlePosition {
-    case left, center
-}
-
-public enum HeaderType {
-    case `default`, extended, none
-}
-
-public enum AnimatedHeaderRatio {
-    case ratio16_9
-    case ratio1_1
-    case ratio3_2
-
-    var value: CGFloat {
-        switch self {
-        case .ratio16_9: return 16.0 / 9.0
-        case .ratio1_1:  return 1.0
-        case .ratio3_2:  return 3.0 / 2.0
-        }
-    }
-}
-
-
-// MARK: - Animated Header Config
-
-public struct AnimatedHeader {
-    public var aspectRatio: AnimatedHeaderRatio = .ratio16_9
-    public var isSurface: Bool = true
-    public var composable: (_ scrollState: CGFloat) -> AnyView = { _ in AnyView(EmptyView()) }
-
-    public init(
-        aspectRatio: AnimatedHeaderRatio = .ratio16_9,
-        isSurface: Bool = true,
-        composable: @escaping (_ scrollState: CGFloat) -> AnyView = { _ in AnyView(EmptyView()) }
-    ) {
-        self.aspectRatio = aspectRatio
-        self.isSurface = isSurface
-        self.composable = composable
-    }
-}
-
 // MARK: - Utils
 
 func safeAreaTopInset() -> CGFloat {
@@ -66,6 +24,7 @@ func safeAreaTopInset() -> CGFloat {
 
 // MARK: - Header Background
 
+@available(*, deprecated, message: "Use NavigationContainer + StackScreen; the header background comes with it")
 public struct HeaderBackground: View {
     var headerType: HeaderType = .default
     var scrollState: CGFloat
@@ -146,24 +105,9 @@ public struct HeaderBackground: View {
     }
 }
 
-// MARK: - Bottom-tab root preference
-
-/// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
-/// it's hosting a self-contained bottom-tab surface and skip its own bottom
-/// safe-area reservation — mirrors Compose's `Navigation.markAsBottomTabRoot()`
-/// (`navigation.isBottomTabRoot`, read by `StackScreen.kt`'s `MainContent`).
-/// Without this, `BottomTab`'s own internal safe-area handling gets an extra,
-/// unwanted inset stacked on top of it by the outer `StackScreen`, pushing the
-/// tab bar up higher than the true bottom inset.
-public struct IsBottomTabRootKey: PreferenceKey {
-    public static var defaultValue: Bool = false
-    public static func reduce(value: inout Bool, nextValue: () -> Bool) {
-        value = value || nextValue()
-    }
-}
-
 // MARK: - Header View
 
+@available(*, deprecated, message: "Use NavigationContainer + StackScreen; the header comes with it")
 public struct Header: View {
     var headerType: HeaderType = .default
     var titlePosition: TitlePosition
@@ -248,9 +192,7 @@ public struct Header: View {
                         if let inputProps = inputSearchProps {
                             InputSearch(props: inputProps)
                         } else if case let .user(userData)? = headerTitle {
-                            if #available(iOS 16.0, *) {
-                                HeaderUserView(userData)
-                            }
+                            HeaderUserView(userData)
                         } else {
                             MomoText(headerTitle?.defaultTitle ?? title, typography: .headerDefaultBold, color: tintColor ?? Colors.black17, maxLines: 1)
                                 .opacity(titleOpacity)

package/ios/Application/Screen.swift

@@ -1,12 +1,13 @@
 //
 //  Screen.swift
-//  Pods
+//  MoMoUIKits
 //
-//  Created by sophia on 5/2/25.
+//  Deprecated standalone screen (Compose `application/Screen.kt`).
 //
 
 import SwiftUI
 
+@available(*, deprecated, message: "Use NavigationContainer + StackScreen")
 public struct Screen<Content: View>: View {
     // MARK: - Properties
     

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

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))