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

package/ios/Application/Navigation/BottomTab/DuoTabBar.swift

@@ -28,7 +28,7 @@ private let tabSpring = Animation.interpolatingSpring(mass: 0.8, stiffness: 220,
 struct DuoTabBarInsets: Equatable {
     /// Floating bar overlays the content: scroll content, footer and FAB keep clear of it.
     var overlay: CGFloat = 0
-    /// Rail sits at the bottom of the side strip: the header side bar stays above it.
+    /// Rail sits at the bottom of the side strip: the header side bar stays this far above the window bottom.
     var sideBarReserve: CGFloat = 0
 }
 
@@ -43,16 +43,21 @@ extension EnvironmentValues {
     }
 }
 
+/// Rail plus the QR button under it; compressed, the rail is a single button.
+func duoRailHeight(itemCount: Int, hasQr: Bool, compressed: Bool = false) -> CGFloat {
+    let count = CGFloat(itemCount)
+    let rail = compressed ? itemSize : railPadding * 2 + count * itemSize + max(count - 1, 0) * railGap
+    return rail + (hasQr ? Spacing.M + itemSize : 0)
+}
+
 extension ScreenLayout {
-    func duoTabBarInsets(itemCount: Int, hasFloatingButton: Bool) -> DuoTabBarInsets {
+    func duoTabBarInsets(itemCount: Int, hasFloatingButton: Bool, tabBarCompressed: Bool = false) -> DuoTabBarInsets {
         guard isIPhoneDuo else { return DuoTabBarInsets() }
-        guard sideBar != nil else {
+        guard let sideBar else {
             return DuoTabBarInsets(overlay: duoFloatingTabBarHeight + Spacing.M)
         }
-        let count = CGFloat(itemCount)
-        let rail = railPadding * 2 + count * itemSize + max(count - 1, 0) * railGap
-        let qr = hasFloatingButton ? Spacing.M + itemSize : 0
-        return DuoTabBarInsets(sideBarReserve: rail + qr + Spacing.XL)
+        let rail = duoRailHeight(itemCount: itemCount, hasQr: hasFloatingButton, compressed: tabBarCompressed)
+        return DuoTabBarInsets(sideBarReserve: sideBar.bottom + rail + DuoBarCompression.groupGap)
     }
 }
 
@@ -95,13 +100,14 @@ struct DuoTabBar: View {
     let floatingButton: BottomTabFloatingButton?
     let selectedIndex: Int
     let onTabSelected: (Int) -> Void
+    var compression = DuoBarCompression()
 
     @Environment(\.screenLayout) private var layout
 
     var body: some View {
         if let sideBar = layout.sideBar {
             DuoRailTabBar(sideBar: sideBar, items: items, floatingButton: floatingButton,
-                          selectedIndex: selectedIndex, onTabSelected: onTabSelected)
+                          selectedIndex: selectedIndex, onTabSelected: onTabSelected, compression: compression)
         } else {
             DuoFloatingTabBar(items: items, floatingButton: floatingButton,
                               selectedIndex: selectedIndex, onTabSelected: onTabSelected)
@@ -110,12 +116,15 @@ struct DuoTabBar: View {
 }
 
 /// Vertical bar anchored to the bottom of the side bar, QR button below it (Figma MT1-C/E).
+/// When the side bar is short it can shrink to one button showing the current tab
+/// (HIG "Tab bar compressed"); tapping it expands the rail and compresses the toolbar.
 private struct DuoRailTabBar: View {
     let sideBar: SideBarLayout
     let items: [BottomTabItem]
     let floatingButton: BottomTabFloatingButton?
     let selectedIndex: Int
     let onTabSelected: (Int) -> Void
+    let compression: DuoBarCompression
 
     @Environment(\.appTheme) private var theme
 
@@ -123,30 +132,19 @@ private struct DuoRailTabBar: View {
 
     var body: some View {
         VStack(spacing: Spacing.M) {
-            ZStack(alignment: .top) {
-                Capsule()
-                    .fill(theme.colors.background.selected)
-                    .frame(width: railBubbleWidth, height: railBubbleHeight)
-                    .offset(y: railPadding - (railBubbleHeight - itemSize) / 2
-                        + CGFloat(selectedIndex) * (itemSize + railGap))
-                    .animation(tabSpring, value: selectedIndex)
-
-                VStack(spacing: railGap) {
-                    ForEach(items.indices, id: \.self) { index in
-                        SwiftUI.Button { onTabSelected(index) } label: {
-                            DuoTabIcon(item: items[index], selected: index == selectedIndex)
-                                .frame(width: itemSize, height: itemSize)
-                                .contentShape(Rectangle())
-                        }
-                        .buttonStyle(.plain)
-                        .accessibilityLabel(items[index].label)
-                    }
+            if compression.tabBarCompressed, items.indices.contains(selectedIndex) {
+                SwiftUI.Button(action: compression.expandTabBar) {
+                    DuoTabIcon(item: items[selectedIndex], selected: true)
+                        .frame(width: itemSize, height: itemSize)
+                        .contentShape(Circle())
                 }
-                .padding(.vertical, railPadding)
+                .buttonStyle(.plain)
+                .modifier(DuoBarMaterial(shape: Circle()))
+                .accessibilityLabel(items[selectedIndex].label)
+                .accessibilityIdentifier("bottom_tab_bar")
+            } else {
+                rail
             }
-            .frame(width: itemSize)
-            .modifier(DuoBarMaterial(shape: RoundedRectangle(cornerRadius: Radius.XL)))
-            .accessibilityIdentifier("bottom_tab_bar")
 
             if let floatingButton {
                 DuoQrButton(data: floatingButton, size: itemSize)
@@ -154,10 +152,41 @@ private struct DuoRailTabBar: View {
         }
         .padding(isRight ? .leading : .trailing, Spacing.M)
         .frame(width: sideBar.width, alignment: isRight ? .leading : .trailing)
-        .padding(.bottom, Spacing.XL)
+        .padding(.bottom, sideBar.bottom)
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: isRight ? .bottomTrailing : .bottomLeading)
         .ignoresSafeArea()
     }
+
+    /// Glass column of tab items with the sliding selection bubble.
+    private var rail: some View {
+        ZStack(alignment: .top) {
+            Capsule()
+                .fill(theme.colors.background.selected)
+                .frame(width: railBubbleWidth, height: railBubbleHeight)
+                .offset(y: railPadding - (railBubbleHeight - itemSize) / 2
+                    + CGFloat(selectedIndex) * (itemSize + railGap))
+                .animation(tabSpring, value: selectedIndex)
+
+            VStack(spacing: railGap) {
+                ForEach(items.indices, id: \.self) { index in
+                    SwiftUI.Button {
+                        onTabSelected(index)
+                        compression.onTabSelected()
+                    } label: {
+                        DuoTabIcon(item: items[index], selected: index == selectedIndex)
+                            .frame(width: itemSize, height: itemSize)
+                            .contentShape(Rectangle())
+                    }
+                    .buttonStyle(.plain)
+                    .accessibilityLabel(items[index].label)
+                }
+            }
+            .padding(.vertical, railPadding)
+        }
+        .frame(width: itemSize)
+        .modifier(DuoBarMaterial(shape: RoundedRectangle(cornerRadius: Radius.XL)))
+        .accessibilityIdentifier("bottom_tab_bar")
+    }
 }
 
 /// Floating labelled bar for the unfolded portrait display, QR in the middle cell (Figma MT1-M).

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

@@ -17,39 +17,38 @@ struct DuoScrollGradient: View {
     let scrollOffset: CGFloat
     let headerHeight: CGFloat
     let extended: Bool
+    /// Quick return header: the gradient leaves with the content instead of fading.
+    var followScroll = false
 
     @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)
+            if followScroll {
                 gradient
-                    .frame(height: headerHeight + extendedGradientExtra * (1 - progress))
-                    .opacity(1 - min(scroll / extendedGradientExtra, 1))
+                    .frame(height: headerHeight + (extended ? extendedGradientExtra : 0))
+                    .offset(y: -scroll)
             } else {
-                // default keeps the off-Duo 375:154 shape, the header clips it, and scrolls away
+                // fades out on scroll as the extended header does off Duo; extended also collapses
+                let progress = min(scroll / extendedCollapseDistance, 1)
                 gradient
-                    .frame(height: layout.width * 154 / 375)
-                    .frame(height: headerHeight, alignment: .top)
-                    .clipped()
-                    .offset(y: -scroll)
+                    .frame(height: headerHeight + (extended ? extendedGradientExtra * (1 - progress) : 0))
+                    .opacity(1 - min(scroll / extendedGradientExtra, 1))
             }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         .ignoresSafeArea()
         .allowsHitTesting(false)
     }
+
+    /// The fade spans the gradient box.
+    private var gradient: LinearGradient {
+        LinearGradient(
+            colors: [theme.colors.gradient, theme.colors.gradient.opacity(0)],
+            startPoint: .top,
+            endPoint: .bottom
+        )
+    }
 }

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

@@ -113,8 +113,9 @@ public struct NavigationHeader: View {
             }
             .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))
+            // the row starts headerStatusBarHeight below the window top: 0 with the status bar off
+            // the top edge, lower on the iPhone Duo outer display to center on the camera
+            .padding(.top, layout.headerStatusBarHeight - layout.insets.top)
         }
     }
 

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

@@ -31,6 +31,7 @@ struct ToolkitNavigationHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @Environment(\.applicationEnvironment) private var environment
+    @Environment(\.duoBarCompression) private var compression
 
     private func apiValue(_ value: Any?) -> Any {
         value ?? NSNull()
@@ -169,7 +170,38 @@ struct ToolkitNavigationHeaderRight: View {
         } ?? false
     }
 
+    /// Back slot, the optional shortcut, then the help/home capsule.
+    private var fullToolbarHeight: CGFloat {
+        DuoMetrics.controlSize + Spacing.M
+            + (shouldShowShortcut ? DuoMetrics.controlSize + Spacing.M : 0)
+            + (showHelpCenter ? 2 * DuoMetrics.itemPitch : DuoMetrics.controlSize)
+    }
+
+    @ViewBuilder
     private var verticalBody: some View {
+        Group {
+            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",
+                    tintColor: tintColor,
+                    showBadge: showBadge,
+                    accessibilityId: "btn_navigation_toolbar",
+                    action: compression.expandToolbar
+                )
+            } else {
+                toolbarColumn
+            }
+        }
+        // full height, so the tab bar compression decision matches this screen's toolkit
+        .onAppear { compression.setToolbarHeight(fullToolbarHeight) }
+        .onChange(of: fullToolbarHeight) { compression.setToolbarHeight($0) }
+    }
+
+    private var toolbarColumn: some View {
         let navButtonConfig = getNavigationButtonConfig()
         return VStack(spacing: Spacing.M) {
             if shouldShowShortcut {

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

@@ -24,7 +24,7 @@ struct HeaderSideBar: View {
     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.
+    /// 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
@@ -33,7 +33,7 @@ struct HeaderSideBar: View {
     private var isRight: Bool { sideBar.edge == .right }
 
     private var top: CGFloat {
-        let maxY = layout.height - bottomInset - Spacing.XL - columnHeight
+        let maxY = layout.height - bottomInset - columnHeight
         return max(min(sideBar.top, maxY), 0)
     }
 

package/ios/Application/StackScreen.swift

@@ -102,6 +102,9 @@ public struct StackScreen<Content: View>: View {
     @State private var keyboardHeight: CGFloat = 0
     @State private var headerRightWidth: CGFloat = 0
     @State private var isBottomTabRoot: Bool = false
+    @State private var headerHide: CGFloat = 0
+    @State private var lastScrollOffset: CGFloat = 0
+    @State private var headerSettle: Task<Void, Never>?
 
     @Environment(\.applicationEnvironment) private var appEnv
     @Environment(\.screenLayout) private var layout
@@ -140,11 +143,44 @@ public struct StackScreen<Content: View>: View {
             && inputSearchProps == nil && !headerTransparent && !fullScreenContent
     }
 
-    /// Height the footer, tab bar or home indicator takes from the bottom of the window.
+    /// iPhone Duo: the header leaves with the content and slides back in on a reverse scroll
+    /// (RN DuoQuickReturnHeader). The side bar is drawn apart from the header, so it stays put.
+    private var useQuickReturn: Bool {
+        layout.sideBar != nil && scrollable && (useDuoGlass || animatedHeader != nil)
+    }
+
+    private func updateHeaderHide(_ offset: CGFloat) {
+        let delta = offset - lastScrollOffset
+        lastScrollOffset = offset
+        guard useQuickReturn, offset > 0 else {
+            if headerHide != 0 { headerHide = 0 }
+            return
+        }
+        headerHide = min(max(headerHide + delta, 0), layout.headerHeight)
+        settleHeaderWhenScrollStops()
+    }
+
+    /// A half-shown header settles fully in or out. SwiftUI before iOS 18 reports no scroll
+    /// phase, so the scroll counts as ended once the offset stops changing.
+    private func settleHeaderWhenScrollStops() {
+        headerSettle?.cancel()
+        headerSettle = Task { @MainActor in
+            try? await Task.sleep(nanoseconds: 150_000_000)
+            guard !Task.isCancelled else { return }
+            let height = layout.headerHeight
+            // within the first header height the header still sits on the content
+            guard scrollOffset >= height, headerHide > 0, headerHide < height else { return }
+            withAnimation(.easeOut(duration: 0.2)) {
+                headerHide = headerHide > height / 2 ? height : 0
+            }
+        }
+    }
+
+    /// What the footer, tab bar or home indicator takes from the bottom of the window, gap included.
     private var bottomBarsHeight: CGFloat {
-        if footer != nil { return footerHeight + NavigationFooter.safeAreaBottom }
-        if duoTabBarInsets.sideBarReserve > 0 { return duoTabBarInsets.sideBarReserve - Spacing.XL }
-        return NavigationFooter.navigationBarInset
+        if footer != nil { return footerHeight + NavigationFooter.safeAreaBottom + Spacing.XL }
+        if duoTabBarInsets.sideBarReserve > 0 { return duoTabBarInsets.sideBarReserve }
+        return NavigationFooter.navigationBarInset + Spacing.XL
     }
 
     /// Keyboard frames are in screen coordinates; UIScreen stays on the outer display on iPhone Duo.
@@ -234,6 +270,7 @@ public struct StackScreen<Content: View>: View {
                 }
             }
             .ignoresSafeArea(.keyboard, edges: .bottom)
+            .onChange(of: scrollOffset) { updateHeaderHide($0) }
             .onPreferenceChange(HeaderRightWidthKey.self) { width in
                 if headerRightWidth != width { headerRightWidth = width }
             }
@@ -319,6 +356,7 @@ public struct StackScreen<Content: View>: View {
                         }
                         .edgesIgnoringSafeArea([.top, .horizontal])
                     )
+                    .offset(y: -headerHide)
                     .zIndex(100)
             }
         } else if headerTransparent && fullScreenContent {
@@ -342,7 +380,8 @@ public struct StackScreen<Content: View>: View {
                 DuoScrollGradient(
                     scrollOffset: scrollOffset,
                     headerHeight: layout.headerHeight,
-                    extended: headerType == .extended
+                    extended: headerType == .extended,
+                    followScroll: useQuickReturn
                 )
 
                 StackScreenContent(
@@ -360,6 +399,7 @@ public struct StackScreen<Content: View>: View {
                             .modifier(DuoBarMaterial(shape: Rectangle(), visible: scrollOffset > 0))
                             .edgesIgnoringSafeArea([.top, .horizontal])
                     )
+                    .offset(y: -headerHide)
                     .zIndex(100)
             }
         } else {
@@ -526,7 +566,7 @@ private struct SearchAnimatedHeader: View {
         let scroll = max(scrollOffset, 0)
 
         // Insets are measured from the safe-area top; collapsed, the search is centered in the bar row.
-        let rowTop = min(layout.headerStatusBarHeight - layout.insets.top, 0)
+        let rowTop = layout.headerStatusBarHeight - layout.insets.top
         let minTop = rowTop + (layout.headerBarHeight - headerHeight) / 2
         let maxTop = layout.headerHeight - layout.insets.top
         let minSide = Spacing.M

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/DuoTabDemo.swift

@@ -4,7 +4,8 @@
 //
 //  Mirrors RN `app/screens/IPhoneDuo/DuoTabUsage`: glass rail in the Duo side bar, floating
 //  glass bar when unfolded portrait. `useShortcut` gives the tallest side bar header, for the
-//  overlap review.
+//  overlap review; `compressTabBar` folds the tab bar instead of the toolbar when the side bar
+//  is short (HIG "Tab bar compressed").
 //
 
 import MoMoUIKits
@@ -15,10 +16,11 @@ private let history = (1...18).map { "Giao dịch #\($0)" }
 
 struct DuoTabDemo: View {
     let useShortcut: Bool
+    var compressTabBar = false
 
     var body: some View {
         if #available(iOS 16.0, *) {
-            DuoTabDemoContent(useShortcut: useShortcut)
+            DuoTabDemoContent(useShortcut: useShortcut, compressTabBar: compressTabBar)
         } else {
             Text("Requires iOS 16+").padding()
         }
@@ -28,6 +30,7 @@ struct DuoTabDemo: View {
 @available(iOS 16.0, *)
 private struct DuoTabDemoContent: View {
     let useShortcut: Bool
+    let compressTabBar: Bool
 
     var body: some View {
         BottomTab(
@@ -37,7 +40,8 @@ private struct DuoTabDemoContent: View {
                 tab("DuoHistory", label: "Lịch sử GD", icon: "time_clock_reset", title: "Lịch sử giao dịch", badge: "3"),
                 tab("DuoMe", label: "Tôi", icon: "basic_person", title: "Tôi"),
             ],
-            floatingButton: BottomTabFloatingButton(icon: "navigation_full_screen", label: "Quét mọi QR", onPress: {})
+            floatingButton: BottomTabFloatingButton(icon: "navigation_full_screen", label: "Quét mọi QR", onPress: {}),
+            compressionBehavior: compressTabBar ? .tabBar : .toolbar
         )
     }
 

package/ios-demo/Sources/MoMoUIKitsDemo/SampleDemos/IPhoneDuoDemo.swift

@@ -53,6 +53,9 @@ private struct IPhoneDuoDemoContent: View {
                 demoButton("Glass tab bar + useShortcut") {
                     navigator.push({ DuoTabDemo(useShortcut: true) }, options: tabOptions)
                 }
+                demoButton("Glass tab bar + compress tab bar") {
+                    navigator.push({ DuoTabDemo(useShortcut: true, compressTabBar: true) }, options: tabOptions)
+                }
                 demoButton("Bottom sheet: iPhone Duo safe area") {
                     navigator.showBottomSheet({ BottomSheetSafeArea() }, isSurface: true, header: .title("Safe area"))
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-duo.7-debug",
+  "version": "0.167.1-duo.8-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},