@momo-kits/native-kits 0.152.4-beta.7 → 0.152.4-beta.8

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt

@@ -335,15 +335,18 @@ val LocalScreenHelper = staticCompositionLocalOf<ScreenHelper> {
 fun ScreenSnackBarHost(footerHeightPx: Int) {
     val helper = LocalScreenHelper.current
     val snackBarData = helper.snackBarState ?: return
+    val density = LocalDensity.current
 
-
-    val snackBarHeight = when (snackBarData.type) {
-        is SnackBar.Custom -> snackBarData.type.heightContent
-        is SnackBar.Toast -> 300f
+    val footerHeight = if (footerHeightPx > 0) {
+        with(LocalDensity.current) {
+            footerHeightPx.toDp()
+        }
+    } else {
+        min(AppNavigationBar.current, 21.dp)
     }
 
-    val startPosition = if (footerHeightPx > 0) 0f else snackBarHeight
-    val targetPosition = if (footerHeightPx > 0) -footerHeightPx.toFloat() else -with(LocalDensity.current) { AppNavigationBar.current.toPx() }
+    val startPosition = with(density) {200.dp.toPx()}
+    val targetPosition = 0f
 
     val offsetY = remember { Animatable(startPosition) }
 
@@ -375,6 +378,7 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
     Box(
         modifier = Modifier
             .offset { IntOffset(0, offsetY.value.toInt()) }
+            .padding(bottom = footerHeight)
             .fillMaxWidth()
     ) {
         when (val type = snackBarData.type) {

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

@@ -21,7 +21,6 @@ import androidx.compose.ui.unit.min
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.Spacing
 import vn.momo.kits.navigation.LocalFooterHeightPx
 import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.LocalOptions
@@ -30,7 +29,6 @@ import vn.momo.kits.navigation.OverplayComponentRegistry
 sealed class SnackBar(open val duration: Long? = null) {
     data class Custom(
         val content: @Composable () -> Unit,
-        val heightContent: Float = 300f,
         override val duration: Long? = 3000L
     ) : SnackBar(duration)
 
@@ -46,27 +44,26 @@ fun SnackBar(
 ) {
     val navigator = LocalNavigator.current
     val options = LocalOptions.current
+    val density = LocalDensity.current
     val footerHeightPxState = LocalFooterHeightPx.current
-
-    val snackBarHeight = when (data) {
-        is SnackBar.Custom -> -data.heightContent
-        is SnackBar.Toast -> -300f
-    }
-
-    val startPosition = if (options.footerComponent != null) 0f else -snackBarHeight
-    val targetPosition = if (options.footerComponent != null) {
-        footerHeightPxState.intValue.toFloat()
+    val footerHeight = if (options.footerComponent != null) {
+        with(LocalDensity.current) {
+            footerHeightPxState.value.toDp()
+        }
     } else {
-        with(LocalDensity.current) { min(AppNavigationBar.current, 21.dp).toPx() }
+        min(AppNavigationBar.current, 21.dp)
     }
 
+    val startPosition = with(density) {200.dp.toPx()}
+    val targetPosition = 0f
+
     val offsetY by remember { mutableStateOf(Animatable(startPosition)) }
     val coroutineScope = rememberCoroutineScope()
 
     suspend fun openEvent() {
         offsetY.snapTo(startPosition)
         offsetY.animateTo(
-            targetValue = -targetPosition,
+            targetValue = targetPosition,
             animationSpec = tween(
                 durationMillis = 350,
             )
@@ -109,7 +106,7 @@ fun SnackBar(
     Box(
         modifier = Modifier
             .offset { IntOffset(0, offsetY.value.toInt()) }
-            .padding(bottom = Spacing.S)
+            .padding(bottom = footerHeight)
             .fillMaxWidth()
     ) {
         when (data) {
@@ -117,7 +114,4 @@ fun SnackBar(
             is SnackBar.Toast -> {}
         }
     }
-}
-
-
-
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.152.4-beta.7",
+  "version": "0.152.4-beta.8",
   "private": false,
   "dependencies": {
     "@momo-platform/native-max-api": "1.0.18"