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

package/compose/build.gradle.kts

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

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

@@ -302,11 +302,12 @@ internal fun ColumnScope.MainContent(content: @Composable () -> Unit, isBottomTa
         Spacer(Modifier.height((HEADER_HEIGHT.dp - scrollDp).coerceIn(0.dp, HEADER_HEIGHT.dp)))
     }
     // a bottom tab root stays full width: the tab bar and each tab's own StackScreen handle the insets
+    val insetContent = !isBottomTabRoot
     Column(
         Modifier
             .fillMaxWidth()
             .weight(1f)
-            .conditional(!isBottomTabRoot) {
+            .conditional(insetContent && options.headerType !is HeaderType.Animated) {
                 horizontalSafeAreaPadding()
             }
             .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
@@ -324,19 +325,22 @@ internal fun ColumnScope.MainContent(content: @Composable () -> Unit, isBottomTa
                 }
             )
     ) {
-        CompositionLocalProvider(
-            LocalScreenLayout provides if (isBottomTabRoot) screenLayout else screenLayout.consumeHorizontalInsets()
-        ) {
-            ScreenContent(content = content)
-        }
+        ScreenContent(content = content, insetContent = insetContent)
     }
 
 }
 
 @Composable
-internal fun ScreenContent(content: @Composable () -> Unit) {
+internal fun ScreenContent(content: @Composable () -> Unit, insetContent: Boolean) {
     val scrollState = LocalScrollState.current
     val options = LocalOptions.current
+    val screenLayout = getScreenLayout()
+    val insetBody: @Composable () -> Unit = {
+        CompositionLocalProvider(
+            LocalScreenLayout provides if (insetContent) screenLayout.consumeHorizontalInsets() else screenLayout,
+            content = content,
+        )
+    }
 
     if (options.headerType is HeaderType.Animated) {
         val animatedHeader = options.headerType
@@ -347,12 +351,16 @@ internal fun ScreenContent(content: @Composable () -> Unit) {
             Box(bannerModifier) {
                 animatedHeader.composable.invoke(scrollState.value)
             }
-            Box(Modifier.padding(top = getScreenLayout().headerHeight + animatedHeader.layoutOffSet)) {
-                content()
+            Box(
+                Modifier
+                    .padding(top = screenLayout.headerHeight + animatedHeader.layoutOffSet)
+                    .conditional(insetContent) { horizontalSafeAreaPadding() }
+            ) {
+                insetBody()
             }
         }
     } else {
-        content()
+        insetBody()
     }
 }
 

package/package.json

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