@momo-kits/native-kits 0.167.1-duo.18 → 0.167.1-duo.19-debug

package/ios/Navigation/BottomSheet.swift

@@ -35,7 +35,6 @@ public struct BottomSheetHeader {
 
 // MARK: - Bottom sheet view
 
-@available(iOS 16.0, *)
 struct BottomSheetView<Content: View>: View {
     let header: BottomSheetHeader
     let isSurface: Bool
@@ -294,12 +293,40 @@ struct BottomSheetView<Content: View>: View {
 /// Compose's `heightIn(max:)`. `.frame(maxHeight:)` grows to the cap whenever the proposal is
 /// larger, leaving a gap above the header; this sizes the sheet to its content and only caps it
 /// when taller.
-@available(iOS 16.0, *)
 private struct CapHeight: ViewModifier {
     let maxHeight: CGFloat
 
     func body(content: Content) -> some View {
-        CapHeightLayout(maxHeight: maxHeight) { content }
+        if #available(iOS 16.0, *) {
+            CapHeightLayout(maxHeight: maxHeight) { content }
+        } else {
+            content.modifier(CapHeightFallback(maxHeight: maxHeight))
+        }
+    }
+}
+
+/// iOS 15 has no `Layout`: the sheet hugs its ideal height until that outgrows the cap, then is
+/// held at the cap (the ideal height can't be read again without a second copy of the content).
+private struct CapHeightFallback: ViewModifier {
+    let maxHeight: CGFloat
+    @State private var capped = false
+
+    func body(content: Content) -> some View {
+        content
+            // both modifiers stay in place whatever `capped` is, so the content keeps its identity
+            .fixedSize(horizontal: false, vertical: !capped)
+            .background(
+                GeometryReader { proxy in
+                    Color.clear
+                        .onAppear { cap(proxy.size.height) }
+                        .onChange(of: proxy.size.height) { cap($0) }
+                }
+            )
+            .frame(height: capped ? maxHeight : nil, alignment: .top)
+    }
+
+    private func cap(_ height: CGFloat) {
+        if !capped, height > maxHeight { capped = true }
     }
 }
 
@@ -340,7 +367,6 @@ private struct BottomSheetFooter: View {
     }
 }
 
-@available(iOS 16.0, *)
 private func safeAreaBottomInset() -> CGFloat {
     let bottomInset = UIApplication.shared.connectedScenes
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }

package/ios/Navigation/BottomTab/BottomTab.swift

@@ -9,7 +9,6 @@
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 public struct BottomTab: View {
     private let items: [BottomTabItem]
     private let floatingButton: BottomTabFloatingButton?
@@ -178,7 +177,6 @@ private struct TabScreenHost: View {
 }
 
 /// Bottom safe-area inset (home indicator).
-@available(iOS 16.0, *)
 private func safeAreaBottomInset() -> CGFloat {
     let bottomInset = UIApplication.shared.connectedScenes
         .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }

package/ios/Navigation/Component/SnackBar.swift

@@ -49,7 +49,6 @@ public struct SnackBar {
 
 /// Self-animating container. Slides the content up on appear, schedules an
 /// auto-dismiss after `duration`, and animates out before removing the overplay.
-@available(iOS 16.0, *)
 struct SnackBarView: View {
     let snackBar: SnackBar
     /// Distance from the window bottom to the top of the screen's footer, or the navigation bar

package/ios/Navigation/HostBackGestureBridge.swift

@@ -4,18 +4,19 @@
 //
 //  SwiftUI mirror of Compose's `navigation/HostBackGestureBridge.kt`: the host owns the edge-pan
 //  recogniser and routes a back into the topmost kit stack. NavigationContainer attaches itself.
-//  The kit stack is a NavigationStack, so there is no seekable transition: the host only pops.
+//  `started` / `progressed` / `completed` / `cancelled` scrub the pop transition with the finger;
+//  a host that only calls `pop` gets the regular animated back.
 //
 
-import Foundation
+import UIKit
 
-@available(iOS 16.0, *)
 public final class HostBackGestureBridge {
     public static let shared = HostBackGestureBridge()
     private init() {}
 
-    // Weak: a container torn down while its cover is up never reports its disappearance.
+    // Weak: a container torn down without disappearing must not keep receiving backs.
     private var navigators: [WeakNavigator] = []
+    private weak var gestureTarget: Navigator?
 
     /// Set while a bottom tab other than the first is selected; the host shows its floating arrow.
     public var shouldUseFloatingArrowBack = false
@@ -28,6 +29,7 @@ public final class HostBackGestureBridge {
 
     public func detach(_ navigator: Navigator) {
         navigators.removeAll { $0.value == nil || $0.value === navigator }
+        if gestureTarget === navigator { gestureTarget = nil }
     }
 
     /// Whether a kit stack is on screen at all.
@@ -38,6 +40,27 @@ public final class HostBackGestureBridge {
 
     public func pop() { top()?.onBackSafe() }
 
+    public func started() {
+        guard let target = top() else { return }
+        gestureTarget = target
+        target.backStarted()
+    }
+
+    /// `progress` is the touch travel over the window width, 0...1.
+    public func progressed(_ progress: CGFloat) {
+        gestureTarget?.backProgressed(min(max(progress, 0), 1))
+    }
+
+    public func completed() {
+        (gestureTarget ?? top())?.backCompleted()
+        gestureTarget = nil
+    }
+
+    public func cancelled() {
+        gestureTarget?.backCancelled()
+        gestureTarget = nil
+    }
+
     @available(*, deprecated, renamed: "attach")
     public func push(_ navigator: Navigator) { attach(navigator) }
 
@@ -47,11 +70,9 @@ public final class HostBackGestureBridge {
     private func top() -> Navigator? { navigators.last { $0.value != nil }?.value }
 }
 
-@available(iOS 16.0, *)
 @available(*, deprecated, renamed: "HostBackGestureBridge")
 public typealias NavigatorManager = HostBackGestureBridge
 
-@available(iOS 16.0, *)
 private struct WeakNavigator {
     weak var value: Navigator?
 }

package/ios/Navigation/ModalScreen.swift

@@ -9,7 +9,6 @@
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 struct ModalScreen<Content: View>: View {
     let barrierDismissible: Bool
     let content: () -> Content

package/ios/Navigation/Navigation.swift

@@ -66,6 +66,11 @@ public struct NavigationOptions {
     public var fullScreenContent: Bool
     public var hiddenBack: Bool
     public var backgroundColor: Color?
+    // AI-GENERATED START: custom screen background view (Compose backgroundComponent)
+    /// Drawn instead of `backgroundColor` over the whole window: under the header and the status bar,
+    /// across the iPhone Duo side strips, and not shrunk by the keyboard. Pair with `headerTransparent`.
+    public var background: (() -> AnyView)?
+    // AI-GENERATED END: custom screen background view (Compose backgroundComponent)
     public var tintColor: Color?
     public var scrollable: Bool
     /// Compose's `ScrollData.scrollToTopCallback`, fired on a status-bar tap.
@@ -98,6 +103,9 @@ public struct NavigationOptions {
         fullScreenContent: Bool = false,
         hiddenBack: Bool = false,
         backgroundColor: Color? = nil,
+        // AI-GENERATED START: custom screen background view (Compose backgroundComponent)
+        background: (() -> AnyView)? = nil,
+        // AI-GENERATED END: custom screen background view (Compose backgroundComponent)
         tintColor: Color? = Colors.black17,
         scrollable: Bool = true,
         scrollToTopCallback: (() -> Void)? = nil,
@@ -125,6 +133,9 @@ public struct NavigationOptions {
         self.fullScreenContent = fullScreenContent
         self.hiddenBack = hiddenBack
         self.backgroundColor = backgroundColor
+        // AI-GENERATED START: custom screen background view (Compose backgroundComponent)
+        self.background = background
+        // AI-GENERATED END: custom screen background view (Compose backgroundComponent)
         self.tintColor = tintColor
         self.scrollable = scrollable
         self.scrollToTopCallback = scrollToTopCallback
@@ -161,6 +172,9 @@ struct OptionsStackScreen: View {
     var body: some View {
         StackScreen(
             backgroundColor: options.backgroundColor,
+            // AI-GENERATED START: custom screen background view (Compose backgroundComponent)
+            background: options.background,
+            // AI-GENERATED END: custom screen background view (Compose backgroundComponent)
             headerTransparent: options.headerTransparent,
             fullScreenContent: options.fullScreenContent,
             tintColor: options.tintColor ?? Colors.black17,

package/ios/Navigation/NavigationContainer.swift

@@ -2,14 +2,13 @@
 //  NavigationContainer.swift
 //  MoMoUIKits
 //
-//  SwiftUI mirror of Compose's `navigation/NavigationContainer.kt`: wraps NavigationStack
-//  (iOS 16+), injects Navigator, theme, localize and font scale, and renders every registered
-//  screen inside `StackScreen` chrome built from its options.
+//  SwiftUI mirror of Compose's `navigation/NavigationContainer.kt`: hosts the kit stack
+//  (`StackHost`, the NavHost counterpart), injects Navigator, theme, localize and font scale, and
+//  renders every registered screen inside `StackScreen` chrome built from its options.
 //
 
 import SwiftUI
 
-@available(iOS 16.0, *)
 public struct NavigationContainer<Initial: View>: View {
     @StateObject private var navigator: Navigator
     @StateObject private var applicationEnvironment: ApplicationEnvironment
@@ -71,24 +70,17 @@ public struct NavigationContainer<Initial: View>: View {
     }
 
     public var body: some View {
-        withKitEnvironment(
-            stack(path: $navigator.path, root: navigator.rootRoute)
-                .overlay { overplayLayer(presentedId: nil) }
+        StackHost(
+            navigator: navigator,
+            entries: navigator.entries,
+            screen: { [navigator] entry in
+                guard let screen = navigator.registry.getScreen(id: entry.id) else { return AnyView(EmptyView()) }
+                return AnyView(ScreenHost(screen: screen, navigator: navigator))
+            },
+            decorate: { AnyView(withKitEnvironment($0)) }
         )
-        .fullScreenCover(item: Binding(
-            get: { navigator.coverRoute },
-            // A close that bypasses the navigator (e.g. `dismiss()`) still tears the flow down.
-            // SwiftUI also writes nil after a navigator-driven close; by then a new screen may
-            // already be queued, so only a cover that is still showing counts.
-            set: { if $0 == nil, navigator.coverRoute != nil { navigator.dismiss() } }
-        )) { route in
-            withKitEnvironment(
-                stack(path: $navigator.presentedPath, root: DynamicScreenRoute(id: route.id))
-                    .overlay { overplayLayer(presentedId: route.id) }
-            )
-            .onAppear { navigator.coverDidAppear() }
-            .onDisappear { navigator.coverDidDisappear() }
-        }
+        // edge to edge: each screen's hosting controller takes the safe area and keyboard itself
+        .ignoresSafeArea()
         .onAppear {
             if navigator.composeApi == nil {
                 navigator.composeApi = composeApi
@@ -110,42 +102,10 @@ public struct NavigationContainer<Initial: View>: View {
             // AI-GENERATED END: demote the MaxApi language pull to a seed of last resort
         }
         .onDisappear {
-            // Our own cover hides the stack without leaving it; host back must still reach it.
-            guard navigator.presented == nil else { return }
             HostBackGestureBridge.shared.detach(navigator)
         }
     }
 
-    private func stack(path: Binding<[DynamicScreenRoute]>, root: DynamicScreenRoute) -> some View {
-        NavigationStack(path: path) {
-            screenView(for: root)
-                // A reset swaps the root in place; without the id it would inherit the old root's state.
-                .id(root.id)
-                .navigationDestination(for: DynamicScreenRoute.self) { route in
-                    screenView(for: route)
-                }
-        }
-    }
-
-    @ViewBuilder
-    private func screenView(for route: DynamicScreenRoute) -> some View {
-        if let screen = navigator.registry.getScreen(id: route.id) {
-            ScreenHost(screen: screen, navigator: navigator)
-                .navigationBarBackButtonHidden(true)
-        } else {
-            EmptyView()
-        }
-    }
-
-    /// Each context draws only the overplays shown over it, so one never re-mounts elsewhere.
-    @ViewBuilder
-    private func overplayLayer(presentedId: Int?) -> some View {
-        if let item = navigator.overplay, item.presentedId == presentedId {
-            OverplayHost(item: item)
-                .momoScreenLayout()
-        }
-    }
-
     private func withKitEnvironment<Content: View>(_ content: Content) -> some View {
         content
             .environmentObject(navigator)
@@ -159,7 +119,6 @@ public struct NavigationContainer<Initial: View>: View {
 
 // MARK: - ScreenHost
 
-@available(iOS 16.0, *)
 private struct ScreenHost: View {
     let screen: DynamicScreen
     let navigator: Navigator
@@ -180,15 +139,26 @@ private struct ScreenHost: View {
             goBack: { navigator.onBackSafe() },
             content: screen.content
         )
+        // Compose draws the overplay inside the screen it was shown over, under its LocalNavigation.
+        .overlay { OverplayLayer(screenId: screen.id) }
         .environmentObject(navigation)
-        // Per screen, not around the NavigationStack: a state-driven reader there stops path pushes rendering.
         .momoScreenLayout()
     }
 }
 
+private struct OverplayLayer: View {
+    let screenId: Int
+    @EnvironmentObject private var navigator: Navigator
+
+    var body: some View {
+        if let item = navigator.overplay, item.screenId == screenId {
+            OverplayHost(item: item)
+        }
+    }
+}
+
 // MARK: - Overplay host
 
-@available(iOS 16.0, *)
 private struct OverplayHost: View {
     let item: OverplayItem
     @EnvironmentObject var navigator: Navigator