@momo-kits/native-kits 0.167.1-duo-search.3-debug → 0.167.1-duo-search.22-debug

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Theme.kt

@@ -67,7 +67,7 @@ data class Theme(
         return !assets.headerBackground.isNullOrEmpty()
     }
 }
-val defaultTheme = Theme(
+private val lightBaseTheme = Theme(
     dark = false,
     colors = ColorScheme(
         primary = Colors.pink_03,
@@ -117,14 +117,14 @@ val defaultTheme = Theme(
             container = Colors.blue_08
         )
     ),
-    font = "MomoTrustSans",
+    font = "SFProText",
     assets = ThemeAssets(
         headerBackground = null
     )
 )
 
 
-val darkTheme = Theme(
+private val darkBaseTheme = Theme(
     dark = true,
     colors = ColorScheme(
         primary = Colors.pink_04,
@@ -174,13 +174,19 @@ val darkTheme = Theme(
             container = Colors.blue_08
         )
     ),
-    font = "MomoTrustSans",
+    font = "SFProText",
     assets = ThemeAssets(
         headerBackground = null
     )
 )
 
 
+val defaultTheme: Theme
+    get() = lightBaseTheme.copy(font = defaultFontFamily)
+
+val darkTheme: Theme
+    get() = darkBaseTheme.copy(font = defaultFontFamily)
+
 val AppTheme = staticCompositionLocalOf { defaultTheme }
 
 val AppStatusBar = staticCompositionLocalOf { 0.dp }

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -121,31 +121,17 @@ private val hostFontFiles: Map<String, String> = mapOf(
     )
 }
 
-/**
- * Font mặc định mới, chỉ áp cho user nằm trong whitelist design system ([KitDesignSystem]).
- * Ngoài whitelist thì quay về [LEGACY_DEFAULT_FONT_FAMILY] như trước.
- */
 private const val NEW_DEFAULT_FONT_FAMILY = "MomoTrustSans"
 private const val LEGACY_DEFAULT_FONT_FAMILY = "SFProText"
 
-/**
- * Font thuoc bo design system moi. MoMoTrustDisplay chi duoc header dung tu DS-791
- * (commit header title 5bfde6251); truoc do header lay font theo theme, nen ngoai
- * whitelist ca hai deu ha ve [LEGACY_DEFAULT_FONT_FAMILY].
- */
-private val newFontFamilies = setOf(NEW_DEFAULT_FONT_FAMILY, "MoMoTrustDisplay")
+internal val defaultFontFamily: String
+    get() = if (KitDesignSystem.isWhiteList) NEW_DEFAULT_FONT_FAMILY else LEGACY_DEFAULT_FONT_FAMILY
 
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
     val isWhiteList = KitDesignSystem.isWhiteList
-    val resolvedFamily =
-        if (fontFamily in newFontFamilies && !isWhiteList) {
-            LEGACY_DEFAULT_FONT_FAMILY
-        } else {
-            fontFamily
-        }
     val defaultFile = if (isWhiteList) NEW_DEFAULT_FONT_FILE else LEGACY_DEFAULT_FONT_FILE
-    val key = "$resolvedFamily-${fontWeight?.weight}"
+    val key = "$fontFamily-${fontWeight?.weight}"
     val fileName = hostFontFiles[key] ?: defaultFile
     return hostFontFamily(fileName)
         ?: hostFontFamily(defaultFile)

package/compose/src/commonMain/kotlin/vn/momo/kits/layout/ScreenLayout.kt

@@ -32,6 +32,10 @@ data class SideBarLayout(
     val bottom: Dp,
 )
 
+// Room the header row keeps from each side for the status bar clock and battery clusters.
+@Immutable
+data class StatusBarClearance(val left: Dp, val right: Dp)
+
 @Immutable
 data class ScreenLayout(
     val width: Dp,
@@ -53,6 +57,8 @@ data class ScreenLayout(
     // Portrait iPhone Duo puts the status bar in the side strip, about twice as tall as the strip is wide.
     // Stored so it survives consumeHorizontalInsets().
     val duoTopInset: Dp = insetTop,
+    // iPhone Duo inner display in portrait: the header row shares the status bar band, between its clusters.
+    val statusBarClearance: StatusBarClearance? = null,
 ) {
     val headerBarHeight: Dp get() = headerHeight - headerStatusBarHeight
 }
@@ -76,6 +82,10 @@ internal object DuoMetrics {
     // Outer display in landscape has no status bar in the strip: controls keep this far from
     // both ends unless a reserved region (the camera at either end) asks for more.
     val edgeInset = 24.dp
+    // Inner display in portrait: the clock and connectivity cluster sits at the top right corner
+    // (x 550–643 of 669, clock digits centered on y 47); its reserved region is taller than the glyphs.
+    val innerStatusBarCenterY = 47.dp
+    val innerStatusBarWidth = 120.dp
 }
 
 // Widest short side of any single-display iPhone.
@@ -97,9 +107,19 @@ fun getScreenLayout(): ScreenLayout =
 internal fun calculateScreenLayout(topInset: Dp, parent: ScreenLayout? = null): ScreenLayout {
     val isPhone = isPhoneIdiom()
     if (parent != null) {
-        val (headerHeight, headerStatusBarHeight) =
-            headerGeometry(topInset, isPhone, parent.width, parent.height, parent.sideBar != null)
-        return parent.copy(headerHeight = headerHeight, headerStatusBarHeight = headerStatusBarHeight)
+        // the parent's row center reproduces its own centered geometry
+        val titleCenterY = parent.headerStatusBarHeight + parent.headerBarHeight / 2
+        val statusBarClearance = parent.statusBarClearance?.takeIf { topInset >= STATUS_BAR_MIN_INSET }
+        val (headerHeight, headerStatusBarHeight) = if (statusBarClearance != null) {
+            statusBarRowGeometry()
+        } else {
+            headerGeometry(topInset, isPhone, parent.width, parent.height, parent.sideBar != null, titleCenterY)
+        }
+        return parent.copy(
+            headerHeight = headerHeight,
+            headerStatusBarHeight = headerStatusBarHeight,
+            statusBarClearance = statusBarClearance,
+        )
     }
 
     val density = LocalDensity.current
@@ -139,32 +159,72 @@ internal fun calculateScreenLayout(topInset: Dp, parent: ScreenLayout? = null):
 internal fun ScreenLayout.consumeHorizontalInsets(): ScreenLayout =
     copy(width = contentWidth, insetLeft = 0.dp, insetRight = 0.dp, sideBar = null)
 
-private fun headerGeometry(topInset: Dp, isPhone: Boolean, width: Dp, height: Dp, hasSideBar: Boolean): Pair<Dp, Dp> {
+// titleCenterY: window y the title row centers on for the outer display in landscape.
+private fun headerGeometry(
+    topInset: Dp,
+    isPhone: Boolean,
+    width: Dp,
+    height: Dp,
+    hasSideBar: Boolean,
+    titleCenterY: Dp,
+): Pair<Dp, Dp> {
     val headerHeight = topInset + HEADER_HEIGHT.dp
     if (!isPhone) return headerHeight to topInset
-    if (hasSideBar && topInset < STATUS_BAR_MIN_INSET && height > width && width < DuoMetrics.innerMinHeight) {
-        // outer display: the row starts below the top so the title centers on the camera
-        return DuoMetrics.outerHeaderHeight to DuoMetrics.outerCameraCenterY * 2 - DuoMetrics.outerHeaderHeight
+    if (hasSideBar && topInset < STATUS_BAR_MIN_INSET) {
+        if (height > width && width < DuoMetrics.innerMinHeight) {
+            // outer display: the row starts below the top so the title centers on the camera
+            return DuoMetrics.outerHeaderHeight to DuoMetrics.outerCameraCenterY * 2 - DuoMetrics.outerHeaderHeight
+        }
+        if (width > height && height < DuoMetrics.innerMinHeight) {
+            // reaches 8pt below a side bar control centered on the row
+            val centered = maxOf(IPHONE_HEADER_MIN_HEIGHT, titleCenterY + DuoMetrics.controlSize / 2 + Spacing.S)
+            return centered to maxOf(0.dp, titleCenterY * 2 - centered)
+        }
     }
     return maxOf(headerHeight, IPHONE_HEADER_MIN_HEIGHT) to if (topInset < STATUS_BAR_MIN_INSET) 0.dp else topInset
 }
 
-private data class StripOcclusion(val top: Dp, val bottom: Dp)
+// Centered on the clock digits; the cluster's region center sits above them.
+private fun statusBarRowGeometry(): Pair<Dp, Dp> = DuoMetrics.innerStatusBarCenterY * 2 to 0.dp
+
+private data class StripOcclusion(val top: Dp, val topCenter: Dp, val bottom: Dp)
 
 // How far system regions reach into a side strip from its top and from its bottom end
-// (e.g. the camera, which sits at either end depending on the rotation).
+// (e.g. the camera, which sits at either end depending on the rotation), and the center y
+// of the region reaching furthest from the top.
 private fun stripOcclusion(regions: List<ReservedRegion>, stripLeft: Dp, stripRight: Dp, windowHeight: Dp): StripOcclusion {
     var top = 0.dp
+    var topCenter = 0.dp
     var bottom = 0.dp
     regions.forEach { region ->
         if (region.x >= stripRight || region.x + region.width <= stripLeft) return@forEach
-        if (region.y + region.height / 2 < windowHeight / 2) {
-            top = maxOf(top, region.y + region.height)
+        val centerY = region.y + region.height / 2
+        if (centerY < windowHeight / 2) {
+            if (region.y + region.height > top) {
+                top = region.y + region.height
+                topCenter = centerY
+            }
         } else {
             bottom = maxOf(bottom, windowHeight - region.y)
         }
     }
-    return StripOcclusion(top, bottom)
+    return StripOcclusion(top, topCenter, bottom)
+}
+
+// How far the clock and battery clusters of a status bar on the top edge reach in from each side;
+// null without reserved regions there.
+private fun statusBarClusters(regions: List<ReservedRegion>, windowWidth: Dp, topInset: Dp): StatusBarClearance? {
+    val midX = windowWidth / 2
+    val clusters = regions.filter {
+        it.y < topInset && it.y + it.height <= topInset && (it.x + it.width <= midX || it.x >= midX)
+    }
+    if (clusters.isEmpty()) return null
+    var left = 0.dp
+    var right = 0.dp
+    clusters.forEach {
+        if (it.x < midX) left = maxOf(left, it.x + it.width) else right = maxOf(right, windowWidth - it.x)
+    }
+    return StatusBarClearance(left, right)
 }
 
 // Slab iPhones report equal side insets in landscape; iPhone Duo moves the status bar to one side.
@@ -187,24 +247,36 @@ private fun screenLayoutOf(
     reservedRegions: List<ReservedRegion>,
 ): ScreenLayout {
     val isIPhoneDuo = isPhone && isIPhoneDuoWindow(width, height, asymmetricInsets)
+    val isInnerPortrait = height > width && width >= DuoMetrics.innerMinHeight
+    val statusBarClearance = if (isIPhoneDuo && isInnerPortrait && topInset >= STATUS_BAR_MIN_INSET) {
+        statusBarClusters(reservedRegions, width, topInset)
+            ?: StatusBarClearance(left = 0.dp, right = DuoMetrics.innerStatusBarWidth + Spacing.S)
+    } else {
+        null
+    }
 
     var sideBar: SideBarLayout? = null
+    var titleCenterY = 0.dp
     val sideInset = maxOf(insetLeft, insetRight)
     // narrower strips cannot host a control 12pt from the inner edge
     if (isIPhoneDuo && sideInset >= DuoMetrics.controlSize + Spacing.M) {
+        val edge = if (insetRight >= insetLeft) SideBarEdge.RIGHT else SideBarEdge.LEFT
+        val stripLeft = if (edge == SideBarEdge.RIGHT) width - sideInset else 0.dp
+        // clear of the camera and of the status bar cluster, which grows for calls and Live
+        // Activities; region frames already include the system's margin
+        val occlusion = stripOcclusion(reservedRegions, stripLeft, stripLeft + sideInset, height)
         // UIKit reports no usable status bar frame here (a 2pt top strip), so the spot is inferred like RN
         val top = when {
+            statusBarClearance != null -> statusBarRowGeometry().first + Spacing.M
             topInset >= STATUS_BAR_MIN_INSET -> topInset + HEADER_HEIGHT.dp + Spacing.M
             width <= height -> DuoMetrics.firstItemTop
             height >= DuoMetrics.innerMinHeight -> DuoMetrics.firstItemTopLandscape
             // outer display in landscape: no status bar in the strip
             else -> DuoMetrics.edgeInset
         }
-        val edge = if (insetRight >= insetLeft) SideBarEdge.RIGHT else SideBarEdge.LEFT
-        val stripLeft = if (edge == SideBarEdge.RIGHT) width - sideInset else 0.dp
-        // clear of the camera and of the status bar cluster, which grows for calls and Live
-        // Activities; region frames already include the system's margin
-        val occlusion = stripOcclusion(reservedRegions, stripLeft, stripLeft + sideInset, height)
+        // outer display in landscape: the title row centers on the camera when it sits at the
+        // top end, otherwise on the back button
+        titleCenterY = if (occlusion.top > top) occlusion.topCenter else top + DuoMetrics.controlSize / 2
         sideBar = SideBarLayout(
             edge = edge,
             width = sideInset,
@@ -212,7 +284,11 @@ private fun screenLayoutOf(
             bottom = maxOf(DuoMetrics.edgeInset, occlusion.bottom),
         )
     }
-    val (headerHeight, headerStatusBarHeight) = headerGeometry(topInset, isPhone, width, height, sideBar != null)
+    val (headerHeight, headerStatusBarHeight) = if (statusBarClearance != null) {
+        statusBarRowGeometry()
+    } else {
+        headerGeometry(topInset, isPhone, width, height, sideBar != null, titleCenterY)
+    }
 
     return ScreenLayout(
         width = width,
@@ -228,5 +304,6 @@ private fun screenLayoutOf(
         sideBar = sideBar,
         isIPhoneDuoDevice = isDuoDevice,
         duoTopInset = maxOf(topInset, if (height > width) sideInset * 2 else 0.dp),
+        statusBarClearance = statusBarClearance,
     )
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigation.kt

@@ -30,6 +30,9 @@ class Navigation(
         headerType: HeaderType? = null,
         scrollData: ScrollData? = null,
         backgroundColor: Color? = null,
+        // AI-GENERATED START: custom screen background
+        backgroundComponent: (@Composable () -> Unit)? = null,
+        // AI-GENERATED END: custom screen background
         tintColor: Color? = null,
         footerComponent: (@Composable () -> Unit)? = null,
         footerTransparent: Boolean? = null,
@@ -48,6 +51,9 @@ class Navigation(
                 headerType = headerType ?: options.headerType,
                 scrollData = scrollData ?: options.scrollData,
                 backgroundColor = backgroundColor ?: options.backgroundColor,
+                // AI-GENERATED START: custom screen background
+                backgroundComponent = backgroundComponent ?: options.backgroundComponent,
+                // AI-GENERATED END: custom screen background
                 tintColor = tintColor ?: options.tintColor,
                 footerComponent = footerComponent ?: options.footerComponent,
                 footerTransparent = footerTransparent ?: options.footerTransparent,
@@ -85,6 +91,10 @@ data class NavigationOptions(
     val headerType: HeaderType = HeaderType.Default(),
     val scrollData: ScrollData = ScrollData(),
     val backgroundColor: Color? = null,
+    // AI-GENERATED START: custom screen background (SwiftUI `NavigationOptions.background`)
+    /** Drawn instead of `backgroundColor` over the whole screen: under the header, outside the keyboard padding. */
+    val backgroundComponent: @Composable (() -> Unit)? = null,
+    // AI-GENERATED END: custom screen background (SwiftUI `NavigationOptions.background`)
     val tintColor: Color? = null,
     val footerComponent: @Composable (() -> Unit)? = null,
     val footerTransparent: Boolean = false,

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt

@@ -55,6 +55,12 @@ class Navigator(
     }
 
     fun onBackSafe(callBack: (() -> Unit)? = null) {
+        // An open modal or bottom sheet takes the back first, as its BackHandler does for gestures.
+        val overplayType = OverplayComponentRegistry.getOverplayType()
+        if (overplayType != null && overplayType != OverplayComponentType.SNACK_BAR) {
+            pop(1, callBack)
+            return
+        }
         tabBackHandler?.let {
             it()
             return

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt

@@ -83,6 +83,7 @@ import vn.momo.kits.utils.horizontalSafeAreaPadding
 import vn.momo.kits.layout.LocalScreenLayout
 import vn.momo.kits.layout.ScreenLayout
 import vn.momo.kits.layout.consumeHorizontalInsets
+import vn.momo.kits.layout.DuoMetrics
 import vn.momo.kits.layout.getScreenLayout
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.milliseconds
@@ -213,48 +214,62 @@ internal fun StackScreen(
         LocalFooterHeightPx provides footerHeightPx,
         LocalHeaderRightWidthPx provides headerRightWidthPx
     ) {
-        Box(
-            Modifier
-                .fillMaxSize()
-                .background(options.backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
-                    hideKeyboardOnTap()
+        // AI-GENERATED START: custom screen background, full window and outside the keyboard padding
+        Box(Modifier.fillMaxSize()) {
+            options.backgroundComponent?.let { background ->
+                Box(Modifier.fillMaxSize()) { background() }
+            }
+            // AI-GENERATED END: custom screen background, full window and outside the keyboard padding
+            Box(
+                Modifier
+                    .fillMaxSize()
+                    // AI-GENERATED START: custom background replaces the colour
+                    .background(
+                        if (options.backgroundComponent != null) Color.Transparent
+                        else options.backgroundColor ?: AppTheme.current.colors.background.default
+                    )
+                    // AI-GENERATED END: custom background replaces the colour
+                    .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
+                        hideKeyboardOnTap()
+                    }
+                    .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
+                        imePadding()
+                    }
+            ) {
+                Box(Modifier.zIndex(1f)) {
+                    HeaderBackground()
                 }
-                .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
-                    imePadding()
+
+                Box(Modifier.zIndex(4f).graphicsLayer { translationY = -headerHide.value }) {
+                    Header(onBackHandler)
                 }
-        ) {
-            Box(Modifier.zIndex(1f)) {
-                HeaderBackground()
-            }
 
-            Box(Modifier.zIndex(4f).graphicsLayer { translationY = -headerHide.value }) {
-                Header(onBackHandler)
-            }
+                HeaderSideBar(
+                    bottomInset = maxOf(
+                        bottomBarsHeight(isBottomTabChild) + Spacing.XL,
+                        if (isBottomTabChild) LocalDuoRailReserve.current else 0.dp,
+                    ),
+                    modifier = Modifier.zIndex(4f),
+                )
 
-            HeaderSideBar(
-                bottomInset = maxOf(
-                    bottomBarsHeight(isBottomTabChild) + Spacing.XL,
-                    if (isBottomTabChild) LocalDuoRailReserve.current else 0.dp,
-                ),
-                modifier = Modifier.zIndex(4f),
-            )
+                Column(Modifier.zIndex(5f).horizontalSafeAreaPadding()) {
+                    SearchAnimated(snapState = snapState)
+                }
 
-            Column(Modifier.zIndex(5f).horizontalSafeAreaPadding()) {
-                SearchAnimated(snapState = snapState)
-            }
+                Column(Modifier.zIndex(2f).fillMaxSize()) {
+                    MainContent(content = content, isBottomTabRoot = isBottomTabRoot, isBottomTabChild = isBottomTabChild)
+                    FooterContent()
+                }
 
-            Column(Modifier.zIndex(2f).fillMaxSize()) {
-                MainContent(content = content, isBottomTabRoot = isBottomTabRoot, isBottomTabChild = isBottomTabChild)
-                FooterContent()
-            }
+                Box(Modifier.zIndex(6f).horizontalSafeAreaPadding()) {
+                    FloatingContent(isBottomTabChild = isBottomTabChild)
+                }
 
-            Box(Modifier.zIndex(6f).horizontalSafeAreaPadding()) {
-                FloatingContent(isBottomTabChild = isBottomTabChild)
+                OverplayView(isBottomTabChild = isBottomTabChild, id = id)
             }
-
-            OverplayView(isBottomTabChild = isBottomTabChild, id = id)
+        // AI-GENERATED START: custom screen background, full window and outside the keyboard padding
         }
+        // AI-GENERATED END: custom screen background, full window and outside the keyboard padding
     }
 }
 
@@ -431,9 +446,10 @@ fun Footer(
 
     val backgroundColor = if (transparent) Color.Transparent else AppTheme.current.colors.background.surface
 
+    // inset as a whole, not padded inside, so the surface and its shadow stay off the iPhone Duo side bar
     Box(Modifier.onGloballyPositioned {
         if (footerHeightPx.intValue != it.size.height) footerHeightPx.intValue = it.size.height
-    }) {
+    }.horizontalSafeAreaPadding()) {
         Box(
             Modifier
                 .fillMaxWidth()
@@ -441,7 +457,6 @@ fun Footer(
                 .conditional(IsShowBaseLineDebug) {
                     border(1.dp, Colors.blue_03)
                 }
-                .horizontalSafeAreaPadding()
                 .padding(
                     top = if (useMargin) Spacing.S else 0.dp,
                     start = if (useMargin) Spacing.M else 0.dp,
@@ -494,10 +509,14 @@ internal fun SearchAnimated(
     // collapsed, the search is centered in the bar row
     val minTopPadding = screenLayout.headerStatusBarHeight + (screenLayout.headerBarHeight - HEADER_HEIGHT.dp) / 2
     val maxTopPadding = screenLayout.headerHeight
+    // collapsed on the iPhone Duo status bar row, the search stays between its clusters (48pt back there)
+    val clearance = screenLayout.statusBarClearance
+    val backWidth = if (clearance != null && !useSideBar) DuoMetrics.controlSize else 28.dp
     val minStartPadding = Spacing.M
-    val maxStartPadding = if (options.hiddenBack || useSideBar) Spacing.M else 48.dp // button back: size + left +right = 28 + 12 + 8 = 48
+    val maxStartPadding = (clearance?.left ?: 0.dp) +
+        if (options.hiddenBack || useSideBar) Spacing.M else backWidth + Spacing.M + Spacing.S
     val minEndPadding = Spacing.M
-    val maxEndPadding = when {
+    val maxEndPadding = (clearance?.right ?: 0.dp) + when {
         options.headerRight is HeaderRight.None -> Spacing.M
         useSideBar && options.headerRight is HeaderRight.Toolkit -> Spacing.M
         else -> headerRightWidthDp + Spacing.M * 2

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/bottomtab/BottomTab.kt

@@ -28,6 +28,7 @@ import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.NavigationOptions
 import vn.momo.kits.navigation.StackScreen
 import vn.momo.kits.navigation.component.HeaderType
+import vn.momo.kits.platform.BackHandler
 import vn.momo.kits.platform.reportFloatingArrowBack
 import vn.momo.kits.layout.getScreenLayout
 
@@ -50,10 +51,16 @@ fun BottomTab(
     // iPhone Duo: when the side bar can't hold both bars, which one starts compressed;
     // tapping the compressed one swaps them
     compressionBehavior: DuoBarCompressionBehavior = DuoBarCompressionBehavior.TOOLBAR,
+    initialRouteName: String? = null,
+    onTabPress: ((index: Int, switchTab: () -> Unit) -> Unit)? = null,
+    backToInitialTab: Boolean = true,
 ) {
     val navigation = LocalNavigation.current
     val navigator = LocalNavigator.current
     val navController = rememberNavController()
+    val startRoute = remember {
+        "option${items.indexOfFirst { it.name == initialRouteName }.coerceAtLeast(0)}"
+    }
 
     // Only on new items: this recomposes on every tab switch and would drop options a tab set at runtime.
     remember(items) {
@@ -68,15 +75,14 @@ fun BottomTab(
         )
     }
 
-    // Tab 0 keeps the seeked transition; other tabs go to the host's floating arrow. Matches RN.
     val currentRoute = navController.currentBackStackEntryAsState().value?.destination?.route
-    val isFirstTab = currentRoute == null || currentRoute == "option0"
+    val onStartTab = currentRoute == null || currentRoute == startRoute
+    val isFirstTab = onStartTab || !backToInitialTab
+    val backToStartTab = { navController.popBackStack(startRoute, inclusive = false) }
 
     DisposableEffect(isFirstTab) {
         reportFloatingArrowBack(!isFirstTab)
-        navigator.tabBackHandler = if (isFirstTab) null else ({
-            navController.popBackStack(navController.graph.startDestinationRoute!!, false)
-        })
+        navigator.tabBackHandler = if (isFirstTab) null else ({ backToStartTab() })
         // both live outside this composition
         onDispose {
             reportFloatingArrowBack(false)
@@ -90,16 +96,19 @@ fun BottomTab(
     val railReserve = layout.sideBar?.takeIf { layout.isIPhoneDuo }?.let {
         it.bottom + duoRailHeight(items.size, hasQr, compressed = compression.tabBarCompressed) + DUO_GROUP_GAP
     } ?: 0.dp
-    val onTabSelected: (Int) -> Unit = {
-        val targetRoute = "option$it"
-        if (currentRoute != targetRoute) {
-            // one entry per tab above the first, so switching never grows the back stack
-            navController.navigate(targetRoute) {
-                popUpTo("option0") { saveState = true }
-                launchSingleTop = true
-                restoreState = true
+    val onTabSelected: (Int) -> Unit = { index ->
+        val switchTab = {
+            val targetRoute = "option$index"
+            if (navController.currentBackStackEntry?.destination?.route != targetRoute) {
+                // one entry per tab above the start tab, so switching never grows the back stack
+                navController.navigate(targetRoute) {
+                    popUpTo(startRoute) { saveState = true }
+                    launchSingleTop = true
+                    restoreState = true
+                }
             }
         }
+        onTabPress?.invoke(index, switchTab) ?: switchTab()
     }
 
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
@@ -112,7 +121,7 @@ fun BottomTab(
             ) {
                 NavHost(
                     navController = navController,
-                    startDestination = "option0"
+                    startDestination = startRoute
                 ) {
                     items.forEachIndexed { index, item ->
                         composable(
@@ -153,11 +162,8 @@ fun BottomTab(
                                 navigationOptions = option,
                                 bottomTabIndex = index,
                                 onBackHandler = {
-                                    if (index != 0) {
-                                        navController.popBackStack(
-                                            navController.graph.startDestinationRoute!!,
-                                            inclusive = false
-                                        )
+                                    if (backToInitialTab && "option$index" != startRoute) {
+                                        backToStartTab()
                                     } else {
                                         navigator.pop()
                                     }
@@ -168,6 +174,9 @@ fun BottomTab(
                 }
             }
         }
+        BackHandler(enabled = !onStartTab) {
+            if (backToInitialTab) backToStartTab() else navigator.pop()
+        }
         if (layout.isIPhoneDuo) {
             DuoTabBar(
                 layout = layout,