@momo-kits/native-kits 0.167.1-duo.8 → 0.167.1-duo.9-debug

package/ios/{Application/Navigation → Navigation}/Navigator.swift

@@ -2,9 +2,9 @@
 //  Navigator.swift
 //  MoMoUIKits
 //
-//  SwiftUI mirror of Compose's Navigator + DynamicScreenRegistry.
-//  Screens are registered by Int id; the stack paths store routes
-//  by id and content is looked up from the registry on render.
+//  SwiftUI mirror of Compose's `navigation/Navigator.kt`: Navigator, DynamicScreenRegistry and
+//  the overplay model. Screens are registered by Int id; the stack paths store routes by id and
+//  content is looked up from the registry on render.
 //
 
 import SwiftUI
@@ -31,6 +31,7 @@ public struct DynamicScreen {
 
 public final class DynamicScreenRegistry {
     private var screens: [Int: DynamicScreen] = [:]
+    private var navigations: [Int: WeakNavigation] = [:]
     private var idCounter: Int = 1
 
     public init() {}
@@ -49,12 +50,20 @@ public final class DynamicScreenRegistry {
 
     public func unregister(id: Int) {
         screens.removeValue(forKey: id)
+        navigations.removeValue(forKey: id)
     }
 
     public func unregisterAll() {
         screens.removeAll()
+        navigations.removeAll()
     }
 
+    func bind(_ navigation: Navigation) {
+        navigations[navigation.id] = WeakNavigation(value: navigation)
+    }
+
+    func navigation(id: Int) -> Navigation? { navigations[id]?.value }
+
     public func getScreen(id: Int) -> DynamicScreen? { screens[id] }
 
     public func latest() -> DynamicScreen? {
@@ -66,6 +75,10 @@ public final class DynamicScreenRegistry {
     }
 }
 
+private struct WeakNavigation {
+    weak var value: Navigation?
+}
+
 // MARK: - Overplay
 
 public enum OverplayType {
@@ -81,6 +94,9 @@ public struct OverplayItem: Identifiable {
     // Bottom-sheet params (mirrors Compose's OverplayComponentParams.BottomSheet).
     public var isSurface: Bool = false
     public var header: BottomSheetHeader? = nil
+    public var draggable: Bool = true
+    public var useBottomInset: Bool = true
+    public var footer: (() -> AnyView)? = nil
     // Snack-bar payload (mirrors Compose's SnackBar value).
     public var snackBar: SnackBar? = nil
     /// The presented screen it was shown over, nil for the main stack. Like Compose's overplay
@@ -126,6 +142,13 @@ public final class Navigator: ObservableObject {
 
     @Published public private(set) var rootRoute: DynamicScreenRoute
     public var composeApi: KitComposeApi?
+    /// Host dismiss fallback when there is no `composeApi` (Compose's `maxApi.dismiss`).
+    public var maxApi: MaxApi?
+
+    /// Set by a bottom tab off its first tab: back on the screen hosting the tabs returns to the
+    /// first tab (Compose `tabBackHandler`). Keyed by that screen, so a screen pushed or presented
+    /// over the tabs still pops normally.
+    var tabBackHandler: (screenId: Int, handler: () -> Void)?
 
     public init(
         initialScreenName: String = "",
@@ -291,11 +314,25 @@ public final class Navigator: ObservableObject {
             path.removeLast()
             return true
         } else {
-            composeApi?.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+            requestHostDismiss()
             return false
         }
     }
 
+    private func requestHostDismiss() {
+        if let composeApi {
+            composeApi.requestCallback(funcName: "dismiss", params: nil, onResponse: nil)
+        } else {
+            maxApi?.dismiss(completion: nil)
+        }
+    }
+
+    /// Whether the active stack has a screen to go back to (Compose's `canPop`); at the root a
+    /// back dismisses the mini app instead.
+    public func canPop() -> Bool {
+        presented != nil || !path.isEmpty
+    }
+
     /// Empties both stacks; a presented screen stays up on its own root.
     public func popToRoot() {
         presentedPath.removeAll()
@@ -314,12 +351,17 @@ public final class Navigator: ObservableObject {
 
     public func onBackSafe(callback: (() -> Void)? = nil) {
         let latest = currentScreen()
+        if let tabBackHandler, tabBackHandler.screenId == -1 || tabBackHandler.screenId == latest?.id {
+            tabBackHandler.handler()
+            return
+        }
         if let onBack = latest?.options?.onBackHandler {
             onBack()
             return
         }
         if let preventBack = latest?.options?.headerBackProps?.preventBack {
-            showModal {
+            // stored in `overplay`, so a strong self would cycle until the popup closes
+            showModal { [weak self] in
                 PopupNotify(
                     props: PopupNotifyProps(
                         image: preventBack.image,
@@ -328,7 +370,7 @@ public final class Navigator: ObservableObject {
                         error: preventBack.error,
                         primary: PopupAction(
                             title: preventBack.primary?.title ?? "",
-                            onPress: { [weak self] in
+                            onPress: {
                                 preventBack.primary?.onPress?()
                                 // Close the popup, then leave the screen (matches Compose's pop(2)).
                                 self?.pop(2, callback: callback)
@@ -337,14 +379,14 @@ public final class Navigator: ObservableObject {
                         secondary: preventBack.secondary.map { secondary in
                             PopupAction(
                                 title: secondary.title,
-                                onPress: { [weak self] in
+                                onPress: {
                                     secondary.onPress?()
                                     self?.hideOverplay()
                                 }
                             )
                         },
                         buttonDirection: preventBack.buttonDirection,
-                        onIconClose: { [weak self] in
+                        onIconClose: {
                             preventBack.onIconClose?()
                             self?.hideOverplay()
                         },
@@ -450,7 +492,10 @@ public final class Navigator: ObservableObject {
         isSurface: Bool = false,
         barrierDismissible: Bool = true,
         header: BottomSheetHeader? = nil,
-        onDismiss: (() -> Void)? = nil
+        onDismiss: (() -> Void)? = nil,
+        draggable: Bool = true,
+        useBottomInset: Bool = true,
+        footer: (() -> AnyView)? = nil
     ) {
         overplayDismissHandler = nil
         overplay = OverplayItem(
@@ -460,6 +505,9 @@ public final class Navigator: ObservableObject {
             onDismiss: onDismiss,
             isSurface: isSurface,
             header: header,
+            draggable: draggable,
+            useBottomInset: useBottomInset,
+            footer: footer,
             presentedId: presented?.id
         )
     }
@@ -509,6 +557,14 @@ public final class Navigator: ObservableObject {
         if overplay?.type == .snackBar { hideOverplay() }
     }
 
+    /// Room the current screen's footer (or navigation bar) takes from the window bottom.
+    func snackBarBottomInset() -> CGFloat {
+        guard let id = currentScreen()?.id, let navigation = registry.navigation(id: id) else {
+            return NavigationFooter.navigationBarInset
+        }
+        return navigation.bottomObstruction
+    }
+
     // MARK: Screen disposal
 
     /// Matches the `delay(300)` Compose waits in `dismissScreen` before unregistering,