@momo-kits/native-kits 0.162.0-debug → 0.162.1-beta.1-debug

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

@@ -8,13 +8,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
@@ -24,6 +18,7 @@ import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.modifier.conditional
 import kotlin.math.absoluteValue
+import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
 fun Carousel(
@@ -32,7 +27,6 @@ fun Carousel(
     loop: Boolean = false,
     autoplay: Boolean = false,
     autoplayInterval: Long = 3000L,
-    enableSnap: Boolean = true,
     scrollEnabled: Boolean = true,
     inactiveSlideOpacity: Float = 1f,
     inactiveSlideScale: Float = 1f,
@@ -48,18 +42,15 @@ fun Carousel(
 
     val pagerState = rememberPagerState(initialPage = startPage) { virtualPageCount }
 
-    // Map virtual page to real index
     val realIndex: (Int) -> Int = { page -> page % itemCount }
 
-    // Track user interaction for autoplay pause
     var isUserScrolling by remember { mutableStateOf(false) }
 
-    // Autoplay
     if (autoplay && itemCount > 1) {
         LaunchedEffect(autoplayInterval, isUserScrolling) {
             if (isUserScrolling) return@LaunchedEffect
             while (isActive) {
-                delay(autoplayInterval)
+                delay(autoplayInterval.milliseconds)
                 if (!isUserScrolling) {
                     val nextPage = pagerState.currentPage + 1
                     if (nextPage < virtualPageCount) {
@@ -70,7 +61,6 @@ fun Carousel(
         }
     }
 
-    // Track scroll state for callbacks
     LaunchedEffect(pagerState) {
         snapshotFlow { pagerState.isScrollInProgress }.collect { scrolling ->
             isUserScrolling = scrolling

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

@@ -22,7 +22,6 @@ import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 
-// Pre-computed shape for performance
 private val checkboxShape = RoundedCornerShape(Radius.XS)
 
 @Composable
@@ -33,10 +32,8 @@ fun CheckBox(
     indeterminate: Boolean = false,
     title: String = "",
 ) {
-    // Cache theme access
     val theme = AppTheme.current
 
-    // Memoize color calculations to avoid repeated conditional logic
     val colors = remember(checked, disabled, theme) {
         when {
             disabled && checked -> Pair(theme.colors.background.tonal, theme.colors.background.tonal)
@@ -48,12 +45,10 @@ fun CheckBox(
 
     val (borderColor, backgroundColor) = colors
 
-    // Memoize icon source to avoid repeated conditional check
     val iconSource = remember(indeterminate) {
         if (indeterminate) "navigation_minus" else "ic_checked"
     }
 
-    // Memoize click handler to avoid lambda recreation
     val onClickHandler = remember(onCheckedChange, checked) {
         { onCheckedChange(!checked) }
     }

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

@@ -2,11 +2,7 @@ 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.wrapContentWidth
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -17,12 +13,8 @@ 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 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.application.IsShowBaseLineDebug
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
@@ -111,7 +103,7 @@ fun Chip(
 
 enum class ChipSize { SMALL, LARGE }
 
-object ChipDefaults {
+private object ChipDefaults {
     @Immutable
     data class Dimensions(
         val height: Float,

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

@@ -7,20 +7,9 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -29,11 +18,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
-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
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId

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

@@ -42,8 +42,8 @@ import androidx.compose.ui.unit.toOffset
 import androidx.compose.ui.unit.toSize
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.isActive
-import kotlin.coroutines.coroutineContext
 import kotlin.math.abs
 import kotlin.math.sign
 
@@ -103,7 +103,7 @@ internal class CupertinoOverscrollEffect(
      * end at the same time, which is not the case:
      * Spring->Fling->Spring, Fling->Spring, Spring->Fling effects can have different timing per dimension
      * (see Notes of https://github.com/JetBrains/compose-multiplatform-core/pull/609),
-     * which is not possible to express without changing API. Hence this effect will be fixed to latest
+     * which is not possible to express without changing API. Hence, this effect will be fixed to latest
      * received delta.
      */
     private var direction: CupertinoOverscrollDirection = CupertinoOverscrollDirection.UNKNOWN
@@ -151,7 +151,7 @@ internal class CupertinoOverscrollEffect(
     override val node: DelegatableNode get() = overscrollNode
 
     private fun onDraw() {
-        // Fix an issue where scrolling was cancelled but the overscroll effect was not completed.
+        // Fix an issue where scrolling was canceled but the overscroll effect was not completed.
         // Reset the overscroll effect when no ongoing animation or interaction is applied.
         if (!drawCallScheduledByOffsetChange && isInProgress && overscrollNode.pointersDown == 0) {
             overscrollOffsetState.value = Offset.Zero
@@ -289,7 +289,7 @@ internal class CupertinoOverscrollEffect(
     }
 
     private fun applyPullToRefresh() {
-        val (isRefresh, refresh, threshHold, _, sendHaptic) = pullRefreshState ?: return
+        val (isRefresh, refresh, threshHold, _, _) = pullRefreshState ?: return
         val overscrollY = overscrollOffset.y
         if (isRefresh.value || overscrollY < threshHold.value * density) return
         refresh.invoke()
@@ -398,7 +398,7 @@ internal class CupertinoOverscrollEffect(
         }
 
         springAnimationScope?.cancel()
-        springAnimationScope = CoroutineScope(coroutineContext)
+        springAnimationScope = CoroutineScope(currentCoroutineContext())
         springAnimationScope?.run {
             AnimationState(
                 Float.VectorConverter,
@@ -414,7 +414,7 @@ internal class CupertinoOverscrollEffect(
                 } ?: (value * density).toOffset()
                 currentVelocity = velocity * density
 
-                // If it was fling from overscroll, cancel animation and return velocity
+                // If it was flung from overscroll, cancel animation and return velocity
                 if (reason == CupertinoSpringAnimationReason.FLING_FROM_OVERSCROLL &&
                     initialSign != 0f &&
                     sign(value) != initialSign
@@ -425,7 +425,7 @@ internal class CupertinoOverscrollEffect(
             springAnimationScope = null
         }
 
-        if (coroutineContext.isActive) {
+        if (currentCoroutineContext().isActive) {
             // The spring is critically damped, so in case spring-fling-spring sequence is slightly
             // offset and velocity is of the opposite sign, it will end up with no animation
             overscrollOffset = Offset.Zero
@@ -447,8 +447,8 @@ internal class CupertinoOverscrollEffect(
         val dpSize = scrollSize / density
 
         return Offset(
-            rubberBandedValue(dpOffset.x, dpSize.width, RUBBER_BAND_COEFFICIENT),
-            rubberBandedValue(dpOffset.y, dpSize.height, RUBBER_BAND_COEFFICIENT)
+            rubberBandedValue(dpOffset.x, dpSize.width),
+            rubberBandedValue(dpOffset.y, dpSize.height)
         ) * density
     }
 
@@ -456,8 +456,8 @@ internal class CupertinoOverscrollEffect(
      * Maps raw delta offset [value] on an axis within scroll container with [dimension]
      * to actual visible offset
      */
-    private fun rubberBandedValue(value: Float, dimension: Float, coefficient: Float) =
-        sign(value) * (1f - (1f / (abs(value) * coefficient / dimension + 1f))) * dimension
+    private fun rubberBandedValue(value: Float, dimension: Float) =
+        sign(value) * (1f - (1f / (abs(value) * RUBBER_BAND_COEFFICIENT / dimension + 1f))) * dimension
 
     companion object Companion {
         private const val RUBBER_BAND_COEFFICIENT = 0.55f

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

@@ -56,7 +56,7 @@ private val iconSizeMap = mapOf(
 )
 
 @Composable
-fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
+internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
     val theme = AppTheme.current
 
     return remember(type, color, theme) {
@@ -91,18 +91,10 @@ fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
 }
 
 @Composable
-fun getIconColor(type: ButtonType): Color {
+internal fun getIconColor(type: ButtonType): Color {
     val theme = AppTheme.current
     return remember(type, theme) {
-        when (type) {
-            ButtonType.DISABLED -> theme.colors.text.disable
-            ButtonType.PRIMARY -> Colors.black_01
-            ButtonType.SECONDARY -> theme.colors.text.default
-            ButtonType.OUTLINE -> theme.colors.primary
-            ButtonType.TONAL -> theme.colors.primary
-            ButtonType.DANGER -> Colors.black_01
-            ButtonType.TEXT -> theme.colors.primary
-        }
+        getButtonColor(type, theme)
     }
 }
 

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

@@ -3,11 +3,7 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

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

@@ -1,29 +1,17 @@
 package vn.momo.kits.components
 
+import vn.momo.kits.utils.Deprecated.InternalApi
+
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
@@ -44,13 +32,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import vn.momo.kits.application.IsShowBaseLineDebug
-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
-import vn.momo.kits.const.getFont
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.uikits.resources.Res
@@ -88,7 +70,6 @@ enum class InputFontWeight(val value: FontWeight) {
     )
 }
 
-// Consolidated input state for better performance
 data class InputState(
     val isFocused: Boolean = false,
     val passHidden: Boolean = false,
@@ -128,6 +109,7 @@ private class PasswordVisualTransformation(
 }
 
 @Composable
+@InternalApi
 fun getBorderColor(isFocused: Boolean, error: String, disabled: Boolean): Color {
     val theme = AppTheme.current
     return remember(isFocused, error, disabled, theme) {
@@ -141,6 +123,7 @@ fun getBorderColor(isFocused: Boolean, error: String, disabled: Boolean): Color
 }
 
 @Composable
+@InternalApi
 fun RenderRightIcon(loading: Boolean, icon: String, color: Color, onClick: () -> Unit, modifier: Modifier = Modifier) {
     if (loading) {
         Box {
@@ -167,6 +150,7 @@ fun RenderRightIcon(loading: Boolean, icon: String, color: Color, onClick: () ->
 }
 
 @Composable
+@InternalApi
 fun ErrorView(errorMessage: String, errorSpacing: Boolean, hintText: String) {
     val theme = AppTheme.current
     val errorColor = remember(theme) { theme.colors.error.primary }
@@ -326,41 +310,14 @@ fun Input(
             },
             decorationBox = { innerTextField ->
                 // Floating label
-                if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
-                    Box(
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .offset(y = (-size.values.height / 2), x = Spacing.S)
-                            .background(theme.colors.background.surface)
-                            .zIndex(10f),
-                    ) {
-                        Row(
-                            modifier = Modifier.padding(horizontal = Spacing.S),
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            Text(
-                                floatingValue,
-                                style = Typography.labelSMedium,
-                                color = floatingTitleColor
-                            )
-                            if (required) {
-                                Text(
-                                    "*",
-                                    style = Typography.labelSMedium,
-                                    color = theme.colors.error.primary,
-                                )
-                            }
-                            if (floatingIcon.isNotEmpty()) {
-                                Icon(
-                                    source = floatingIcon,
-                                    modifier = Modifier.padding(start = Spacing.XS),
-                                    size = 16.dp,
-                                    color = floatingIconTintColor
-                                )
-                            }
-                        }
-                    }
-                }
+                FloatingLabel(
+                    floatingValue = floatingValue,
+                    floatingIcon = floatingIcon,
+                    titleColor = floatingTitleColor,
+                    iconColor = floatingIconTintColor,
+                    offsetY = -size.values.height / 2,
+                    required = required,
+                )
 
                 // Input container
                 Box(
@@ -450,3 +407,71 @@ fun Input(
         ErrorView(error, errorSpacing, hintText)
     }
 }
+
+internal data class InputColors(
+    val text: Color,
+    val placeholder: Color,
+    val iconTint: Color,
+    val floatingTitle: Color,
+    val floatingIcon: Color,
+)
+
+@Composable
+internal fun getInputColors(
+    disabled: Boolean,
+    iconColor: Color,
+    floatingValueColor: Color,
+    floatingIconColor: Color,
+): InputColors {
+    val theme = AppTheme.current
+    val disabledColor = theme.colors.text.disable
+    return InputColors(
+        text = if (disabled) disabledColor else theme.colors.text.default,
+        placeholder = if (disabled) disabledColor else theme.colors.text.hint,
+        iconTint = if (disabled) disabledColor else iconColor,
+        floatingTitle = if (disabled) disabledColor else floatingValueColor,
+        floatingIcon = if (disabled) disabledColor else floatingIconColor,
+    )
+}
+
+@Composable
+internal fun FloatingLabel(
+    floatingValue: String,
+    floatingIcon: String,
+    titleColor: Color,
+    iconColor: Color,
+    offsetY: Dp,
+    offsetX: Dp = Spacing.S,
+    required: Boolean = false,
+) {
+    if (floatingValue.isEmpty() && floatingIcon.isEmpty()) return
+    Box(
+        modifier = Modifier
+            .wrapContentSize()
+            .offset(y = offsetY, x = offsetX)
+            .background(AppTheme.current.colors.background.surface)
+            .zIndex(10f),
+    ) {
+        Row(
+            modifier = Modifier.padding(horizontal = Spacing.S),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Text(floatingValue, style = Typography.labelSMedium, color = titleColor)
+            if (required) {
+                Text(
+                    "*",
+                    style = Typography.labelSMedium,
+                    color = AppTheme.current.colors.error.primary,
+                )
+            }
+            if (floatingIcon.isNotEmpty()) {
+                Icon(
+                    source = floatingIcon,
+                    modifier = Modifier.padding(start = Spacing.XS),
+                    size = 16.dp,
+                    color = iconColor,
+                )
+            }
+        }
+    }
+}

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

@@ -3,20 +3,9 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -27,12 +16,8 @@ import androidx.compose.ui.text.TextStyle
 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.Spacing
 import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.Colors
-import vn.momo.kits.const.Typography
-import vn.momo.kits.const.scaleSize
+import vn.momo.kits.const.*
 import vn.momo.kits.modifier.conditional
 
 @Composable
@@ -59,24 +44,8 @@ fun InputDropDown(
 ) {
     val isFocused by remember { mutableStateOf(false) }
 
-    val disabledColor = AppTheme.current.colors.text.disable
-    var textColor = AppTheme.current.colors.text.default
-    var placeholderColor = AppTheme.current.colors.text.hint
-    var iconTintColor = iconColor
-    val floatingTitleColor = when {
-        disabled -> AppTheme.current.colors.text.disable
-        else -> floatingValueColor
-    }
-    val floatingIconTintColor = when {
-        disabled -> AppTheme.current.colors.text.disable
-        else -> floatingIconColor
-    }
-
-    if (disabled) {
-        textColor = disabledColor
-        placeholderColor = disabledColor
-        iconTintColor = disabledColor
-    }
+    val (textColor, placeholderColor, iconTintColor, floatingTitleColor, floatingIconTintColor) =
+        getInputColors(disabled, iconColor, floatingValueColor, floatingIconColor)
 
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
@@ -92,41 +61,14 @@ fun InputDropDown(
             contentDescription = floatingValue; testTag = testId
         }) {
         Box {
-            if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
-                Box(
-                    modifier = Modifier.wrapContentSize()
-                        .offset(y = -Spacing.S, x = Spacing.S)
-                        .background(AppTheme.current.colors.background.surface)
-                        .zIndex(10f),
-                ) {
-                    Row(
-                        modifier = Modifier
-                            .padding(horizontal = Spacing.S),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        Text(
-                            floatingValue,
-                            style = Typography.labelSMedium,
-                            color = floatingTitleColor
-                        )
-                        if (required) {
-                            Text(
-                                "*",
-                                style = Typography.labelSMedium,
-                                color = AppTheme.current.colors.error.primary,
-                            )
-                        }
-                        if (floatingIcon.isNotEmpty()) {
-                            Icon(
-                                source = floatingIcon,
-                                modifier = Modifier.padding(start = Spacing.XS),
-                                size = 16.dp,
-                                color = floatingIconTintColor
-                            )
-                        }
-                    }
-                }
-            }
+            FloatingLabel(
+                floatingValue = floatingValue,
+                floatingIcon = floatingIcon,
+                titleColor = floatingTitleColor,
+                iconColor = floatingIconTintColor,
+                offsetY = -Spacing.S,
+                required = required,
+            )
             Box(
                 modifier = Modifier.fillMaxWidth()
                     .height(if (size == InputSize.SMALL) 48.dp else 56.dp)

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

@@ -102,24 +102,8 @@ fun InputMoney(
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
-    val disabledColor = AppTheme.current.colors.text.disable
-    var textColor = AppTheme.current.colors.text.default
-    var placeholderColor = AppTheme.current.colors.text.hint
-    var iconTintColor = iconColor
-    val floatingTitleColor = when {
-        disabled -> AppTheme.current.colors.text.disable
-        else -> floatingValueColor
-    }
-    val floatingIconTintColor = when {
-        disabled -> AppTheme.current.colors.text.disable
-        else -> floatingIconColor
-    }
-
-    if (disabled) {
-        textColor = disabledColor
-        placeholderColor = disabledColor
-        iconTintColor = disabledColor
-    }
+    val (textColor, placeholderColor, iconTintColor, floatingTitleColor, floatingIconTintColor) =
+        getInputColors(disabled, iconColor, floatingValueColor, floatingIconColor)
 
     val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
@@ -156,39 +140,14 @@ fun InputMoney(
             },
             decorationBox = { innerTextField ->
                 // Floating Icon
-                if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
-                    Box(
-                        modifier = Modifier.wrapContentSize()
-                            .offset(y = (-size.values.height / 2), x = (Spacing.S))
-                            .background(AppTheme.current.colors.background.surface)
-                            .zIndex(10f),
-                    ) {
-                        Row(
-                            modifier = Modifier.padding(horizontal = Spacing.S),
-                        ) {
-                            Text(
-                                floatingValue,
-                                style = Typography.labelSMedium,
-                                color = floatingTitleColor
-                            )
-                            if (required) {
-                                Text(
-                                    "*",
-                                    style = Typography.labelSMedium,
-                                    color = AppTheme.current.colors.error.primary,
-                                )
-                            }
-                            if (floatingIcon.isNotEmpty()) {
-                                Icon(
-                                    source = floatingIcon,
-                                    modifier = Modifier.padding(start = Spacing.XS),
-                                    size = 16.dp,
-                                    color = floatingIconTintColor
-                                )
-                            }
-                        }
-                    }
-                }
+                FloatingLabel(
+                    floatingValue = floatingValue,
+                    floatingIcon = floatingIcon,
+                    titleColor = floatingTitleColor,
+                    iconColor = floatingIconTintColor,
+                    offsetY = -size.values.height / 2,
+                    required = required,
+                )
                 //input box wrapper
                 Box(
                     modifier = Modifier.fillMaxWidth()