@momo-kits/native-kits 0.152.4-beta.9 → 0.152.4-scale.3

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

@@ -32,11 +32,12 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
@@ -106,10 +107,12 @@ fun InputOTP(
         handleChangeText("")
     }
 
+    val fontSize = scaleSize(20.sp)
 
     Column {
         BasicTextField(
             value = value,
+            textStyle = TextStyle(fontSize = fontSize),
             onValueChange = handleChangeText,
             singleLine = true,
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = if (dataType == "number") KeyboardType.Number else KeyboardType.Ascii),

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

@@ -36,7 +36,9 @@ import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.setAutomationId
+import vn.momo.kits.navigation.ScaleSizeScope
 
 data class InputPhoneNumberSizeDetail(
     val borderWidth: Dp,
@@ -113,18 +115,8 @@ fun InputPhoneNumber(
 
     val testId = "input_phone_number"
 
-    val textStyle = remember(textColor) {
-        size.values.textStyle.merge(TextStyle(
-            color = textColor,
-        ))
-    }
-
-    val placeholderStyle = remember(placeholderColor) {
-
-        size.values.textStyle.merge(TextStyle(
-            color = placeholderColor
-        ))
-    }
+    val textStyle = scaleSize(size.values.textStyle.copy(color = textColor))
+    val placeholderStyle = scaleSize(size.values.textStyle.copy(color = placeholderColor))
 
     Column(modifier = modifier.setAutomationId(testId)) {
         BasicTextField(
@@ -174,12 +166,13 @@ fun InputPhoneNumber(
                                 alignment = Alignment.Center
                             )
                         )
-
-                        Text(
-                            "+84",
-                            color = textColor,
-                            style = textStyle,
-                        )
+                        ScaleSizeScope(disableScale = true) {
+                            Text(
+                                "+84",
+                                color = textColor,
+                                style = textStyle,
+                            )
+                        }
 
                         // Divider
                         Box(modifier = Modifier.padding(horizontal = Spacing.M)) {
@@ -193,12 +186,14 @@ fun InputPhoneNumber(
 
                         Box(Modifier.weight(1f)) {
                             if (text.value.isEmpty()) {
-                                Text(
-                                    text = placeholder,
-                                    style = placeholderStyle,
-                                    color = placeholderColor,
-                                    modifier = Modifier.align(Alignment.CenterStart)
-                                )
+                                ScaleSizeScope(disableScale = true) {
+                                    Text(
+                                        text = placeholder,
+                                        style = placeholderStyle,
+                                        color = placeholderColor,
+                                        modifier = Modifier.align(Alignment.CenterStart)
+                                    )
+                                }
                             }
                             innerTextField()
                         }

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

@@ -9,10 +9,10 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
@@ -39,6 +39,8 @@ import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.const.scaleSize
+import vn.momo.kits.navigation.ScaleSizeScope
 import vn.momo.kits.utils.ifTrue
 
 @Composable
@@ -123,20 +125,25 @@ fun InputSearch(
         iconTintColor = disabledColor
     }
 
+    val fontSize = scaleSize(14.sp)
+
+    val textStyle = remember(textColor, inputSearchProps.fontWeight.value) {
+        TextStyle(
+            color = textColor,
+            fontSize = fontSize,
+            fontWeight = inputSearchProps.fontWeight.value
+        )
+    }
+
     Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
         BasicTextField(
             enabled = !inputSearchProps.disabled,
             singleLine = true,
             value = inputSearchProps.text.value,
-            textStyle = TextStyle(
-                color = textColor,
-                fontSize = 14.sp,
-                lineHeight = 20.sp,
-                fontWeight = inputSearchProps.fontWeight.value
-            ),
+            textStyle = textStyle,
             keyboardOptions = inputSearchProps.keyboardOptions.copy(keyboardType = inputSearchProps.keyboardType),
             keyboardActions = inputSearchProps.keyboardActions,
-            modifier = inputSearchProps.modifier.weight(1f).height(36.dp).onFocusChanged {
+            modifier = inputSearchProps.modifier.weight(1f).wrapContentHeight().onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
                     inputSearchProps.onFocus()
@@ -176,17 +183,15 @@ fun InputSearch(
                             )
                             Box(Modifier.weight(1f)) {
                                 if (inputSearchProps.text.value.isEmpty()) {
-                                    Text(
-                                        text = inputSearchProps.placeholder,
-                                        style = TextStyle(
-                                            fontSize = 14.sp,
-                                            lineHeight = 20.sp,
-                                            fontWeight = inputSearchProps.fontWeight.value
-                                        ),
-                                        maxLines = 1,
-                                        color = placeholderColor,
-                                        overflow = TextOverflow.Ellipsis
-                                    )
+                                    ScaleSizeScope(disableScale = true) {
+                                        Text(
+                                            text = inputSearchProps.placeholder,
+                                            style = textStyle,
+                                            maxLines = 1,
+                                            color = placeholderColor,
+                                            overflow = TextOverflow.Ellipsis
+                                        )
+                                    }
                                 }
                                 innerTextField()
                             }

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

@@ -36,6 +36,8 @@ import androidx.compose.ui.zIndex
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.const.Typography
+import vn.momo.kits.const.scaleSize
+import vn.momo.kits.navigation.ScaleSizeScope
 
 const val MAX_LENGTH = 300
 val DEFAULT_HEIGHT = 104.dp
@@ -86,7 +88,9 @@ fun InputTextArea(
         iconTintColor = disabledColor
     }
 
-
+    val fontSize = scaleSize(16.sp)
+    val lineHeight = scaleSize(24.sp)
+    val scaleHeight = scaleSize(height)
 
     Column {
         BasicTextField(
@@ -95,12 +99,12 @@ fun InputTextArea(
             value = text.value,
             textStyle = TextStyle(
                 color = textColor,
-                fontSize = 16.sp,
-                lineHeight = 24.sp,
+                fontSize = fontSize,
+                lineHeight = lineHeight,
                 fontWeight = fontWeight.value
             ),
             keyboardOptions = KeyboardOptions.Default.copy(keyboardType = keyboardType),
-            modifier = Modifier.height(height).onFocusChanged {
+            modifier = Modifier.height(scaleHeight).onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
                     onFocus()
@@ -118,7 +122,7 @@ fun InputTextArea(
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
                     Box(
                         modifier = Modifier.wrapContentSize()
-                            .offset(y = (-height / 2), x = (Spacing.S))
+                            .offset(y = (-scaleHeight / 2), x = (Spacing.S))
                             .background(AppTheme.current.colors.background.surface)
                             .zIndex(10f),
                     ) {
@@ -166,23 +170,27 @@ fun InputTextArea(
                 ) {
                     Column {
                         Row(
-                            modifier = Modifier.weight(9f).padding(
-                                horizontal = Spacing.M,
-                                vertical = Spacing.M
+                            modifier = Modifier.weight(1f).padding(
+                                start = Spacing.M,
+                                end = Spacing.M,
+                                top = Spacing.M
                             ),
                             verticalAlignment = Alignment.Top
                         ) {
                             Box(Modifier.weight(1f)) {
                                 if (text.value.isEmpty()) {
-                                    Text(
-                                        text = placeholder,
-                                        style = TextStyle(
-                                            fontSize = 16.sp,
-                                            lineHeight = 24.sp,
-                                            fontWeight = fontWeight.value
-                                        ),
-                                        color = placeholderColor
-                                    )
+                                    ScaleSizeScope(disableScale = true) {
+                                        Text(
+                                            text = placeholder,
+                                            style = TextStyle(
+                                                fontSize = fontSize,
+                                                lineHeight = lineHeight,
+                                                fontWeight = fontWeight.value
+                                            ),
+                                            color = placeholderColor
+                                        )
+                                    }
+
                                 }
                                 innerTextField()
                             }
@@ -206,7 +214,6 @@ fun InputTextArea(
 
                         Box(
                             modifier = Modifier
-                                .weight(1.5f)
                                 .fillMaxWidth()
                                 .padding(end = Spacing.M),
                             contentAlignment = Alignment.CenterEnd

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

@@ -10,12 +10,12 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.sp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Typography
 import vn.momo.kits.const.getFontFamily
 import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.setAutomationId
+import vn.momo.kits.navigation.DisableScaleSize
 
 @Composable
 fun Text(
@@ -38,8 +38,8 @@ fun Text(
     val theme = AppTheme.current
 
     // Call @Composable functions directly in composable context
-    val scaledFontSize = scaleSize(style.fontSize.value).sp
-    val scaledLineHeight = scaleSize(style.lineHeight.value).sp
+    val scaledFontSize = scaleSize(style.fontSize)
+    val scaledLineHeight = scaleSize(style.lineHeight)
     val fontFamilyResult = getFontFamily(fontFamily ?: theme.font, style.fontWeight)
 
     // Now memoize the results

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

@@ -184,8 +184,6 @@ val AppThemeController = staticCompositionLocalOf<(Theme) -> Unit> {
     error("No AppTheme controller provided")
 }
 
-val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }
-
 val AppStatusBar = staticCompositionLocalOf { 0.dp }
 
 val AppNavigationBar = staticCompositionLocalOf { 0.dp }

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

@@ -8,10 +8,15 @@ 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.TextUnit
+import androidx.compose.ui.unit.TextUnitType
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.Font
 import org.jetbrains.compose.resources.FontResource
 import org.jetbrains.compose.resources.InternalResourceApi
+import vn.momo.kits.navigation.DisableScaleSize
+import vn.momo.kits.navigation.ScaleSizeMaxRate
 import vn.momo.kits.platform.getScreenDimensions
 import kotlin.math.max
 import kotlin.math.min
@@ -34,6 +39,7 @@ const val MAX_DEVICE_SCALE = 5
 
 @Composable
 fun scaleSize(size: Float): Float {
+    if (DisableScaleSize.current == true) return size
     val scaleSizeMaxRate: Float = ScaleSizeMaxRate.current ?: MAX_FONT_SCALE
     val deviceWidth = getScreenDimensions().width
     val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
@@ -41,9 +47,8 @@ fun scaleSize(size: Float): Float {
     val density = LocalDensity.current
     val fontScale = density.fontScale
 
-    val defaultFontSize = size / fontScale //To ignore OS scale
-    var fontSizeScaleDevice = defaultFontSize
-    var fontSizeScaleOS = defaultFontSize
+    var fontSizeScaleDevice = size
+    var fontSizeScaleOS = size
 
     if (deviceScale > 1) {
         fontSizeScaleDevice =
@@ -61,11 +66,41 @@ fun scaleSize(size: Float): Float {
 }
 
 @Composable
-fun scaleSize(size: Dp): Dp {
+fun scaleSize(size: TextUnit): TextUnit {
+    if (DisableScaleSize.current == true) return size
+    if (!size.isSp) return size
+
     val density = LocalDensity.current
-    val px = with(density) { size.toPx() }
-    val scaledPx = scaleSize(px)
-    return with(density) { scaledPx.toDp() }
+
+    val scaled = scaleSize(size.value)
+    val spValue = scaled / density.fontScale
+
+    return TextUnit(value = spValue, type = TextUnitType.Sp)
+}
+
+@Composable
+fun scaleSize(size: Dp): Dp {
+    return scaleSize(size.value).toInt().dp
+}
+
+@Composable
+fun scaleSize(textStyle: TextStyle): TextStyle {
+    return textStyle.copy(
+        fontSize = if (textStyle.fontSize != TextUnit.Unspecified)
+            scaleSize(textStyle.fontSize)
+        else
+            TextUnit.Unspecified,
+
+        lineHeight = if (textStyle.lineHeight != TextUnit.Unspecified)
+            scaleSize(textStyle.lineHeight)
+        else
+            TextUnit.Unspecified,
+
+        letterSpacing = if (textStyle.letterSpacing != TextUnit.Unspecified)
+            scaleSize(textStyle.letterSpacing)
+        else
+            TextUnit.Unspecified
+    )
 }
 
 

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

@@ -1,9 +1,13 @@
 package vn.momo.kits.navigation
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -12,6 +16,8 @@ import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
+import vn.momo.kits.navigation.BottomHeader.*
+import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
 
 class Navigator(
@@ -37,25 +43,36 @@ class Navigator(
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
         scope.launch {
             repeat(count) {
-                if (OverplayComponentRegistry.isOverplayShowing()){
-                    OverplayComponentRegistry.clear()
-                    delay(300L)
+                if (OverplayComponentRegistry.getOverplayType() == OverplayComponentType.SNACK_BAR){
+                    dismissScreen()
                     OverplayComponentRegistry.hardClearAfterDismiss()
+                }
+                else if (OverplayComponentRegistry.isOverplayShowing()){
+                    dismissOverplay()
                 } else {
-                    if (navController.previousBackStackEntry != null){
-                        navController.popBackStack()
-                        delay(300L)
-                        DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                            DynamicScreenRegistry.unregisterScreen(it1.id)
-                        }
-                    } else {
-                        maxApi?.dismiss {  }
-                    }
+                    dismissScreen()
                 }
             }
             callBack?.invoke()
         }
     }
+    private suspend fun CoroutineScope.dismissOverplay(isDelay: Boolean = true) {
+        OverplayComponentRegistry.clear()
+        if (isDelay) delay(300L)
+        OverplayComponentRegistry.hardClearAfterDismiss()
+    }
+
+    private suspend fun CoroutineScope.dismissScreen() {
+        if (navController.previousBackStackEntry != null){
+            navController.popBackStack()
+            delay(300L)
+            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
+                DynamicScreenRegistry.unregisterScreen(it1.id)
+            }
+        } else {
+            maxApi?.dismiss {  }
+        }
+    }
 
     fun present(content: @Composable () -> Unit, options: NavigationOptions? = null) {
         val route = DynamicScreenRegistry.register(content, options)
@@ -76,7 +93,8 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        OverplayComponentRegistry.registerModal(content, false, barrierDismissible, onDismiss, false)
+        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
     fun showBottomSheet(
@@ -86,7 +104,30 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        OverplayComponentRegistry.registerModal(content, isSurface, barrierDismissible, onDismiss, true, bottomSheetHeader)
+        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
+    }
+
+    fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
+        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        scope.launch {
+            OverplayComponentRegistry.registerOverplay(
+                id = id,
+                content = {
+                    SnackBar(snackBar, onDismiss)
+                },
+                type = OverplayComponentType.SNACK_BAR,
+                onDismiss = onDismiss
+            )
+        }
+    }
+
+    fun hideSnackBar() {
+        scope.launch {
+            OverplayComponentRegistry.clear()
+            delay(250L)
+            OverplayComponentRegistry.hardClearAfterDismiss()
+        }
     }
 
     fun dispose(){
@@ -159,13 +200,21 @@ sealed class OverplayComponentParams {
         val barrierDismissible: Boolean = true,
         val bottomSheetHeader: BottomHeader? = null,
     ) : OverplayComponentParams()
+
+    class SnackBar() : OverplayComponentParams()
 }
 
 data class OverplayComponent(
+    val id: Int,
+    val type: OverplayComponentType? = null,
     val content: @Composable () -> Unit,
     val params: OverplayComponentParams? = null
 )
 
+enum class OverplayComponentType {
+    MODAL, BOTTOM_SHEET, SNACK_BAR
+}
+
 object OverplayComponentRegistry {
     private var currentOverlayComponent : MutableState<OverplayComponent?> = mutableStateOf(null)
     private var requestClose: (() -> Unit)? = null
@@ -173,20 +222,24 @@ object OverplayComponentRegistry {
         requestClose = handler
     }
 
-    fun registerModal(
+    fun registerOverplay(
+        id: Int,
         content: @Composable () -> Unit,
+        type: OverplayComponentType,
         isSurface: Boolean = false,
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)?,
-        isBottomSheet: Boolean = false,
         bottomSheetHeader: BottomHeader? = null,
     ){
-        val params = if (isBottomSheet) {
-            OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
-        } else {
-            OverplayComponentParams.Modal(onDismiss, barrierDismissible)
+        val params = when(type){
+            OverplayComponentType.MODAL -> OverplayComponentParams.Modal(onDismiss, barrierDismissible)
+            OverplayComponentType.BOTTOM_SHEET -> OverplayComponentParams.BottomSheet(isSurface, onDismiss, barrierDismissible, bottomSheetHeader)
+            OverplayComponentType.SNACK_BAR -> OverplayComponentParams.SnackBar()
         }
+
         currentOverlayComponent.value = OverplayComponent(
+            id = id,
+            type = type,
             content = content,
             params = params
         )
@@ -194,6 +247,10 @@ object OverplayComponentRegistry {
 
     fun isOverplayShowing(): Boolean = currentOverlayComponent.value != null
 
+    fun getOverplayType(): OverplayComponentType? = currentOverlayComponent.value?.type
+
+    fun currentRootId(): Int? = currentOverlayComponent.value?.id
+
     fun clear(){
         if (requestClose != null) {
             requestClose?.invoke()
@@ -211,22 +268,35 @@ object OverplayComponentRegistry {
     fun OverlayComponent(){
         val overplay = currentOverlayComponent.value ?: return
 
-        if (overplay.params is OverplayComponentParams.BottomSheet) {
-            val param = overplay.params
-            BottomSheet(
-                content = overplay.content,
-                header = param.bottomSheetHeader ?: BottomHeader.Title(),
-                isSurface = param.isSurface,
-                barrierDismissible = param.barrierDismissible,
-                onDismiss = param.onDismiss
-            )
-        } else if (overplay.params is OverplayComponentParams.Modal) {
-            val param = overplay.params
-            ModalScreen(
-                content = overplay.content,
-                barrierDismissible = param.barrierDismissible,
-                onDismiss = param.onDismiss
-            )
+        when (val params = overplay.params) {
+            is OverplayComponentParams.BottomSheet -> {
+                BottomSheet(
+                    content = overplay.content,
+                    header = params.bottomSheetHeader ?: Title(),
+                    isSurface = params.isSurface,
+                    barrierDismissible = params.barrierDismissible,
+                    onDismiss = params.onDismiss
+                )
+            }
+
+            is OverplayComponentParams.Modal -> {
+                ModalScreen(
+                    content = overplay.content,
+                    barrierDismissible = params.barrierDismissible,
+                    onDismiss = params.onDismiss
+                )
+            }
+
+            is OverplayComponentParams.SnackBar -> {
+                Box(
+                    modifier = Modifier.fillMaxSize(),
+                    contentAlignment = Alignment.BottomCenter
+                ) {
+                    overplay.content()
+                }
+            }
+
+            null -> {}
         }
     }
 }

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

@@ -2,16 +2,21 @@ package vn.momo.kits.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import vn.momo.kits.const.ScaleSizeMaxRate
+import androidx.compose.runtime.staticCompositionLocalOf
+
+val ScaleSizeMaxRate  = staticCompositionLocalOf<Float?> { null }
+val DisableScaleSize  = staticCompositionLocalOf<Boolean> { false }
 
 @Composable
 fun ScaleSizeScope(
+    disableScale: Boolean = false,
     scaleSizeMaxRate: Float? = null,
     content: @Composable () -> Unit
 ) {
     CompositionLocalProvider(
-        ScaleSizeMaxRate provides scaleSizeMaxRate
+        ScaleSizeMaxRate provides scaleSizeMaxRate,
+        DisableScaleSize provides disableScale
     ) {
         content()
     }
-}
+}