@momo-kits/native-kits 0.163.1-sp.7-debug → 0.163.1-sp.8-debug

package/.claude/settings.local.json

@@ -147,7 +147,12 @@
       "Bash(sips -c 700 1170 --cropOffset 150 0 t3.png --out t3c.png)",
       "Bash(sips -c 1200 1170 --cropOffset 600 0 t4.png --out t4c.png)",
       "Bash(sips -c 600 1170 --cropOffset 150 0 t5.png --out t5c.png)",
-      "Bash(sips -c 500 1170 --cropOffset 150 0 u1.png --out u1c.png)"
+      "Bash(sips -c 500 1170 --cropOffset 150 0 u1.png --out u1c.png)",
+      "Bash(cp /Users/sophia/Workspace/momo/momo-native-kits/ios/Application/Navigation/NavigationContainer.swift /Users/sophia/Workspace/momo/momo-app/node_modules/@momo-kits/native-kits/ios/Application/Navigation/NavigationContainer.swift)",
+      "Bash(cp /Users/sophia/Workspace/momo/momo-native-kits/ios/Application/Navigation/Navigator.swift /Users/sophia/Workspace/momo/momo-app/node_modules/@momo-kits/native-kits/ios/Application/Navigation/Navigator.swift)",
+      "Bash(cp /Users/sophia/Workspace/momo/momo-native-kits/ios/Application/Navigation/NavigatorManager.swift /Users/sophia/Workspace/momo/momo-app/node_modules/@momo-kits/native-kits/ios/Application/Navigation/NavigatorManager.swift)",
+      "Bash(cp /Users/sophia/Workspace/momo/momo-native-kits/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift /Users/sophia/Workspace/momo/momo-app/node_modules/@momo-kits/native-kits/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/NavigationDemo.swift)",
+      "Bash(xcodebuild -workspace MoMoPlatform.xcworkspace -scheme MoMoPlatform-UAT -sdk iphonesimulator -destination 'generic/platform=iOS Simulator' -derivedDataPath build/DerivedData build)"
     ]
   }
 }

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.163.1-sp.7-debug"
+        version = "0.163.1-sp.8-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-sp.7-debug'
+    spec.version                  = '0.163.1-sp.8-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.163.1-sp.7
+version=0.163.1-sp.8
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Application/Navigation/NavigationContainer.swift

@@ -92,6 +92,9 @@ public struct NavigationContainer<Initial: View>: View {
                 navigator.composeApi = composeApi
             }
             setNavigator?(navigator)
+            // Register with the host swipe-back bridge (mirrors ComposeAppContainer's
+            // ComposeNavigatorManager.push). Idempotent, so a re-appear won't double-count.
+            NavigatorManager.shared.push(navigator)
             // AI-GENERATED START: demote the MaxApi language pull to a seed of last resort
             // Only a seed: a Localize with a language source already tracks the host in both
             // directions, so asking maxApi would just race it. `changeLanguage` normalizes the
@@ -102,6 +105,9 @@ public struct NavigationContainer<Initial: View>: View {
             }
             // AI-GENERATED END: demote the MaxApi language pull to a seed of last resort
         }
+        .onDisappear {
+            NavigatorManager.shared.remove(navigator)
+        }
     }
 
     @ViewBuilder
@@ -109,9 +115,6 @@ public struct NavigationContainer<Initial: View>: View {
         if let screen = navigator.registry.getScreen(id: route.id) {
             ScreenHost(screen: screen, navigator: navigator)
                 .navigationBarBackButtonHidden(true)
-                // Hiding the back button is what kills the edge swipe; this puts it back
-                // and sends it through `onBackSafe`, like Compose's BackHandler.
-                .momoSwipeBack(navigator)
         } else {
             EmptyView()
         }

package/ios/Application/Navigation/Navigator.swift

@@ -90,8 +90,8 @@ public struct OverplayItem: Identifiable {
 @available(iOS 16.0, *)
 public final class Navigator: ObservableObject {
     @Published public var path: [DynamicScreenRoute] = [] {
-        // The edge-swipe pop is driven by UIKit and lands straight on the binding,
-        // never on `pop`, so screen disposal hangs off the path itself.
+        // 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?
@@ -265,42 +265,6 @@ public final class Navigator: ObservableObject {
         registry.getScreen(id: presented?.id ?? path.last?.id ?? rootRoute.id)
     }
 
-    /// Whether the current screen takes back navigation over itself, i.e. back must
-    /// not pop it (mirrors the two early returns in Compose's `onBackSafe`).
-    private var currentScreenHandlesBack: Bool {
-        let options = currentScreen()?.options
-        return options?.onBackHandler != nil || options?.headerBackProps?.preventBack != nil
-    }
-
-    /// Asked by the edge-swipe delegate before UIKit starts an interactive pop, so the
-    /// gesture ends up where Compose's `BackHandler(true) { onBackSafe() }` does. Returning
-    /// `false` means the gesture is swallowed — the side effect it stands for (closing an
-    /// overplay, running `onBackHandler`, raising the prevent-back popup) has been run here.
-    /// Returning `true` hands the pop to UIKit so the swipe stays interactive; `path.didSet`
-    /// then disposes the screen exactly as `pop` would.
-    func shouldBeginInteractivePop() -> Bool {
-        // A presented screen covers the stack; its own chrome owns the dismissal.
-        if presented != nil { return false }
-
-        if overplay?.type == .snackBar {
-            // Same as `pop`: a snackbar doesn't block back, it is cleared on the way out.
-            overplayDismissHandler = nil
-            overplay = nil
-        } else if overplay != nil {
-            // Compose: the modal/bottom-sheet BackHandler wins and plays its exit animation.
-            hideOverplay()
-            return false
-        }
-
-        if currentScreenHandlesBack {
-            onBackSafe()
-            return false
-        }
-
-        // Nothing of ours left to pop: leave the swipe to whatever stack hosts the kit.
-        return !path.isEmpty
-    }
-
     public func onBackSafe(callback: (() -> Void)? = nil) {
         let latest = currentScreen()
         if let onBack = latest?.options?.onBackHandler {
@@ -452,7 +416,7 @@ public final class Navigator: ObservableObject {
     // MARK: Screen disposal
 
     /// Matches the `delay(300)` Compose waits in `dismissScreen` before unregistering,
-    /// with headroom for the slower interactive swipe.
+    /// 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
@@ -466,8 +430,8 @@ public final class Navigator: ObservableObject {
 
     /// 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-swipe. Liveness is re-checked when
-    /// the timer fires, so a cancelled swipe (path restored) keeps its screen.
+    /// 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

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/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.163.1-sp.7'
+  s.version          = '0.163.1-sp.8'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.163.1-sp.7'
+  s.version          = '0.163.1-sp.8'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.163.1-sp.7-debug",
+  "version": "0.163.1-sp.8-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/ios/Application/Navigation/SwipeBackGesture.swift

@@ -1,116 +0,0 @@
-//
-//  SwipeBackGesture.swift
-//  MoMoUIKits
-//
-//  Makes the iOS edge swipe behave like Compose's `BackHandler(true) { navigator.onBackSafe() }`.
-//  Every kit screen draws its own header and therefore hides the system back button, which is
-//  exactly what makes SwiftUI turn `interactivePopGestureRecognizer` off — so the gesture is
-//  re-enabled here and its start is arbitrated by the Navigator.
-//
-
-import SwiftUI
-import UIKit
-
-@available(iOS 16.0, *)
-extension View {
-    /// Re-enables the interactive pop gesture for a `NavigationStack` destination and
-    /// routes it through `navigator`. Apply it to every destination: SwiftUI reconfigures
-    /// the recognizer as screens come and go, so the install has to be repeated.
-    func momoSwipeBack(_ navigator: Navigator) -> some View {
-        background(SwipeBackInstaller(navigator: navigator).allowsHitTesting(false))
-    }
-}
-
-@available(iOS 16.0, *)
-private struct SwipeBackInstaller: UIViewRepresentable {
-    let navigator: Navigator
-
-    func makeUIView(context: Context) -> SwipeBackProbeView {
-        let view = SwipeBackProbeView()
-        view.navigator = navigator
-        return view
-    }
-
-    func updateUIView(_ uiView: SwipeBackProbeView, context: Context) {
-        uiView.navigator = navigator
-        uiView.install()
-    }
-}
-
-/// Zero-sized view whose only job is to reach the `UINavigationController` backing the
-/// enclosing `NavigationStack` — SwiftUI exposes no other handle on it.
-@available(iOS 16.0, *)
-private final class SwipeBackProbeView: UIView {
-    weak var navigator: Navigator?
-
-    override func didMoveToWindow() {
-        super.didMoveToWindow()
-        install()
-        // SwiftUI applies the destination's bar configuration around the same runloop
-        // turn, and it is the thing that disables the recognizer — so claim it again
-        // once that has settled.
-        DispatchQueue.main.async { [weak self] in self?.install() }
-    }
-
-    func install() {
-        guard window != nil, let navigator, let controller = navigationController() else { return }
-        SwipeBackGestureDelegate.shared.install(on: controller, navigator: navigator)
-    }
-
-    private func navigationController() -> UINavigationController? {
-        var responder: UIResponder? = self
-        while let current = responder {
-            if let nav = current as? UINavigationController { return nav }
-            if let controller = current as? UIViewController, let nav = controller.navigationController { return nav }
-            responder = current.next
-        }
-        return nil
-    }
-}
-
-/// Shared `interactivePopGestureRecognizer` delegate. One instance serves every kit stack
-/// in the process (a bottom-tab surface or a host screen can have its own), keyed by the
-/// navigation controller the recognizer belongs to. Being long-lived matters: the delegate
-/// is held weakly by UIKit, and a nil delegate lets the gesture fire on a single-screen
-/// stack, which corrupts it.
-@available(iOS 16.0, *)
-private final class SwipeBackGestureDelegate: NSObject, UIGestureRecognizerDelegate {
-    static let shared = SwipeBackGestureDelegate()
-
-    private struct Entry {
-        weak var controller: UINavigationController?
-        weak var navigator: Navigator?
-    }
-
-    private var entries: [ObjectIdentifier: Entry] = [:]
-
-    func install(on controller: UINavigationController, navigator: Navigator) {
-        entries = entries.filter { $0.value.controller != nil && $0.value.navigator != nil }
-        entries[ObjectIdentifier(controller)] = Entry(controller: controller, navigator: navigator)
-
-        guard let gesture = controller.interactivePopGestureRecognizer else { return }
-        gesture.delegate = self
-        gesture.isEnabled = true
-    }
-
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        guard let entry = entry(for: gestureRecognizer), let controller = entry.controller else { return false }
-        // Guards the classic UIKit hang: popping the only view controller on the stack.
-        guard controller.viewControllers.count > 1 else { return false }
-        guard let navigator = entry.navigator else { return true }
-        return navigator.shouldBeginInteractivePop()
-    }
-
-    /// The edge swipe stays exclusive — letting it run alongside a horizontal scroll or a
-    /// swipeable cell would pop the screen while the user is dragging inside it.
-    func gestureRecognizer(
-        _ gestureRecognizer: UIGestureRecognizer,
-        shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer
-    ) -> Bool {
-        false
-    }
-
-    private func entry(for gestureRecognizer: UIGestureRecognizer) -> Entry? {
-        entries.values.first { $0.controller?.interactivePopGestureRecognizer === gestureRecognizer }
-    }
-}