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

package/ios/Navigation/Component/SideBar.swift

@@ -0,0 +1,176 @@
+//
+//  SideBar.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `navigation/component/SideBar.kt`. iPhone Duo: back and toolkit
+//  leave the header bar for a column in the side safe area, as the system bars do.
+//  Port of RN `SideBarButton.tsx` + `useSideBarItemStyle`.
+//
+
+import SwiftUI
+
+private let sideBarIconSize: CGFloat = 24
+
+/// The back button and toolkit column, placed in window coordinates over the side strip.
+struct HeaderSideBar: View {
+    let sideBar: SideBarLayout
+    let goBack: (() -> Void)?
+    let toolkit: (data: HeaderRightData?, tintColor: Color?)?
+    let headerColor: HeaderColor
+    /// What footer / tab bar / home indicator take from the bottom, gap included; the column stays above it.
+    let bottomInset: CGFloat
+
+    @Environment(\.screenLayout) private var layout
+    @Environment(\.applicationEnvironment) private var environment
+    @Environment(\.duoBarCompression) private var compression
+    @State private var columnHeight: CGFloat = 0
+
+    private var isRight: Bool { sideBar.edge == .right }
+
+    private var top: CGFloat {
+        let maxY = layout.height - bottomInset - columnHeight
+        return max(min(sideBar.top, maxY), 0)
+    }
+
+    /// Full height, so the tab bar compression decision follows this screen's toolkit.
+    private var fullHeight: CGFloat {
+        let toolkitHeight = toolkit.map {
+            Spacing.M + toolkitColumnHeight($0.data ?? HeaderRightData(), context: environment.applicationContext)
+        }
+        return DuoMetrics.controlSize + (toolkitHeight ?? 0)
+    }
+
+    var body: some View {
+        VStack(alignment: isRight ? .leading : .trailing, spacing: Spacing.M) {
+            if let goBack {
+                SideBarButton(
+                    icon: "arrow-back",
+                    headerColor: headerColor,
+                    accessibilityId: "btn_navigation_back",
+                    action: goBack
+                )
+            } else {
+                // keep the slot so the toolkit does not jump between root and pushed screens
+                Color.clear.frame(width: DuoMetrics.controlSize, height: DuoMetrics.controlSize)
+            }
+            if let toolkit {
+                if compression.toolbarHidden {
+                    // an open tab rail takes this slot for a moment
+                    EmptyView()
+                } else if compression.toolbarCompressed {
+                    // HIG "Toolbar compressed": tools fold into one button, distinct from the useMore icon
+                    SideBarButton(
+                        icon: "navigation_menu",
+                        headerColor: headerColor,
+                        showBadge: toolkit.data?.showBadge ?? false,
+                        accessibilityId: "btn_navigation_toolbar",
+                        action: compression.expandToolbar
+                    )
+                } else {
+                    Toolkit(
+                        headerRight: toolkit.data ?? HeaderRightData(),
+                        tintColor: toolkit.tintColor,
+                        vertical: true
+                    )
+                    .environment(\.headerColor, headerColor)
+                }
+            }
+        }
+        .padding(isRight ? .leading : .trailing, Spacing.M)
+        .frame(width: sideBar.width, alignment: isRight ? .leading : .trailing)
+        .background(
+            GeometryReader { proxy in
+                Color.clear
+                    .onAppear { columnHeight = proxy.size.height }
+                    .onChange(of: proxy.size.height) { columnHeight = $0 }
+            }
+        )
+        .padding(.top, top)
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: isRight ? .topTrailing : .topLeading)
+        .ignoresSafeArea()
+        .onAppear { compression.setToolbarHeight(fullHeight) }
+        .onChange(of: fullHeight) { compression.setToolbarHeight($0) }
+    }
+}
+
+/// Dark glass under light icons (banner headers), light glass otherwise.
+private struct SideBarGlass<S: Shape>: ViewModifier {
+    let headerColor: HeaderColor
+    let shape: S
+
+    private var isDark: Bool { headerColor.tintIconColor == Colors.black01 || headerColor.tintIconColor == .white }
+
+    func body(content: Content) -> some View {
+        if isDark {
+            content
+                .background(shape.fill(Colors.black20.opacity(0.5)))
+                .overlay(shape.stroke(Colors.black01.opacity(0.2), lineWidth: 0.5))
+        } else {
+            content
+                .background(
+                    shape.fill(Colors.black01.opacity(0.85))
+                        .shadow(color: Color.black.opacity(0.12), radius: 4, x: 0, y: 2)
+                )
+                .overlay(shape.stroke(Colors.black20.opacity(0.08), lineWidth: 0.5))
+        }
+    }
+}
+
+/// 48pt glass circle for a single side bar control.
+struct SideBarButton: View {
+    let icon: String
+    let headerColor: HeaderColor
+    var showBadge: Bool = false
+    var disabled: Bool = false
+    var accessibilityId: String?
+    let action: () -> Void
+
+    var body: some View {
+        SwiftUI.Button(action: action) {
+            Icon(source: icon, size: sideBarIconSize, color: headerColor.tintIconColor)
+                .frame(width: DuoMetrics.controlSize, height: DuoMetrics.controlSize)
+                .modifier(SideBarGlass(headerColor: headerColor, shape: Circle()))
+                .overlay(alignment: .topTrailing) {
+                    if showBadge {
+                        BadgeDot(size: .small).offset(x: -Spacing.XXS, y: Spacing.XXS)
+                    }
+                }
+        }
+        .buttonStyle(ActiveOpacityButtonStyle())
+        .disabled(disabled)
+        .accessibilityIdentifier(accessibilityId ?? "")
+    }
+}
+
+/// 48pt wide glass capsule grouping related controls, one item per 50pt.
+struct SideBarGroup<Content: View>: View {
+    let headerColor: HeaderColor
+    let itemCount: Int
+    @ViewBuilder let content: () -> Content
+
+    var body: some View {
+        VStack(spacing: 0) { content() }
+            .frame(
+                width: DuoMetrics.controlSize,
+                height: itemCount > 1 ? DuoMetrics.itemPitch * CGFloat(itemCount) : DuoMetrics.controlSize
+            )
+            .modifier(SideBarGlass(headerColor: headerColor, shape: RoundedRectangle(cornerRadius: Radius.XL)))
+    }
+}
+
+struct SideBarGroupItem: View {
+    let icon: String
+    let headerColor: HeaderColor
+    let accessibilityId: String
+    let action: () -> Void
+
+    var body: some View {
+        SwiftUI.Button(action: action) {
+            Icon(source: icon, size: sideBarIconSize, color: headerColor.tintIconColor)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(ActiveOpacityButtonStyle())
+        .accessibilityIdentifier(accessibilityId)
+    }
+}

package/ios/{Application/Navigation/Overplay → Navigation/Component}/SnackBar.swift

@@ -2,9 +2,8 @@
 //  SnackBar.swift
 //  MoMoUIKits
 //
-//  SwiftUI mirror of Compose's `SnackBar` (navigation/component/SnackBar.kt).
-//  A snack bar slides up from the bottom (just above the footer / home
-//  indicator), stays for `duration`, then slides back down and is removed.
+//  SwiftUI mirror of Compose's `navigation/component/SnackBar.kt`: slides up above the screen's
+//  footer (or the home indicator), stays for `duration`, then slides back down.
 //  `Navigator.showSnackBar(_:)` drives it through the overplay host.
 //
 
@@ -53,8 +52,8 @@ public struct SnackBar {
 @available(iOS 16.0, *)
 struct SnackBarView: View {
     let snackBar: SnackBar
-    /// Bottom inset so the bar sits above the footer / home indicator
-    /// (mirrors Compose's `footerHeight` offset).
+    /// Distance from the window bottom to the top of the screen's footer, or the navigation bar
+    /// inset without one (Compose's `footerHeight` offset).
     let bottomInset: CGFloat
 
     @EnvironmentObject private var navigator: Navigator
@@ -78,6 +77,7 @@ struct SnackBarView: View {
                 .padding(.bottom, bottomInset)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .ignoresSafeArea()
         .onAppear {
             guard !didAppear else { return }
             didAppear = true

package/ios/Navigation/HostBackGestureBridge.swift

@@ -0,0 +1,57 @@
+//
+//  HostBackGestureBridge.swift
+//  MoMoUIKits
+//
+//  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.
+//
+
+import Foundation
+
+@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.
+    private var navigators: [WeakNavigator] = []
+
+    /// Set while a bottom tab other than the first is selected; the host shows its floating arrow.
+    public var shouldUseFloatingArrowBack = false
+
+    public func attach(_ navigator: Navigator) {
+        navigators.removeAll { $0.value == nil }
+        guard !navigators.contains(where: { $0.value === navigator }) else { return }
+        navigators.append(WeakNavigator(value: navigator))
+    }
+
+    public func detach(_ navigator: Navigator) {
+        navigators.removeAll { $0.value == nil || $0.value === navigator }
+    }
+
+    /// Whether a kit stack is on screen at all.
+    public func checkCanPop() -> Bool { top() != nil }
+
+    /// Whether the top stack pops a screen itself; false means a back dismisses the mini app.
+    public func canPopInner() -> Bool { top()?.canPop() == true }
+
+    public func pop() { top()?.onBackSafe() }
+
+    @available(*, deprecated, renamed: "attach")
+    public func push(_ navigator: Navigator) { attach(navigator) }
+
+    @available(*, deprecated, renamed: "detach")
+    public func remove(_ navigator: Navigator) { detach(navigator) }
+
+    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/{Application/Navigation/Overplay → Navigation}/ModalScreen.swift

@@ -16,6 +16,7 @@ struct ModalScreen<Content: View>: View {
 
     @EnvironmentObject private var navigator: Navigator
     @Environment(\.applicationEnvironment) private var appEnv
+    @Environment(\.screenLayout) private var layout
 
     @State private var scrimOpacity: CGFloat = 0
     @State private var contentScale: CGFloat = 0.8
@@ -35,8 +36,11 @@ struct ModalScreen<Content: View>: View {
             content()
                 .scaleEffect(contentScale)
                 .opacity(contentOpacity)
+                // iPhone Duo: center below the side status bar and above the home indicator
+                .padding(.top, layout.isDuoDevice ? layout.duoTopInset : 0)
+                .padding(.bottom, layout.isDuoDevice ? layout.insets.bottom : 0)
         }
-        // Center on the full screen like Compose; landscape safe areas are asymmetric (camera on one side).
+        // Full screen like RN's Modal, so asymmetric landscape insets don't shift the content sideways.
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .ignoresSafeArea(.container)
         .onAppear {

package/ios/Navigation/Navigation.swift

@@ -0,0 +1,190 @@
+//
+//  Navigation.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `navigation/Navigation.kt`: a screen's `NavigationOptions` and the
+//  per-screen `Navigation` that updates them at runtime.
+//
+
+import SwiftUI
+
+/// Per-screen handle (Compose `LocalNavigation`). Read it inside a screen with
+/// `@EnvironmentObject var navigation: Navigation` and call `setOptions` to change the header,
+/// footer or back handling after the screen is shown.
+public final class Navigation: ObservableObject {
+    public let id: Int
+    public let bottomTabIndex: Int
+    @Published public private(set) var options: NavigationOptions
+
+    private weak var registry: DynamicScreenRegistry?
+    /// What the footer (or navigation bar) takes from the window bottom; lifts snack bars.
+    var bottomObstruction: CGFloat = 0
+
+    init(
+        id: Int = -1,
+        bottomTabIndex: Int = -1,
+        options: NavigationOptions?,
+        registry: DynamicScreenRegistry? = nil
+    ) {
+        self.id = id
+        self.bottomTabIndex = bottomTabIndex
+        self.options = options ?? NavigationOptions()
+        self.registry = registry
+        if id != -1 { registry?.bind(self) }
+    }
+
+    public func setOptions(_ options: NavigationOptions) {
+        update(options)
+    }
+
+    /// Changes only what the closure touches, like Compose's named-argument `setOptions`.
+    public func setOptions(_ transform: (inout NavigationOptions) -> Void) {
+        var updated = options
+        transform(&updated)
+        update(updated)
+    }
+
+    private func update(_ updated: NavigationOptions) {
+        options = updated
+        // back handling reads the registry copy
+        if id != -1 { registry?.setOptions(id: id, options: updated) }
+    }
+}
+
+public struct NavigationOptions {
+    public var screenName: String?
+    public var title: String
+    /// Rich header title (Compose `headerTitle`); `title` is used when nil.
+    public var headerTitle: HeaderTitle?
+    public var titlePosition: TitlePosition
+    public var headerType: HeaderType
+    /// Compose's `HeaderType.Default/Extended(useAnimated:)`: with `inputSearchProps`, the search
+    /// rises into the header on scroll.
+    public var useAnimated: Bool
+    /// Compose's `HeaderType.Transparent`; with `fullScreenContent` the content starts under it.
+    public var headerTransparent: Bool
+    public var fullScreenContent: Bool
+    public var hiddenBack: Bool
+    public var backgroundColor: Color?
+    public var tintColor: Color?
+    public var scrollable: Bool
+    /// Compose's `ScrollData.scrollToTopCallback`, fired on a status-bar tap.
+    public var scrollToTopCallback: (() -> Void)?
+    public var useAvoidKeyboard: Bool
+    /// Compose's `KeyboardOptions.keyboardShouldPersistTaps`: a tap anywhere hides the keyboard.
+    public var keyboardShouldPersistTaps: Bool
+    public var headerBackProps: HeaderBackProps?
+    /// Toolkit data for the default header right (Compose `HeaderRight.Toolkit`). Use `headerRight`
+    /// for a custom view and nil for none.
+    public var headerRightData: HeaderRightData?
+    public var headerRight: (() -> any View)?
+    public var footer: (() -> AnyView)?
+    public var footerTransparent: Bool
+    public var footerUseMargin: Bool
+    public var animatedHeader: AnimatedHeader?
+    public var layoutOffset: CGFloat
+    public var inputSearchProps: InputSearchProps?
+    public var fabProps: FabProps?
+    public var onBackHandler: (() -> Void)?
+
+    public init(
+        screenName: String? = nil,
+        title: String = "Stack",
+        headerTitle: HeaderTitle? = nil,
+        titlePosition: TitlePosition = .left,
+        headerType: HeaderType = .default,
+        useAnimated: Bool = false,
+        headerTransparent: Bool = false,
+        fullScreenContent: Bool = false,
+        hiddenBack: Bool = false,
+        backgroundColor: Color? = nil,
+        tintColor: Color? = Colors.black17,
+        scrollable: Bool = true,
+        scrollToTopCallback: (() -> Void)? = nil,
+        useAvoidKeyboard: Bool = true,
+        keyboardShouldPersistTaps: Bool = false,
+        headerBackProps: HeaderBackProps? = nil,
+        headerRightData: HeaderRightData? = nil,
+        headerRight: (() -> any View)? = { HeaderRight() },
+        footer: (() -> AnyView)? = nil,
+        footerTransparent: Bool = false,
+        footerUseMargin: Bool = true,
+        animatedHeader: AnimatedHeader? = nil,
+        layoutOffset: CGFloat = 56,
+        inputSearchProps: InputSearchProps? = nil,
+        fabProps: FabProps? = nil,
+        onBackHandler: (() -> Void)? = nil
+    ) {
+        self.screenName = screenName
+        self.title = title
+        self.headerTitle = headerTitle
+        self.titlePosition = titlePosition
+        self.headerType = headerType
+        self.useAnimated = useAnimated
+        self.headerTransparent = headerTransparent
+        self.fullScreenContent = fullScreenContent
+        self.hiddenBack = hiddenBack
+        self.backgroundColor = backgroundColor
+        self.tintColor = tintColor
+        self.scrollable = scrollable
+        self.scrollToTopCallback = scrollToTopCallback
+        self.useAvoidKeyboard = useAvoidKeyboard
+        self.keyboardShouldPersistTaps = keyboardShouldPersistTaps
+        self.headerBackProps = headerBackProps
+        self.headerRightData = headerRightData
+        self.headerRight = headerRight
+        self.footer = footer
+        self.footerTransparent = footerTransparent
+        self.footerUseMargin = footerUseMargin
+        self.animatedHeader = animatedHeader
+        self.layoutOffset = layoutOffset
+        self.inputSearchProps = inputSearchProps
+        self.fabProps = fabProps
+        self.onBackHandler = onBackHandler
+    }
+}
+
+extension NavigationOptions {
+    var resolvedHeaderRight: (() -> any View)? {
+        guard let headerRightData else { return headerRight }
+        return { HeaderRight(headerRight: headerRightData, tintColor: tintColor) }
+    }
+}
+
+/// `StackScreen` built from options, shared by stack screens and bottom-tab screens.
+struct OptionsStackScreen: View {
+    let options: NavigationOptions
+    let screenName: String
+    let goBack: (() -> Void)?
+    let content: () -> AnyView
+
+    var body: some View {
+        StackScreen(
+            backgroundColor: options.backgroundColor,
+            headerTransparent: options.headerTransparent,
+            fullScreenContent: options.fullScreenContent,
+            tintColor: options.tintColor ?? Colors.black17,
+            isBack: !options.hiddenBack,
+            headerType: options.headerType,
+            useAnimated: options.useAnimated,
+            title: options.title,
+            headerTitle: options.headerTitle,
+            titlePosition: options.titlePosition,
+            goBack: options.hiddenBack ? nil : goBack,
+            scrollable: options.scrollable,
+            scrollToTopCallback: options.scrollToTopCallback,
+            useAvoidKeyboard: options.useAvoidKeyboard,
+            keyboardShouldPersistTaps: options.keyboardShouldPersistTaps,
+            footer: options.footer,
+            footerTransparent: options.footerTransparent,
+            footerUseMargin: options.footerUseMargin,
+            headerRight: options.resolvedHeaderRight,
+            animatedHeader: options.animatedHeader,
+            layoutOffset: options.layoutOffset,
+            inputSearchProps: options.inputSearchProps,
+            fabProps: options.fabProps,
+            screenName: screenName,
+            content: content
+        )
+    }
+}