@momo-kits/native-kits 0.167.1-duo.5-debug → 0.167.1-duo.6

package/ios/Application/Navigation/NavigationContainer.swift

@@ -123,6 +123,7 @@ public struct NavigationContainer<Initial: View>: View {
     private func overplayLayer(presentedId: Int?) -> some View {
         if let item = navigator.overplay, item.presentedId == presentedId {
             OverplayHost(item: item)
+                .momoScreenLayout()
         }
     }
 
@@ -170,6 +171,8 @@ private struct ScreenHost: View {
             screenName: screen.name,
             content: { screen.content() }
         )
+        // Per screen, not around the NavigationStack: a state-driven reader there stops path pushes rendering.
+        .momoScreenLayout()
     }
 }
 

package/ios/Application/Navigation/Overplay/BottomSheet.swift

@@ -45,6 +45,7 @@ struct BottomSheetView<Content: View>: View {
     @EnvironmentObject private var navigator: Navigator
     @Environment(\.appTheme) private var theme
     @Environment(\.applicationEnvironment) private var appEnv
+    @Environment(\.screenLayout) private var layout
 
     /// Vertical translation of the sheet; starts off-screen and animates to 0.
     @State private var sheetOffset: CGFloat = UIScreen.main.bounds.height
@@ -66,7 +67,36 @@ struct BottomSheetView<Content: View>: View {
     /// steady-state (fully open) scrim peaks at 0.6, matching ModalScreen's peak.
     private let maxDynamicAlpha: CGFloat = 0.3
 
-    private var screenHeight: CGFloat { UIScreen.main.bounds.height }
+    // UIScreen stays on the outer display on iPhone Duo, even when unfolded
+    private var screenHeight: CGFloat { isDuo ? layout.height : UIScreen.main.bounds.height }
+
+    private var isDuo: Bool { layout.isDuoDevice }
+    // iPhone Duo inner display: center the sheet instead of spanning the width
+    private var isDuoCentered: Bool { isDuo && layout.width >= 600 }
+
+    /// Keeps the portrait width in landscape, like system sheets.
+    private var duoCenteredWidth: CGFloat {
+        min(
+            min(layout.width, layout.height) - Spacing.L * 2,
+            layout.width - max(layout.insets.leading, layout.insets.trailing, Spacing.L) * 2
+        )
+    }
+
+    /// Landscape side buttons span the full height, so the content is inset; in portrait the
+    /// side status bar only covers the top corner.
+    private var sideInsetLeading: CGFloat {
+        isDuo && !isDuoCentered && layout.width > layout.height ? layout.insets.leading : 0
+    }
+
+    private var sideInsetTrailing: CGFloat {
+        isDuo && !isDuoCentered && layout.width > layout.height ? layout.insets.trailing : 0
+    }
+
+    /// The keyboard filler is part of the sheet, so capping the sheet shrinks the content by it.
+    private var duoMaxHeight: CGFloat? {
+        guard isDuo else { return nil }
+        return layout.height - max(layout.duoTopInset, Spacing.XL)
+    }
     private var bottomInset: CGFloat { safeAreaBottomInset() }
     /// While the keyboard is up, it already covers the home-indicator area, so it
     /// replaces (rather than adds to) the usual bottom-inset filler.
@@ -110,7 +140,7 @@ struct BottomSheetView<Content: View>: View {
         .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillChangeFrameNotification)) { notification in
             guard let endFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else { return }
             withAnimation(.easeOut(duration: 0.25)) {
-                keyboardHeight = UIScreen.main.bounds.height - endFrame.origin.y
+                keyboardHeight = screenHeight - endFrame.origin.y
             }
         }
         .onAppear {
@@ -138,6 +168,8 @@ struct BottomSheetView<Content: View>: View {
                 headerView
                     .frame(height: 56)
                     .padding(.horizontal, Spacing.M)
+                    .padding(.leading, sideInsetLeading)
+                    .padding(.trailing, sideInsetTrailing)
             }
             .frame(maxWidth: .infinity)
             .frame(height: 72)
@@ -149,12 +181,17 @@ struct BottomSheetView<Content: View>: View {
                 .frame(height: 1)
 
             content()
+                .padding(.leading, sideInsetLeading)
+                .padding(.trailing, sideInsetTrailing)
+                // a tall sheet on iPhone Duo keeps its header and gives the content what is left
+                .layoutPriority(-1)
 
             backgroundColor
                 .frame(height: effectiveBottomInset)
         }
-        .frame(maxWidth: .infinity)
-        .frame(alignment: .bottom)
+        .frame(maxWidth: isDuoCentered ? duoCenteredWidth : .infinity)
+        .frame(maxHeight: duoMaxHeight, alignment: .bottom)
+        .clipped()
         .background(
             GeometryReader { geo in
                 Color.clear.onAppear { sheetHeight = geo.size.height }

package/ios/Application/Navigation/Overplay/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/Application/Navigation/component/DuoScrollGradient.swift

@@ -0,0 +1,55 @@
+//
+//  DuoScrollGradient.swift
+//  MoMoUIKits
+//
+//  Port of RN `DuoScrollGradient` (Components/DuoGlassBackground.tsx): with the iPhone Duo
+//  glass header the content scrolls under the bar, so the header gradient is drawn under it.
+//
+
+import SwiftUI
+
+// extended headers run their gradient this far below the header, as off Duo
+private let extendedGradientExtra: CGFloat = 52
+// scroll distance over which the extended gradient collapses to the header
+private let extendedCollapseDistance: CGFloat = 100
+
+struct DuoScrollGradient: View {
+    let scrollOffset: CGFloat
+    let headerHeight: CGFloat
+    let extended: Bool
+
+    @Environment(\.appTheme) private var theme
+    @Environment(\.screenLayout) private var layout
+
+    private var scroll: CGFloat { max(scrollOffset, 0) }
+
+    private var gradient: LinearGradient {
+        LinearGradient(
+            colors: [theme.colors.gradient, theme.colors.gradient.opacity(0)],
+            startPoint: .top,
+            endPoint: .bottom
+        )
+    }
+
+    var body: some View {
+        Group {
+            if extended {
+                // extended squeezes the whole fade into its box and fades out
+                let progress = min(scroll / extendedCollapseDistance, 1)
+                gradient
+                    .frame(height: headerHeight + extendedGradientExtra * (1 - progress))
+                    .opacity(1 - min(scroll / extendedGradientExtra, 1))
+            } else {
+                // default keeps the off-Duo 375:154 shape, the header clips it, and scrolls away
+                gradient
+                    .frame(height: layout.width * 154 / 375)
+                    .frame(height: headerHeight, alignment: .top)
+                    .clipped()
+                    .offset(y: -scroll)
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .ignoresSafeArea()
+        .allowsHitTesting(false)
+    }
+}

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

@@ -60,7 +60,11 @@ public struct NavigationHeader: View {
         self.titleOpacity = titleOpacity
     }
 
+    @Environment(\.screenLayout) private var layout
+
     private var isAnimated: Bool { animatedHeader != nil }
+    /// iPhone Duo side bar holds back and the toolkit; a custom header right stays in the bar.
+    private var useSideBar: Bool { layout.sideBar != nil }
     private var isSurface: Bool { animatedHeader?.isSurface ?? true }
 
     private var headerColor: HeaderColor {
@@ -79,7 +83,7 @@ public struct NavigationHeader: View {
         if headerType != .none {
             ZStack {
                 HStack(spacing: 0) {
-                    if let goBack {
+                    if let goBack, !useSideBar {
                         BackButton(color: headerColor, onBack: goBack)
                         Spacer().frame(width: Spacing.S)
                     }
@@ -91,7 +95,7 @@ public struct NavigationHeader: View {
                             .frame(maxWidth: .infinity, alignment: .leading)
                     }
 
-                    if let headerRight {
+                    if let headerRight, !(useSideBar && toolkitHeaderRight(headerRight) != nil) {
                         AnyView(headerRight())
                             .background(
                                 GeometryReader { geo in
@@ -107,8 +111,10 @@ public struct NavigationHeader: View {
                         .padding(.horizontal, Spacing.M)
                 }
             }
-            .frame(height: HEADER_HEIGHT)
+            .frame(height: layout.headerBarHeight)
             .overlay(alignment: .bottom) { VerticalShadow(opacity: opacity) }
+            // status bar off the top edge: the row spans the whole header from the window top
+            .padding(.top, min(layout.headerStatusBarHeight - layout.insets.top, 0))
         }
     }
 

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

@@ -43,10 +43,11 @@ public struct NavigationHeaderBackground: View {
         )
     }
 
+    @Environment(\.screenLayout) private var layout
+
     public var body: some View {
-        let statusBarHeight = safeAreaTopInset()
         let opacity = max(0, 1 - scrollState / CGFloat(HEADER_HEIGHT))
-        let minHeight = fullScreenContent ? 0 : statusBarHeight + HEADER_HEIGHT
+        let minHeight = fullScreenContent ? 0 : layout.headerHeight
         let maxHeight: CGFloat = 154
         let backgroundColor = headerTransparent ? Color.clear : Colors.black01
         let topColor = opacity == 0 ? backgroundColor : Color(hex: 0xFDCADE)

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

@@ -69,7 +69,7 @@ public struct NavigationFooter: View {
             .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))
+            .background(theme.colors.background.surface.ignoresSafeArea(.container, edges: [.bottom, .horizontal]))
             .overlay(alignment: .top) { shadow }
             .offset(y: Self.verticalOffset(keyboardSize: keyboardSize))
         }

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

@@ -26,6 +26,8 @@ public struct NavigationHeaderRight: View {
 struct ToolkitNavigationHeaderRight: View {
     var headerRight: HeaderRightData?
     var tintColor: Color?
+    /// iPhone Duo side bar column instead of the bar row.
+    var vertical: Bool = false
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @Environment(\.applicationEnvironment) private var environment
@@ -142,15 +144,68 @@ struct ToolkitNavigationHeaderRight: View {
         return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
     }
 
+    private var showHelpCenter: Bool {
+        environment.applicationContext != nil && showsHelpCenter(environment.applicationContext)
+    }
+
+    private var closeIcon: String { headerRight?.closeIcon ?? "16_basic_home" }
+
     var body: some View {
+        Group {
+            if vertical {
+                verticalBody
+            } else {
+                horizontalBody
+            }
+        }
+        .onAppear {
+            loadFavoriteState()
+        }
+    }
+
+    private var showBadge: Bool {
+        headerRight?.tools.contains { group in
+            group.items.contains { $0.showBadge }
+        } ?? false
+    }
+
+    private var verticalBody: some View {
+        let navButtonConfig = getNavigationButtonConfig()
+        return VStack(spacing: Spacing.M) {
+            if shouldShowShortcut {
+                SideBarButton(
+                    icon: navButtonConfig.icon,
+                    tintColor: tintColor,
+                    showBadge: showBadge,
+                    disabled: isLoading,
+                    action: navButtonConfig.onPress
+                )
+            }
+            SideBarGroup(tintColor: tintColor, itemCount: showHelpCenter ? 2 : 1) {
+                if showHelpCenter {
+                    SideBarGroupItem(
+                        icon: "help_center",
+                        tintColor: tintColor,
+                        accessibilityId: "btn_navigation_help_center",
+                        action: onPressHelpCenter
+                    )
+                }
+                SideBarGroupItem(
+                    icon: closeIcon,
+                    tintColor: tintColor,
+                    accessibilityId: "btn_navigation_close",
+                    action: onPressClose
+                )
+            }
+        }
+    }
+
+    private var horizontalBody: some View {
         let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
         let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
         let navButtonConfig = getNavigationButtonConfig()
-        let showBadge = headerRight?.tools.contains { group in
-            group.items.contains { $0.showBadge }
-        } ?? false
 
-        HStack(alignment: .center, spacing: 0) {
+        return HStack(alignment: .center, spacing: 0) {
             if shouldShowShortcut {
                 NavigationButton(
                     disabled: isLoading,
@@ -162,7 +217,7 @@ struct ToolkitNavigationHeaderRight: View {
             }
 
             HStack(alignment: .center, spacing: 0) {
-                if environment.applicationContext != nil {
+                if showHelpCenter {
                     Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
                         .padding(4)
                         .onTapGesture {
@@ -174,7 +229,7 @@ struct ToolkitNavigationHeaderRight: View {
                         .frame(width: 0.5, height: 12)
                 }
 
-                Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
+                Icon(source: closeIcon, size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
                     .onTapGesture {
                         onPressClose()
@@ -189,8 +244,5 @@ struct ToolkitNavigationHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
-        .onAppear {
-            loadFavoriteState()
-        }
     }
 }

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

@@ -0,0 +1,155 @@
+//
+//  SideBar.swift
+//  MoMoUIKits
+//
+//  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
+
+/// Toolkit data when `headerRight` renders the kit toolkit; nil for a custom header right.
+func toolkitHeaderRight(_ headerRight: (() -> any View)?) -> (data: HeaderRightData?, tintColor: Color?)? {
+    guard let view = headerRight?() else { return nil }
+    if let toolkit = view as? HeaderRight { return (toolkit.headerRight, toolkit.tintColor) }
+    if let toolkit = view as? NavigationHeaderRight { return (toolkit.headerRight, toolkit.tintColor) }
+    return nil
+}
+
+/// 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; the column stays above it.
+    let bottomInset: CGFloat
+
+    @Environment(\.screenLayout) private var layout
+    @State private var columnHeight: CGFloat = 0
+
+    private var isRight: Bool { sideBar.edge == .right }
+
+    private var top: CGFloat {
+        let maxY = layout.height - bottomInset - Spacing.XL - columnHeight
+        return max(min(sideBar.top, maxY), 0)
+    }
+
+    var body: some View {
+        VStack(alignment: isRight ? .leading : .trailing, spacing: Spacing.M) {
+            if let goBack {
+                SideBarButton(
+                    icon: "arrow-back",
+                    tintColor: headerColor.tintIconColor,
+                    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 {
+                ToolkitNavigationHeaderRight(
+                    headerRight: toolkit.data,
+                    tintColor: toolkit.tintColor ?? headerColor.tintIconColor,
+                    vertical: true
+                )
+            }
+        }
+        .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()
+    }
+}
+
+/// Dark glass under light icons (banner headers), light glass otherwise.
+private struct SideBarGlass<S: Shape>: ViewModifier {
+    let tintColor: Color?
+    let shape: S
+
+    private var isDark: Bool { tintColor == Colors.black01 || tintColor == .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
+    var tintColor: Color?
+    var showBadge: Bool = false
+    var disabled: Bool = false
+    var accessibilityId: String?
+    let action: () -> Void
+
+    var body: some View {
+        SwiftUI.Button(action: { if !disabled { action() } }) {
+            Icon(source: icon, size: sideBarIconSize, color: tintColor ?? Colors.black17)
+                .frame(width: DuoMetrics.controlSize, height: DuoMetrics.controlSize)
+                .modifier(SideBarGlass(tintColor: tintColor, shape: Circle()))
+                .overlay(alignment: .topTrailing) {
+                    if showBadge {
+                        BadgeDot(size: .small).offset(x: -Spacing.XXS, y: Spacing.XXS)
+                    }
+                }
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier(accessibilityId ?? "")
+    }
+}
+
+/// 48pt wide glass capsule grouping related controls, one item per 50pt.
+struct SideBarGroup<Content: View>: View {
+    var tintColor: Color?
+    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(tintColor: tintColor, shape: RoundedRectangle(cornerRadius: Radius.XL)))
+    }
+}
+
+struct SideBarGroupItem: View {
+    let icon: String
+    var tintColor: Color?
+    let accessibilityId: String
+    let action: () -> Void
+
+    var body: some View {
+        SwiftUI.Button(action: action) {
+            Icon(source: icon, size: sideBarIconSize, color: tintColor ?? Colors.black17)
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .contentShape(Rectangle())
+        }
+        .buttonStyle(.plain)
+        .accessibilityIdentifier(accessibilityId)
+    }
+}