@momo-kits/native-kits 0.162.30-debug → 0.162.31-debug

package/ios/Application/Navigation/Navigator.swift

@@ -89,7 +89,11 @@ public struct OverplayItem: Identifiable {
 
 @available(iOS 16.0, *)
 public final class Navigator: ObservableObject {
-    @Published public var path: [DynamicScreenRoute] = []
+    @Published public var path: [DynamicScreenRoute] = [] {
+        // Disposal hangs off the path so every route that leaves the stack — pop,
+        // replace, reset — is released the same way, after its exit transition.
+        didSet { disposeScreens(droppedFrom: oldValue) }
+    }
     @Published public var presented: DynamicDialogRoute?
     @Published public var overplay: OverplayItem?
 
@@ -147,8 +151,7 @@ public final class Navigator: ObservableObject {
 
     public func replace<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
         guard !path.isEmpty else { return }
-        let removed = path.removeLast()
-        registry.unregister(id: removed.id)
+        path.removeLast()
         push(content, options: options)
     }
 
@@ -158,14 +161,12 @@ public final class Navigator: ObservableObject {
         options: NavigationOptions? = nil
     ) {
         guard !path.isEmpty else { return }
-        let removed = path.removeLast()
-        registry.unregister(id: removed.id)
+        path.removeLast()
         push(screenName: screenName, content, options: options)
     }
 
     public func reset<V: View>(@ViewBuilder _ content: @escaping () -> V, options: NavigationOptions? = nil) {
-        for route in path { registry.unregister(id: route.id) }
-        registry.unregister(id: rootRoute.id)
+        let previousRoot = rootRoute.id
         path.removeAll()
         let route = registry.register(
             screenName: options?.screenName ?? "",
@@ -173,6 +174,7 @@ public final class Navigator: ObservableObject {
             options: options
         )
         rootRoute = route
+        disposeScreens([previousRoot])
     }
 
     public func reset<V: View>(
@@ -180,8 +182,7 @@ public final class Navigator: ObservableObject {
         @ViewBuilder _ content: @escaping () -> V,
         options: NavigationOptions? = nil
     ) {
-        for route in path { registry.unregister(id: route.id) }
-        registry.unregister(id: rootRoute.id)
+        let previousRoot = rootRoute.id
         path.removeAll()
         let route = registry.register(
             screenName: screenName,
@@ -189,26 +190,50 @@ public final class Navigator: ObservableObject {
             options: options
         )
         rootRoute = route
+        disposeScreens([previousRoot])
     }
 
     public func pop(_ count: Int = 1, callback: (() -> Void)? = nil) {
-        var remaining = count
-        while remaining > 0 {
-            if overplay?.type == .snackBar {
-                // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
-                // while one is showing pops the screen underneath and clears the
-                // snackbar immediately, without playing its dismiss animation.
-                overplayDismissHandler = nil
-                overplay = nil
-                if !popScreen() { break }
-            } else if overplay != nil {
-                hideOverplay()
-            } else if !popScreen() {
-                break
+        popStep(remaining: count, callback: callback)
+    }
+
+    /// One `pop` iteration. Compose runs the loop in a coroutine and suspends over the
+    /// overplay's exit animation before the next step; the same wait is needed here, or
+    /// a `pop(2)` (prevent-back: close the popup, then leave) would spend both steps on
+    /// the overplay that is still animating out and never pop the screen.
+    private func popStep(remaining: Int, callback: (() -> Void)?) {
+        guard remaining > 0 else {
+            callback?()
+            return
+        }
+
+        if overplay?.type == .snackBar {
+            // Mirrors Kotlin: a snackbar doesn't block back-navigation, so popping
+            // while one is showing pops the screen underneath and clears the
+            // snackbar immediately, without playing its dismiss animation.
+            overplayDismissHandler = nil
+            overplay = nil
+            guard popScreen() else {
+                callback?()
+                return
+            }
+            popStep(remaining: remaining - 1, callback: callback)
+        } else if overplay != nil {
+            hideOverplay()
+            DispatchQueue.main.asyncAfter(deadline: .now() + Self.overplayDismissDelay) { [weak self] in
+                guard let self else { return }
+                // The component reports back through `finishOverplayDismiss` once its exit
+                // animation ends; clear it here if it never did, so the step is not wasted.
+                if self.overplay != nil { self.finishOverplayDismiss() }
+                self.popStep(remaining: remaining - 1, callback: callback)
             }
-            remaining -= 1
+        } else {
+            guard popScreen() else {
+                callback?()
+                return
+            }
+            popStep(remaining: remaining - 1, callback: callback)
         }
-        callback?()
     }
 
     /// Pops the topmost presented screen or stack entry. Returns `false` (and requests
@@ -218,11 +243,10 @@ public final class Navigator: ObservableObject {
         if presented != nil {
             let dismissedId = presented?.id
             presented = nil
-            if let id = dismissedId { registry.unregister(id: id) }
+            if let id = dismissedId { disposeScreens([id]) }
             return true
         } else if !path.isEmpty {
-            let removed = path.removeLast()
-            registry.unregister(id: removed.id)
+            path.removeLast()
             return true
         } else {
             composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
@@ -231,42 +255,54 @@ public final class Navigator: ObservableObject {
     }
 
     public func popToRoot() {
-        for route in path { registry.unregister(id: route.id) }
         path.removeAll()
     }
 
+    /// The entry a back action applies to — mirrors Compose's `currentScreen()`
+    /// (`navController.currentBackStackEntry`): a presented screen sits on top of
+    /// the stack, otherwise it is the last pushed screen, otherwise the root.
+    private func currentScreen() -> DynamicScreen? {
+        registry.getScreen(id: presented?.id ?? path.last?.id ?? rootRoute.id)
+    }
+
     public func onBackSafe(callback: (() -> Void)? = nil) {
-        let latest = registry.latest()
+        let latest = currentScreen()
         if let onBack = latest?.options?.onBackHandler {
             onBack()
             return
         }
         if let preventBack = latest?.options?.headerBackProps?.preventBack {
             showModal {
-                PopupDisplay(
-                    isPresented: .constant(true),
-                    title: preventBack.title,
-                    description: preventBack.description,
-                    url: preventBack.image,
-                    buttonDirection: preventBack.buttonDirection,
-                    buttonType: .button,
-                    actionButtonTitle: preventBack.primary?.title ?? "",
-                    closeButtonTitle: preventBack.secondary?.title ?? "",
-                    onPressAction: { [weak self] in
-                        preventBack.primary?.onPress?()
-                        // Close the popup, then leave the screen (matches Compose's pop(2)).
-                        self?.pop(2, callback: callback)
-                    },
-                    onPressCloseButton: { [weak self] in
-                        preventBack.secondary?.onPress?()
-                        self?.hideOverplay()
-                    },
-                    onClose: { [weak self] in
-                        preventBack.onIconClose?()
-                        self?.hideOverplay()
-                    },
-                    errorCode: preventBack.error,
-                    isShowCloseIcon: preventBack.isShowCloseIcon
+                PopupNotify(
+                    props: PopupNotifyProps(
+                        image: preventBack.image,
+                        title: preventBack.title,
+                        description: preventBack.description,
+                        error: preventBack.error,
+                        primary: PopupAction(
+                            title: preventBack.primary?.title ?? "",
+                            onPress: { [weak self] in
+                                preventBack.primary?.onPress?()
+                                // Close the popup, then leave the screen (matches Compose's pop(2)).
+                                self?.pop(2, callback: callback)
+                            }
+                        ),
+                        secondary: preventBack.secondary.map { secondary in
+                            PopupAction(
+                                title: secondary.title,
+                                onPress: { [weak self] in
+                                    secondary.onPress?()
+                                    self?.hideOverplay()
+                                }
+                            )
+                        },
+                        buttonDirection: preventBack.buttonDirection,
+                        onIconClose: { [weak self] in
+                            preventBack.onIconClose?()
+                            self?.hideOverplay()
+                        },
+                        isShowCloseIcon: preventBack.isShowCloseIcon
+                    )
                 )
             }
             return
@@ -382,4 +418,36 @@ public final class Navigator: ObservableObject {
     public func hideSnackBar() {
         if overplay?.type == .snackBar { hideOverplay() }
     }
+
+    // MARK: Screen disposal
+
+    /// Matches the `delay(300)` Compose waits in `dismissScreen` before unregistering,
+    /// with a little headroom for the pop transition.
+    private static let screenDisposeDelay: TimeInterval = 0.35
+
+    /// Longest overplay exit animation (the bottom sheet's), so a queued pop step runs
+    /// after the component has taken itself down.
+    private static let overplayDismissDelay: TimeInterval = 0.3
+
+    private func disposeScreens(droppedFrom previous: [DynamicScreenRoute]) {
+        let live = Set(path.map(\.id))
+        disposeScreens(previous.map(\.id).filter { !live.contains($0) })
+    }
+
+    /// Screens are released only once the pop transition has played out: the outgoing
+    /// view is still on screen while it animates and the registry is what renders it —
+    /// dropping it right away blanks the screen mid-transition. Liveness is re-checked
+    /// when the timer fires, so a route pushed back before then keeps its screen.
+    private func disposeScreens(_ ids: [Int]) {
+        guard !ids.isEmpty else { return }
+        DispatchQueue.main.asyncAfter(deadline: .now() + Self.screenDisposeDelay) { [weak self] in
+            guard let self else { return }
+            var live = Set(self.path.map(\.id))
+            live.insert(self.rootRoute.id)
+            if let presented = self.presented { live.insert(presented.id) }
+            for id in ids where !live.contains(id) {
+                self.registry.unregister(id: id)
+            }
+        }
+    }
 }

package/ios/Application/Navigation/NavigatorManager.swift

@@ -0,0 +1,49 @@
+//
+//  NavigatorManager.swift
+//  MoMoUIKits
+//
+//  Host bridge for the native iOS edge-swipe back — the SwiftUI mirror of Compose's
+//  `ComposeNavigatorManager` (momo-app `vn.momo.compose.uikits.ComposeNavigatorManager`).
+//
+//  The kit does NOT own the swipe gesture. In the host app a kit screen lives inside a
+//  `UIHostingController` hosted by the mini-app container VC, and that VC owns the
+//  `UIScreenEdgePanGestureRecognizer`. When the swipe fires the host asks this manager
+//  whether a kit stack is mounted (`checkCanPop`) and, if so, routes the back into it
+//  (`pop` → `Navigator.onBackSafe`) instead of dismissing the whole mini-app. Standalone
+//  (no such host, e.g. the demo app) there is no edge swipe — same as Compose on iOS,
+//  whose `BackHandler` is a no-op and which relies entirely on the host.
+//
+
+import Foundation
+
+@available(iOS 16.0, *)
+public final class NavigatorManager {
+    public static let shared = NavigatorManager()
+    private init() {}
+
+    /// Stack of mounted navigators; the last one is the visible top (nested mini-apps
+    /// push more than one). Held strongly, mirroring `ComposeNavigatorManager` — entries
+    /// are released by `NavigationContainer` on disappear, not by ARC.
+    private var navigators: [Navigator] = []
+
+    /// Idempotent: SwiftUI can re-run a view's `onAppear`, and a double push would need a
+    /// matching double remove to unwind.
+    public func push(_ navigator: Navigator) {
+        guard !navigators.contains(where: { $0 === navigator }) else { return }
+        navigators.append(navigator)
+    }
+
+    /// Removes by identity rather than `removeLast` so a spurious disappear of a covered
+    /// (non-top) container can't drop the wrong navigator.
+    public func remove(_ navigator: Navigator) {
+        navigators.removeAll { $0 === navigator }
+    }
+
+    /// True while any kit stack is mounted — tells the host to route the back into the kit
+    /// instead of dismissing the mini-app. Matches `ComposeNavigatorManager.checkCanPop`:
+    /// it does not inspect stack depth; `onBackSafe` handles the at-root case itself by
+    /// asking the host to dismiss (via `composeApi`).
+    public func checkCanPop() -> Bool { !navigators.isEmpty }
+
+    public func pop() { navigators.last?.onBackSafe() }
+}

package/ios/Application/Navigation/component/NavigationFooter.swift

@@ -0,0 +1,90 @@
+//
+//  NavigationFooter.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `Footer` (navigation/StackScreen.kt): the band
+//  pinned under the screen content — surface background, S/M padding, the
+//  navigation-bar reserve, and the 6pt gradient shadow cast up onto the content.
+//
+//  Named `NavigationFooter` to coexist with the legacy `Footer` in `Screen.swift`
+//  (kept as-is for the old `Screen` path). Used by `StackScreen`.
+//
+
+import SwiftUI
+
+public struct NavigationFooter: View {
+    /// Compose's `footerComponent`: nothing renders when nil.
+    var footerComponent: (() -> AnyView)?
+    /// Current keyboard height, measured from the bottom of the screen.
+    var keyboardSize: CGFloat
+
+    public init(
+        footerComponent: (() -> AnyView)?,
+        keyboardSize: CGFloat = 0
+    ) {
+        self.footerComponent = footerComponent
+        self.keyboardSize = keyboardSize
+    }
+
+    @Environment(\.appTheme) private var theme
+
+    /// Read from the window, not from an enclosing `GeometryProxy`: the proxy's bottom
+    /// inset grows to the keyboard height while the keyboard is up.
+    static var safeAreaBottom: CGFloat {
+        UIApplication.shared.connectedScenes
+            .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
+            .first ?? 0
+    }
+
+    /// Compose's `AppNavigationBar.current` (`getNavigationBarHeight` clamps iOS to 21pt).
+    static var navigationBarInset: CGFloat { min(safeAreaBottom, 21) }
+
+    /// Compose's `bottomPadding + Spacing.S` with the keyboard down. The footer is laid
+    /// out inside the safe area, which already covers part of that gap.
+    static var bottomPadding: CGFloat {
+        max(navigationBarInset + Spacing.S - safeAreaBottom, 0)
+    }
+
+    /// Deliberately an offset and not padding: growing the footer feeds back into SwiftUI's
+    /// keyboard avoidance, so a padding-based lift never settles at the right place.
+    /// Negative lifts the band over the keyboard; positive shaves the few points by which
+    /// the safe area over-reserves compared to Compose. `FloatingContent` rides the same
+    /// amount so the FAB keeps its distance above the band.
+    ///
+    /// Natural position is `safeAreaBottom + bottomPadding` above the bottom of the screen;
+    /// Compose puts it at `(AppNavigationBar - keyboard).coerceAtLeast(0) + Spacing.S` on
+    /// top of the `imePadding()` lift — i.e. `max(navigationBar, keyboard) + Spacing.S`.
+    static func verticalOffset(keyboardSize: CGFloat) -> CGFloat {
+        (safeAreaBottom + bottomPadding) - (max(navigationBarInset, keyboardSize) + Spacing.S)
+    }
+
+    public var body: some View {
+        if let footerComponent = footerComponent {
+            VStack(alignment: .leading, spacing: 0) {
+                footerComponent()
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.top, Spacing.S)
+            .padding(.horizontal, Spacing.M)
+            .padding(.bottom, Self.bottomPadding)
+            // Compose paints the surface all the way to the bottom of the screen; the
+            // footer's own frame stops at the safe area, so only the fill bleeds down.
+            .background(theme.colors.background.surface.ignoresSafeArea(.container, edges: .bottom))
+            .overlay(alignment: .top) { shadow }
+            .offset(y: Self.verticalOffset(keyboardSize: keyboardSize))
+        }
+    }
+
+    /// Compose offsets the shadow box by -6dp, so it lands on the content above the
+    /// footer rather than on the footer surface itself.
+    private var shadow: some View {
+        LinearGradient(
+            colors: [Color.clear, Color.black.opacity(0.05)],
+            startPoint: .top,
+            endPoint: .bottom
+        )
+        .frame(height: 6)
+        .offset(y: -6)
+        .allowsHitTesting(false)
+    }
+}

package/ios/Application/StackScreen.swift

@@ -5,7 +5,7 @@
 //  SwiftUI mirror of Compose's `StackScreen`. This is a refactor of `Screen`:
 //  the body is decomposed into the same focused pieces Compose uses — header
 //  layer, scrollable content (`StackScreenContent`), floating button
-//  (`FloatingContent`) and footer (`FooterContent`) — instead of one
+//  (`FloatingContent`) and footer (`NavigationFooter`) — instead of one
 //  monolithic, partially-duplicated view. The public init matches `Screen`
 //  so call sites (e.g. NavigationContainer's ScreenHost) can swap over.
 //
@@ -143,13 +143,8 @@ public struct StackScreen<Content: View>: View {
     // MARK: - Body
 
     public var body: some View {
-        GeometryReader { geometry in
+        GeometryReader { _ in
             let keyboardSize: CGFloat = useAvoidKeyboard ? max(keyboardHeight, 0) : 0
-            let bottomInset = min(geometry.safeAreaInsets.bottom, 21)
-            // Skip this screen's own bottom-inset reservation when hosting a footer
-            // OR a self-contained BottomTab surface (mirrors Compose's
-            // `if (options.footerComponent != null || isBottomTab) 0.dp else navigationBar`).
-            let contentBottomInset = (footer == nil && !isBottomTabRoot) ? bottomInset : 0
 
             ZStack(alignment: .top) {
                 // Background color
@@ -161,16 +156,16 @@ public struct StackScreen<Content: View>: View {
                         VStack(alignment: horizontalAlignment, spacing: 0) {
                             headerAndContent
                         }
-                        .padding(.bottom, contentBottomInset)
 
                         FloatingContent(
                             fabProps: fabProps,
-                            keyboardOffset: 0,
+                            keyboardSize: keyboardSize,
+                            hasFooter: footer != nil,
                             scrollOffset: scrollOffset
                         )
                     }
 
-                    FooterContent(footer: footer, keyboardSize: keyboardSize, bottomInset: bottomInset)
+                    NavigationFooter(footerComponent: footer, keyboardSize: keyboardSize)
                 }
 
                 // Animated search bar overlay (mirrors Compose's SearchAnimated layer).
@@ -444,17 +439,29 @@ private struct SearchAnimatedHeader: View {
 /// Mirrors Compose's `FloatingContent`: no FAB props means nothing renders.
 private struct FloatingContent: View {
     let fabProps: FabProps?
-    let keyboardOffset: CGFloat
+    let keyboardSize: CGFloat
+    /// With a footer the FAB is anchored to the footer's *layout* top, which does not move
+    /// when the band offsets itself over the keyboard — so it rides the same offset.
+    let hasFooter: Bool
     let scrollOffset: CGFloat
 
+    /// Compose keeps the FAB `Spacing.M + AppNavigationBar` above the bottom of the screen
+    /// and lifts it with `imePadding()`; here it sits `Spacing.M` above the safe area and
+    /// nothing lifts it, so the difference is applied as an offset (see NavigationFooter).
+    private var verticalOffset: CGFloat {
+        if hasFooter { return NavigationFooter.verticalOffset(keyboardSize: keyboardSize) }
+        return NavigationFooter.safeAreaBottom - NavigationFooter.navigationBarInset - keyboardSize
+    }
+
     var body: some View {
         if let fabProps = fabProps {
             FloatingButton(
                 props: fabProps,
-                keyboardOffset: keyboardOffset,
+                keyboardOffset: 0,
                 scrollOffset: scrollOffset
             )
             .padding(.horizontal, Spacing.M)
+            .offset(y: verticalOffset)
             .ignoresSafeArea(.keyboard, edges: .bottom)
         }
     }
@@ -483,19 +490,3 @@ private struct HideKeyboardOnTap: ViewModifier {
         }
     }
 }
-
-// MARK: - Footer content
-
-/// Mirrors Compose's `FooterContent`: renders the footer chrome only when a
-/// footer component is supplied. Reuses the existing `Footer` view from Screen.swift.
-private struct FooterContent: View {
-    let footer: (() -> AnyView)?
-    let keyboardSize: CGFloat
-    let bottomInset: CGFloat
-
-    var body: some View {
-        if let footerView = footer?() {
-            Footer(footerView: footerView, keyboardSize: keyboardSize, bottomInset: bottomInset)
-        }
-    }
-}

package/ios/Badge/Badge.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 public struct Badge: View {
     @Environment(\.appTheme) private var theme
+    @Environment(\.momoFontScale) private var fontScale
     let label: String
     let backgroundColor: Color?
     
@@ -55,7 +56,7 @@ public struct Badge: View {
     public var body: some View {
         MomoText(formatTitle(label), typography: .actionXxsBold, color: Colors.black01)
             .padding(.horizontal, Spacing.XS)
-            .frame(minWidth: scaleSize(16), minHeight: scaleSize(16))
+            .frame(minWidth: fontScale(16), minHeight: fontScale(16))
             .background(badgeColor)
             .cornerRadius(Radius.M)
             .overlay(

package/ios/Badge/BadgeRibbon.swift

@@ -174,6 +174,7 @@ public struct BadgeRibbon: View {
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
         .rotationEffect(.degrees(180))
+        .offset(x: 1)
         .clipped()
     }
     
@@ -183,6 +184,7 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.headTailWidth, height: RibbonConstants.headTailHeight)
+        .offset(x: 1)
         .clipped()
     }
     
@@ -192,6 +194,7 @@ public struct BadgeRibbon: View {
             placeholder: AnyView(Color.clear)
         )
         .frame(width: RibbonConstants.skewTailWidth, height: RibbonConstants.skewTailHeight)
+        .offset(x: -2)
         .clipped()
     }
 }
@@ -201,6 +204,7 @@ 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(\.momoFontScale) private var fontScale
     let text: String
     let position: RibbonPosition
 
@@ -219,7 +223,7 @@ public struct RoundedBadgeRibbon: View {
     }
 
     private var measuredTextSize: CGSize {
-        let fontSize = scaleSize(TypographyStyle.labelXsMedium.fontSize)
+        let fontSize = fontScale(TypographyStyle.labelXsMedium.fontSize)
         let font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
         return text.size(withAttributes: [.font: font])
     }
@@ -281,7 +285,7 @@ private struct RibbonConstants {
     static let ribbonHeight: CGFloat = 20
     static let roundHeight: CGFloat = 16
     static let skewBodyHeight: CGFloat = 16
-    static let roundRightRadius: CGFloat = 12
+    static let roundRightRadius: CGFloat = 8
     static let roundPaddingEnd: CGFloat = 6
     static let skewTailWidth: CGFloat = 8
     static let skewTailHeight: CGFloat = 16