@momo-kits/native-kits 0.150.1-beta.2 → 0.150.1-beta.3

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Chip.kt

@@ -1,11 +1,9 @@
-package vn.momo.kits.components
-
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
@@ -14,15 +12,15 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import vn.momo.kits.components.Icon
+import vn.momo.kits.components.Text
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Typography
-import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
@@ -57,13 +55,10 @@ fun Chip(
         ChipSize.LARGE -> ChipDefaults.Large
     }
 
-    val (height, horizontal, iconSize, iconSpacing) =
-        listOf(scaleSize(dims.height), scaleSize(dims.horizontal), scaleSize(dims.iconSize), scaleSize(dims.iconSpacing))
-
     Row(
         modifier
             .wrapContentWidth()
-            .height(height)
+            .wrapContentHeight()
             .clip(RoundedCornerShape(Radius.L))
             .background(bg)
             .conditional(selected) {
@@ -72,12 +67,12 @@ fun Chip(
             .activeOpacityClickable {
                 onClick()
             }
-            .padding(horizontal = horizontal)
+            .padding(horizontal = dims.horizontal, vertical = dims.vertical)
             .conditional(accessibilityLabel != null) {
                 setAutomationId(accessibilityLabel.toString())
             },
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(iconSpacing)
+        horizontalArrangement = Arrangement.spacedBy(dims.iconSpacing)
     ) {
         if (iconLeft != null) {
             Icon(source = iconLeft, size = dims.iconSize, color = leftTint)
@@ -86,7 +81,6 @@ fun Chip(
         if (!label.isNullOrEmpty()) {
             Text(
                 text = label,
-                textAlign = TextAlign.Center,
                 color = textColor,
                 style = when (size) {
                     ChipSize.SMALL -> Typography.labelSMedium
@@ -98,7 +92,7 @@ fun Chip(
         }
 
         if (iconRight != null) {
-            Icon(source = iconRight, size = iconSize, color = rightTint)
+            Icon(source = iconRight, size = dims.iconSize, color = rightTint)
         }
     }
 }
@@ -108,23 +102,23 @@ enum class ChipSize { SMALL, LARGE }
 object ChipDefaults {
     @Immutable
     data class Dimensions(
-        val height: Dp,
         val horizontal: Dp,
+        val vertical: Dp,
         val iconSize: Dp,
         val iconSpacing: Dp,
     )
 
     val Large = Dimensions(
-        height = 32.dp,
         horizontal = 12.dp,
+        vertical = 8.dp,
         iconSize = 20.dp,
-        iconSpacing = 4.dp,
+        iconSpacing = 8.dp,
     )
 
     val Small = Dimensions(
-        height = 24.dp,
         horizontal = 10.dp,
+        vertical = 6.dp,
         iconSize = 16.dp,
-        iconSpacing = 4.dp,
+        iconSpacing = 6.dp,
     )
 }

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

@@ -7,7 +7,6 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
@@ -59,15 +58,6 @@ fun scaleSize(size: Float): Float {
     )
 }
 
-@Composable
-fun scaleSize(size: Dp): Dp {
-    val density = LocalDensity.current
-    val px = with(density) { size.toPx() }
-    val scaledPx = scaleSize(px)
-    return with(density) { scaledPx.toDp() }
-}
-
-
 @OptIn(InternalResourceApi::class)
 @Composable
 fun getFont(font: FontResource): FontFamily {

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

@@ -101,6 +101,7 @@ internal fun BottomSheet(
                 )
             )
             navigator.pop()
+            OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
 

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

@@ -67,6 +67,7 @@ internal fun ModalScreen(
                 animationSpec = tween(durationMillis = 200)
             )
             navigator.pop()
+            OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
 

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

@@ -7,6 +7,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
@@ -18,7 +19,7 @@ class Navigator(
     private val navController: NavController,
     private val maxApi: IMaxApi?
 ) {
-    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     fun push(content: @Composable () -> Unit, options: NavigationOptions? = null) {
         val route = DynamicScreenRegistry.register(content, options)
@@ -34,26 +35,23 @@ class Navigator(
         }
     }
 
-    fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
-        scope.launch {
-            repeat(count) {
-                if (OverplayComponentRegistry.isOverplayShowing()){
-                    OverplayComponentRegistry.clear()
-                    delay(300L)
-                    OverplayComponentRegistry.hardClearAfterDismiss()
-                } else {
-                    if (navController.previousBackStackEntry != null){
-                        navController.popBackStack()
+    fun pop(count: Int = 1) {
+        repeat(count) {
+            if (OverplayComponentRegistry.isOverplayShowing()){
+                OverplayComponentRegistry.clear()
+            } else {
+                if (navController.previousBackStackEntry != null){
+                    navController.popBackStack()
+                    scope.launch {
                         delay(300L)
                         DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
                             DynamicScreenRegistry.unregisterScreen(it1.id)
                         }
-                    } else {
-                        maxApi?.dismiss {  }
                     }
+                } else {
+                    maxApi?.dismiss {  }
                 }
             }
-            callBack?.invoke()
         }
     }
 

package/package.json

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