@momo-kits/native-kits 0.162.6-debug → 0.163.1-beta.1-debug

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

@@ -2,7 +2,17 @@ package vn.momo.kits.components
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.asPaddingValues
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -11,9 +21,22 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.unit.dp
+import io.ktor.util.Platform
+import vn.momo.kits.application.IsShowBaseLineDebug
+import vn.momo.kits.const.Colors
+import vn.momo.kits.modifier.conditional
 import vn.momo.kits.platform.getPlatformName
 import vn.momo.kits.platform.getStatusBarHeight
 
+/**
+ * A debug overlay that draws danger/warning baseline guides on top of the screen.
+ *
+ * Highlights safe-area boundaries, header regions, and bottom navigation zones
+ * using colored solid or dotted lines and semi-transparent red zones.
+ *
+ * @param enabled When `false` the composable renders nothing. Pass `false` when
+ *                your QC automation flag is active to suppress the overlay.
+ */
 @Composable
 fun BaselineView(enabled: Boolean = true) {
     if (!enabled) return
@@ -146,10 +169,10 @@ fun BaselineView(enabled: Boolean = true) {
     }
 }
 
-private enum class BaselineOrientation { Horizontal, Vertical }
+enum class BaselineOrientation { Horizontal, Vertical }
 
 @Composable
-private fun BaselineDottedLine(
+fun BaselineDottedLine(
     modifier: Modifier = Modifier,
     color: Color = Color.Red,
     orientation: BaselineOrientation = BaselineOrientation.Horizontal,

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

@@ -1,7 +1,5 @@
 package vn.momo.kits.components
 
-import vn.momo.kits.modifier.InternalApi
-
 import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
@@ -10,7 +8,14 @@ import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+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.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -25,7 +30,11 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.*
+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.modifier.conditional
 import vn.momo.kits.platform.LottieAnimation
 
@@ -91,37 +100,32 @@ private val iconSpaceCache = mapOf(
     Size.LARGE to Spacing.S
 )
 
-private fun getStyle(size: Size): TextStyle {
+fun getStyle(size: Size): TextStyle {
     return styleCache[size] ?: Typography.actionDefaultBold
 }
 
-private fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
-private fun getIconSpace(size: Size): Dp = iconSpaceCache[size] ?: Spacing.S
+fun getIconSize(size: Size): Dp = iconSizeCache[size] ?: 24.dp
+fun getIconSpace(size: Size): Dp = iconSpaceCache[size] ?: Spacing.S
 
 @Composable
-internal fun getTextColor(loading: Boolean, type: ButtonType): Color {
+fun getTextColor(loading: Boolean, type: ButtonType): Color {
     val theme = AppTheme.current
 
     return remember(type, theme, loading) {
-        getButtonColor(type, theme).withLoading(loading)
-    }
-}
-
-internal fun getButtonColor(type: ButtonType, theme: Theme): Color {
-    return 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
+        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
+        }.withLoading(loading)
     }
 }
 
-
 @Composable
-internal fun RenderTitle(size: Size, title: String = "", textColor: Color) {
+fun RenderTitle(size: Size, title: String = "", textColor: Color) {
     val style = remember(size) { getStyle(size) }
     Text(
         style = style,
@@ -133,7 +137,6 @@ internal fun RenderTitle(size: Size, title: String = "", textColor: Color) {
 }
 
 @Composable
-@InternalApi
 fun RenderIcon(
     size: Size,
     isIconLeft: Boolean,
@@ -184,7 +187,7 @@ private fun shouldLoadingOnLeft(iconLeft: String, iconRight: String): Boolean {
 }
 
 @Composable
-internal fun getTypeStyle(
+fun getTypeStyle(
     type: ButtonType,
     color: Color? = AppTheme.current.colors.primary,
     size: Size,
@@ -220,7 +223,7 @@ internal fun getTypeStyle(
 }
 
 @Composable
-internal fun getButtonBackgroundColor(
+fun getButtonBackgroundColor(
     loading: Boolean,
     type: ButtonType
 ): Color {
@@ -239,7 +242,7 @@ internal fun getButtonBackgroundColor(
     }
 }
 
-private fun Color.withLoading(loading: Boolean): Color =
+fun Color.withLoading(loading: Boolean): Color =
     this.copy(alpha = if (loading) 0.75f else 1f)
 
 @Composable

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

@@ -8,7 +8,13 @@ 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.*
+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.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
@@ -18,7 +24,6 @@ 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(
@@ -27,6 +32,7 @@ fun Carousel(
     loop: Boolean = false,
     autoplay: Boolean = false,
     autoplayInterval: Long = 3000L,
+    enableSnap: Boolean = true,
     scrollEnabled: Boolean = true,
     inactiveSlideOpacity: Float = 1f,
     inactiveSlideScale: Float = 1f,
@@ -42,15 +48,18 @@ 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.milliseconds)
+                delay(autoplayInterval)
                 if (!isUserScrolling) {
                     val nextPage = pagerState.currentPage + 1
                     if (nextPage < virtualPageCount) {
@@ -61,6 +70,7 @@ 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,6 +22,7 @@ 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
@@ -32,8 +33,10 @@ 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)
@@ -45,10 +48,12 @@ 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,7 +2,11 @@ package vn.momo.kits.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+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.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -13,8 +17,12 @@ 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.*
+import vn.momo.kits.const.scaleSize
 import vn.momo.kits.modifier.activeOpacityClickable
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
@@ -103,7 +111,7 @@ fun Chip(
 
 enum class ChipSize { SMALL, LARGE }
 
-private object ChipDefaults {
+object ChipDefaults {
     @Immutable
     data class Dimensions(
         val height: Float,

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

@@ -7,9 +7,20 @@ 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.*
+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.shape.RoundedCornerShape
-import androidx.compose.runtime.*
+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.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -18,7 +29,11 @@ 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.*
+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.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 canceled but the overscroll effect was not completed.
+        // Fix an issue where scrolling was cancelled 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, _, _) = pullRefreshState ?: return
+        val (isRefresh, refresh, threshHold, _, sendHaptic) = 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(currentCoroutineContext())
+        springAnimationScope = CoroutineScope(coroutineContext)
         springAnimationScope?.run {
             AnimationState(
                 Float.VectorConverter,
@@ -414,7 +414,7 @@ internal class CupertinoOverscrollEffect(
                 } ?: (value * density).toOffset()
                 currentVelocity = velocity * density
 
-                // If it was flung from overscroll, cancel animation and return velocity
+                // If it was fling 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 (currentCoroutineContext().isActive) {
+        if (coroutineContext.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),
-            rubberBandedValue(dpOffset.y, dpSize.height)
+            rubberBandedValue(dpOffset.x, dpSize.width, RUBBER_BAND_COEFFICIENT),
+            rubberBandedValue(dpOffset.y, dpSize.height, RUBBER_BAND_COEFFICIENT)
         ) * 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) =
-        sign(value) * (1f - (1f / (abs(value) * RUBBER_BAND_COEFFICIENT / dimension + 1f))) * dimension
+    private fun rubberBandedValue(value: Float, dimension: Float, coefficient: Float) =
+        sign(value) * (1f - (1f / (abs(value) * 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
-internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
+fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
     val theme = AppTheme.current
 
     return remember(type, color, theme) {
@@ -91,10 +91,18 @@ internal fun getIconStyle(type: ButtonType, color: Color? = null): Modifier {
 }
 
 @Composable
-internal fun getIconColor(type: ButtonType): Color {
+fun getIconColor(type: ButtonType): Color {
     val theme = AppTheme.current
     return remember(type, theme) {
-        getButtonColor(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
+        }
     }
 }
 

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

@@ -3,7 +3,11 @@ 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.*
+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.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

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

@@ -1,17 +1,29 @@
 package vn.momo.kits.components
 
-import vn.momo.kits.modifier.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.*
+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.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.*
+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.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
@@ -32,7 +44,13 @@ 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.*
+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.modifier.conditional
 import vn.momo.kits.modifier.setAutomationId
 import vn.momo.uikits.resources.Res
@@ -70,6 +88,7 @@ enum class InputFontWeight(val value: FontWeight) {
     )
 }
 
+// Consolidated input state for better performance
 data class InputState(
     val isFocused: Boolean = false,
     val passHidden: Boolean = false,
@@ -109,7 +128,6 @@ private class PasswordVisualTransformation(
 }
 
 @Composable
-@InternalApi
 fun getBorderColor(isFocused: Boolean, error: String, disabled: Boolean): Color {
     val theme = AppTheme.current
     return remember(isFocused, error, disabled, theme) {
@@ -123,7 +141,6 @@ 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 {
@@ -150,7 +167,6 @@ 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 }
@@ -310,14 +326,41 @@ fun Input(
             },
             decorationBox = { innerTextField ->
                 // Floating label
-                FloatingLabel(
-                    floatingValue = floatingValue,
-                    floatingIcon = floatingIcon,
-                    titleColor = floatingTitleColor,
-                    iconColor = floatingIconTintColor,
-                    offsetY = -size.values.height / 2,
-                    required = required,
-                )
+                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
+                                )
+                            }
+                        }
+                    }
+                }
 
                 // Input container
                 Box(
@@ -407,71 +450,3 @@ 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,
-                )
-            }
-        }
-    }
-}