@momo-kits/native-kits 0.162.14-debug → 0.162.15-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.14-debug"
+        version = "0.162.15-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.163.1-beta.1'
+    spec.version                  = '0.162.1-beta.4'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -16,6 +16,10 @@ class Navigation(
     val currentOptions: State<NavigationOptions> get() = _options
     val options: NavigationOptions get() = _options.value
 
+    private val _isBottomTabRoot = mutableStateOf(false)
+    internal val isBottomTabRoot: Boolean get() = _isBottomTabRoot.value
+    internal fun markAsBottomTabRoot() { _isBottomTabRoot.value = true }
+
     fun setOptions(
         onBackHandler: (() -> Unit)? = null,
         hiddenBack: Boolean? = null,

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

@@ -96,6 +96,8 @@ internal fun StackScreen(
     val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions, registry = screenRegistry) }
 
     val options by navigation.currentOptions
+    val isBottomTabChild = bottomTabIndex != -1
+    val isBottomTabRoot = navigation.isBottomTabRoot
 
     // Auto tracking state
     val trackingState = remember {
@@ -193,7 +195,7 @@ internal fun StackScreen(
             }
 
             Column(Modifier.zIndex(2f).fillMaxSize()) {
-                MainContent(content = content)
+                MainContent(content = content, isBottomTab = isBottomTabRoot)
                 FooterContent()
             }
 
@@ -201,7 +203,7 @@ internal fun StackScreen(
                 FloatingContent()
             }
 
-            OverplayView(bottomTabIndex = bottomTabIndex, id = id)
+            OverplayView(isBottomTabChild = isBottomTabChild, id = id)
         }
     }
 }
@@ -213,10 +215,11 @@ internal fun FloatingContent() {
     val density = LocalDensity.current
     val footerHeightPx = LocalFooterHeightPx.current
     val scrollState = LocalScrollState.current
+    val navigationBar = AppNavigationBar.current
 
     val fabProps = options.floatingButtonProps ?: return
     val bottomPadding = fabProps.bottom
-        ?: (Spacing.M + if (options.footerComponent != null) with(density) { footerHeightPx.intValue.toDp() } else 0.dp)
+        ?: (Spacing.M + if (options.footerComponent != null) with(density) { footerHeightPx.intValue.toDp() } else navigationBar)
 
     FloatingButton(
         scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
@@ -232,11 +235,12 @@ internal fun FloatingContent() {
 }
 
 @Composable
-internal fun ColumnScope.MainContent(content: @Composable () -> Unit) {
+internal fun ColumnScope.MainContent(content: @Composable () -> Unit, isBottomTab: Boolean) {
     val options = LocalOptions.current
     val inputSearchType = getInputSearchType(options)
     val density = LocalDensity.current
     val scrollState = LocalScrollState.current
+    val navigationBar = AppNavigationBar.current
 
     Spacer(
         Modifier.height(
@@ -260,6 +264,7 @@ internal fun ColumnScope.MainContent(content: @Composable () -> Unit) {
             .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
                 verticalScroll(scrollState)
             }
+            .padding(bottom = if (options.footerComponent != null || isBottomTab) 0.dp else navigationBar)
     ) {
         ScreenContent(content = content)
     }
@@ -303,12 +308,12 @@ internal fun keyboardSizeState(): State<Dp> {
 }
 
 @Composable
-internal fun OverplayView(bottomTabIndex: Int, id: Int) {
+internal fun OverplayView(isBottomTabChild: Boolean, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
         Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 7f).fillMaxSize()) {
-            if (bottomTabIndex != -1) return@Box
+            if (isBottomTabChild) return@Box
             if (OverplayComponentRegistry.currentRootId() != id) return@Box
             OverplayComponentRegistry.OverlayComponent()
         }

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

@@ -44,8 +44,6 @@ fun BottomTab(
     val navigation = LocalNavigation.current
     val navigator = LocalNavigator.current
     val navController = rememberNavController()
-    val keyboardBottomPadding = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
-    val shouldShowBottomTab = keyboardBottomPadding == 0.dp
 
     bottomTabOptionItems = items.mapIndexed { index, item ->
         item.options ?: NavigationOptions()
@@ -53,6 +51,7 @@ fun BottomTab(
 
 
     LaunchedEffect(Unit){
+        navigation.markAsBottomTabRoot()
         navigation.setOptions(
             headerType = HeaderType.None
         )
@@ -61,13 +60,6 @@ fun BottomTab(
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
         Box(modifier = Modifier
             .fillMaxSize()
-            .padding(
-                bottom = if (shouldShowBottomTab) {
-                    BOTTOM_TAB_BAR_HEIGHT.dp + AppNavigationBar.current
-                } else {
-                    0.dp
-                }
-            )
         ) {
             NavHost(
                 navController = navController,
@@ -126,22 +118,20 @@ fun BottomTab(
                 }
             }
         }
-        if (shouldShowBottomTab) {
-            Column {
-                BottomTabBar(
-                    items = items,
-                    floatingButton = floatingButton,
-                    navController = navController,
-                    onTabSelected = {
-                        val currentRoute = navController.currentBackStackEntry?.destination?.route
-                        val targetRoute = "option$it"
-                        if (currentRoute != targetRoute) {
-                            navController.navigate(targetRoute)
-                        }
+        Column {
+            BottomTabBar(
+                items = items,
+                floatingButton = floatingButton,
+                navController = navController,
+                onTabSelected = {
+                    val currentRoute = navController.currentBackStackEntry?.destination?.route
+                    val targetRoute = "option$it"
+                    if (currentRoute != targetRoute) {
+                        navController.navigate(targetRoute)
                     }
-                )
-                Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
-            }
+                }
+            )
+            Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
         }
     }
 }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.14
+version=0.162.15
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.14-debug",
+  "version": "0.162.15-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},