@momo-kits/native-kits 0.159.1-beta.8-debug → 0.160.1-beta.10-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.159.1-beta.8-debug"
+        version = "0.160.1-beta.10-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.157.1-beta.3'
+    spec.version                  = '0.159.1-beta.12'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
@@ -10,27 +10,20 @@ Pod::Spec.new do |spec|
     spec.libraries                = 'c++'
     spec.ios.deployment_target    = '15.0'
     spec.dependency 'lottie-ios', '4.4.3'
-                
     if !Dir.exist?('build/cocoapods/framework/kits.framework') || Dir.empty?('build/cocoapods/framework/kits.framework')
         raise "
-
         Kotlin framework 'kits' doesn't exist yet, so a proper Xcode project can't be generated.
         'pod install' should be executed after running ':generateDummyFramework' Gradle task:
-
             ./gradlew :compose:generateDummyFramework
-
         Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
     end
-                
     spec.xcconfig = {
         'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
     }
-                
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':compose',
         'PRODUCT_MODULE_NAME' => 'kits',
     }
-                
     spec.script_phases = [
         {
             :name => 'Build compose',
@@ -38,8 +31,8 @@ Pod::Spec.new do |spec|
             :shell_path => '/bin/sh',
             :script => <<-SCRIPT
                 if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
-                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
-                  exit 0
+                    echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                    exit 0
                 fi
                 set -ev
                 REPO_ROOT="$PODS_TARGET_SRCROOT"
@@ -51,4 +44,4 @@ Pod::Spec.new do |spec|
         }
     ]
     spec.resources = ['build/compose/cocoapods/compose-resources']
-end
+end

package/compose/src/androidMain/kotlin/vn/momo/kits/platform/Platform.android.kt

@@ -67,16 +67,17 @@ actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit
 
 @Composable
 actual fun getScreenHeight(): Dp {
-    return getScreenDimensions().height.dp + if (getAndroidBuildVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
+    return getScreenDimensions().height.dp + if (getOSVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
 }
 
-actual fun getAndroidBuildVersion(): Int = Build.VERSION.SDK_INT
+actual fun getOSVersion(): OSVersion = OSVersion.Android(sdk = Build.VERSION.SDK_INT)
 
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
+    placedAsOverlay: Boolean,
     modifier: Modifier
 ) {
     val json = readJson(path)

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

@@ -18,9 +18,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -43,7 +43,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -60,8 +59,9 @@ import vn.momo.kits.modifier.DeprecatedModifier
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.modifier.shadow
 import vn.momo.kits.navigation.component.SnackBar
-import vn.momo.kits.platform.getAndroidBuildVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.utils.getAppStatusBarHeight
+import vn.momo.kits.utils.getNavigationBarHeight
 
 enum class HeaderType {
     DEFAULT,
@@ -103,8 +103,8 @@ fun Screen(
     val keyboardController = LocalSoftwareKeyboardController.current
 
     val isKeyboardVisible = isKeyboardVisible()
-    val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    val bottomPadding = min(indicator, if (isKeyboardVisible) 0.dp else 21.dp)
+    val indicator = getNavigationBarHeight()
+    val bottomPadding = if (isKeyboardVisible) 0.dp else indicator
 
     val headerHeight = if (animatedHeader !== null)
         with(LocalDensity.current) { layoutOffset.roundToPx() }
@@ -135,7 +135,7 @@ fun Screen(
         Box(
             Modifier.fillMaxSize()
                 .background(backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+                .conditional(useAvoidKeyboard && supportsImePadding()) {
                     imePadding()
                 }.then(DeprecatedModifier())
         ) {
@@ -343,7 +343,7 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
             footerHeightPx
     } else {
         with(density) {
-            min(navigationBar, 21.dp).toPx()
+            navigationBar.toPx()
         }
     }.toInt()
 
@@ -401,5 +401,3 @@ fun ScreenSnackBarHost(footerHeightPx: Int) {
 
 
 
-
-

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

@@ -221,6 +221,7 @@ fun Input(
     onBlur: () -> Unit = {},
     loading: Boolean = false,
     required: Boolean = false,
+    maxLength: Int? = null,
     fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
@@ -319,7 +320,10 @@ fun Input(
                         onBlur()
                     }
                 },
-            onValueChange = onChangeText,
+            onValueChange = { newText ->
+                val limitedText = maxLength?.let { newText.take(it) } ?: newText
+                onChangeText(limitedText)
+            },
             decorationBox = { innerTextField ->
                 // Floating label
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {

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

@@ -8,6 +8,7 @@ import androidx.compose.animation.core.rememberInfiniteTransition
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.ui.draw.alpha
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -129,8 +130,11 @@ fun InputOTP(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            decorationBox = { _ ->
+            decorationBox = { innerTextField ->
                 Box {
+                    Box(
+                        modifier = Modifier.fillMaxWidth().height(56.dp).alpha(0f)
+                    ) { innerTextField() }
                     if (floatingValue.isNotEmpty()) {
                         Box(
                             modifier = Modifier.wrapContentSize()

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

@@ -105,6 +105,8 @@ data class InputSearchProps(
     val iconModifier: Modifier = Modifier,
     val onClearPress: () -> Unit = {},
     val leftPosition: Dp? = null,
+    val placeholderCustomRender: (@Composable () -> Unit)? = null,
+    val searchIcon: (@Composable () -> Unit)? = null
 )
 
 @Composable
@@ -145,12 +147,13 @@ fun InputSearch(
         )
     }
 
-    Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier
-        .fillMaxWidth()
-        .height(36.dp)
-        .conditional(IsShowBaseLineDebug) {
-            border(1.dp, Colors.blue_03)
-        }
+    Row(
+        verticalAlignment = Alignment.CenterVertically, modifier = Modifier
+            .fillMaxWidth()
+            .height(36.dp)
+            .conditional(IsShowBaseLineDebug) {
+                border(1.dp, Colors.blue_03)
+            }
     ) {
         BasicTextField(
             enabled = !inputSearchProps.disabled,
@@ -184,13 +187,14 @@ fun InputSearch(
                         horizontalArrangement = Arrangement.Start,
                         verticalAlignment = Alignment.CenterVertically
                     ) {
+
                         Row(
                             modifier = Modifier.padding(
                                 horizontal = Spacing.M
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            Icon(
+                            inputSearchProps.searchIcon?.invoke() ?: Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
                                 size = 24.dp,
@@ -198,13 +202,14 @@ fun InputSearch(
                             )
                             Box(Modifier.weight(1f)) {
                                 if (inputSearchProps.text.value.isEmpty()) {
-                                    Text(
-                                        text = inputSearchProps.placeholder,
-                                        style = placeHolderStyle,
-                                        maxLines = 1,
-                                        color = placeholderColor,
-                                        overflow = TextOverflow.Ellipsis
-                                    )
+                                    inputSearchProps.placeholderCustomRender?.invoke()
+                                        ?: Text(
+                                            text = inputSearchProps.placeholder,
+                                            style = placeHolderStyle,
+                                            maxLines = 1,
+                                            color = placeholderColor,
+                                            overflow = TextOverflow.Ellipsis
+                                        )
                                 }
                                 innerTextField()
                             }

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

@@ -33,7 +33,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 const val DEFAULT_SCREEN_SIZE = 375f
-const val MAX_FONT_SCALE = 1.2f
+const val MAX_FONT_SCALE = 1.5f
 const val MAX_DEVICE_SCALE = 5
 
 @Composable

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

@@ -1,41 +1,18 @@
 package vn.momo.kits.navigation
 
+import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.systemBars
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
-import vn.momo.kits.application.ApplicationContext
-import vn.momo.kits.application.KitConfig
-import vn.momo.kits.application.MiniAppContext
-import vn.momo.kits.application.ScaleSizeMaxRate
-import vn.momo.kits.const.AppNavigationBar
-import vn.momo.kits.const.AppStatusBar
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Theme
-import vn.momo.kits.const.ThemeAssets
-import vn.momo.kits.const.defaultTheme
+import vn.momo.kits.application.*
+import vn.momo.kits.const.*
 import vn.momo.kits.platform.ProvideNavigationEventDispatcherOwner
 import vn.momo.kits.utils.getAppStatusBarHeight
+import vn.momo.kits.utils.getNavigationBarHeight
 import vn.momo.maxapi.IMaxApi
 
 @Composable
@@ -54,11 +31,7 @@ fun NavigationContainer(
     val navController = rememberNavController()
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
-    val navigationBarHeight = if (AppNavigationBar.current == 0.dp) {
-        WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    } else {
-        AppNavigationBar.current
-    }
+    val navigationBarHeight = getNavigationBarHeight()
 
     val parentContext = ApplicationContext.current
     val mergedContext = MiniAppContext.merge(parentContext, applicationContext)

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

@@ -62,7 +62,7 @@ import vn.momo.kits.navigation.component.HeaderRight
 import vn.momo.kits.navigation.component.HeaderType
 import vn.momo.kits.navigation.component.InputSearchType
 import vn.momo.kits.platform.BackHandler
-import vn.momo.kits.platform.getAndroidBuildVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
@@ -166,7 +166,7 @@ internal fun StackScreen(
             .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
                 hideKeyboardOnTap()
             }
-            .conditional(options.keyboardOptions.useAvoidKeyboard && getAndroidBuildVersion() > 29) {
+            .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
                 imePadding()
             }
         ) {
@@ -289,7 +289,7 @@ fun FooterContent(){
         val imeBottom = ime.getBottom(density)
         val thresholdPx = with(density) { 50.dp.toPx() }
         val isKeyboardVisible = imeBottom > thresholdPx
-        val bottomPadding = min(AppNavigationBar.current, if (isKeyboardVisible) 0.dp else 21.dp)
+        val bottomPadding = if (isKeyboardVisible) 0.dp else AppNavigationBar.current
         Footer(footerComponent = options.footerComponent, bottomPadding = bottomPadding)
     }
 }

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

@@ -18,7 +18,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -139,7 +138,7 @@ fun BottomTab(
                     }
                 }
             )
-            Spacer(modifier = Modifier.fillMaxWidth().height(min(AppNavigationBar.current, 21.dp) + Spacing.S).background(AppTheme.current.colors.background.surface))
+            Spacer(modifier = Modifier.fillMaxWidth().height(AppNavigationBar.current + Spacing.S).background(AppTheme.current.colors.background.surface))
         }
     }
 }

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

@@ -19,7 +19,6 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import kotlinx.coroutines.delay
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
@@ -56,7 +55,7 @@ fun SnackBar(
     val footerHeight = if (options.footerComponent != null) {
         footerHeightPxState.value
     } else {
-        with(density){ min(navigationBar, 21.dp).toPx() }
+        with(density){ navigationBar.toPx() }
     }.toInt()
 
     var startPosition by remember { mutableStateOf(Float.MAX_VALUE) }
@@ -129,4 +128,4 @@ fun SnackBar(
             is SnackBar.Toast -> {}
         }
     }
-}
+}

package/compose/src/commonMain/kotlin/vn/momo/kits/platform/Platform.kt

@@ -30,13 +30,26 @@ expect fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit
 @Composable
 expect fun getScreenHeight(): Dp
 
-expect fun getAndroidBuildVersion(): Int
+sealed interface OSVersion {
+    val value: Int
+    data class Android(val sdk: Int) : OSVersion { override val value: Int get() = sdk }
+    data class IOS(val major: Int) : OSVersion { override val value: Int get() = major }
+
+    operator fun compareTo(other: Int): Int = value.compareTo(other)
+}
+expect fun getOSVersion(): OSVersion
+
+fun supportsImePadding(): Boolean = when (val v = getOSVersion()) {
+    is OSVersion.Android -> v.sdk > 29
+    is OSVersion.IOS -> true
+}
 
 @Composable
 expect fun LottieAnimation(
     path: String,
     tintColor: Color? = null,
     bgColor: Color? = null,
+    placedAsOverlay: Boolean = false,
     modifier: Modifier = Modifier
 )
 

package/compose/src/commonMain/kotlin/vn/momo/kits/utils/Utils.kt

@@ -12,7 +12,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.min
+import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
+import vn.momo.kits.platform.getPlatformName
 import kotlin.math.abs
 
 
@@ -86,3 +89,17 @@ fun getAppStatusBarHeight(): Dp {
         AppStatusBar.current
     }
 }
+
+@Composable
+fun getNavigationBarHeight(): Dp {
+    return if (AppNavigationBar.current == 0.dp) {
+        val systemBottomPadding = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
+        if (getPlatformName() == "iOS") {
+            min(systemBottomPadding, 21.dp)
+        } else {
+            systemBottomPadding
+        }
+    } else {
+        AppNavigationBar.current
+    }
+}

package/compose/src/iosMain/kotlin/vn/momo/kits/platform/Platform.ios.kt

@@ -12,17 +12,19 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.interop.UIKitView
 import androidx.compose.ui.semantics.SemanticsPropertyKey
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.UIKitInteropProperties
+import androidx.compose.ui.viewinterop.UIKitView
 import cocoapods.lottie_ios.CompatibleAnimation
 import cocoapods.lottie_ios.CompatibleAnimationKeypath
 import cocoapods.lottie_ios.CompatibleAnimationView
@@ -35,6 +37,7 @@ import org.jetbrains.skia.FilterBlurMode
 import org.jetbrains.skia.MaskFilter
 import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
+import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
 
 actual fun getPlatformName(): String = "iOS"
@@ -84,14 +87,17 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
 }
 
-actual fun getAndroidBuildVersion(): Int = 999
+actual fun getOSVersion(): OSVersion = OSVersion.IOS(
+    major = UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
+)
 
-@OptIn(ExperimentalForeignApi::class)
+@OptIn(ExperimentalForeignApi::class, ExperimentalComposeUiApi::class)
 @Composable
 actual fun LottieAnimation(
     path: String,
     tintColor: Color?,
     bgColor: Color?,
+    placedAsOverlay: Boolean,
     modifier: Modifier
 ) {
     var animation by remember { mutableStateOf<CompatibleAnimation?>(null) }
@@ -109,11 +115,12 @@ actual fun LottieAnimation(
             Box(modifier) {
                 UIKitView(
                     modifier = Modifier.fillMaxSize(),
+                    properties = UIKitInteropProperties(placedAsOverlay = placedAsOverlay),
                     factory = {
                         CompatibleAnimationView(value).apply {
                             translatesAutoresizingMaskIntoConstraints = true
 
-                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                            setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                             setLoopAnimationCount(-1.0)
                             setAnimationSpeed(1.0)
@@ -134,7 +141,7 @@ actual fun LottieAnimation(
                     },
 
                     update = { view ->
-                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.whiteColor)
+                        view.setBackgroundColor(bgColor?.toUIColor() ?: UIColor.clearColor)
 
                         if (tintColor != null) {
                             val uiColor = tintColor.toUIColor()

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.159.1-beta.8
+version=0.159.1-beta.16
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Input/Input.swift

@@ -22,6 +22,7 @@ public struct Input: View {
     public var leadingIconColor: Color
     public var loading: Bool
     public var required: Bool
+    public var maxLength: Int?
     public var fontWeight: InputFontWeight
     public var keyboardType: UIKeyboardType
     public var autofocus: Bool
@@ -52,6 +53,7 @@ public struct Input: View {
         leadingIconColor: Color = Colors.black12,
         loading: Bool = false,
         required: Bool = false,
+        maxLength: Int? = nil,
         fontWeight: InputFontWeight = .regular,
         keyboardType: UIKeyboardType = .default,
         autofocus: Bool = false,
@@ -78,6 +80,7 @@ public struct Input: View {
         self.leadingIconColor = leadingIconColor
         self.loading = loading
         self.required = required
+        self.maxLength = maxLength
         self.fontWeight = fontWeight
         self.keyboardType = keyboardType
         self.autofocus = autofocus
@@ -93,10 +96,10 @@ public struct Input: View {
             get: { self.text },
             set: { newValue in
                 self.text = newValue
-                self.onChangeText?(newValue)
+                self.onChangeText?(limitText(newValue))
             }
         )
-        
+
         VStack(alignment: .leading, spacing: 4) {
             ZStack(alignment: .topLeading) {
                 // Floating label
@@ -142,6 +145,7 @@ public struct Input: View {
                                 fontWeight: fontWeight == .bold ? .bold : .regular,
                                 textColor: UIColor(getTextColor()),
                                 isDisabled: disabled || readOnly,
+                                maxLength: maxLength,
                                 onFocusChange: { focused in
                                     handleFocusChange(focused)
                                 },
@@ -156,6 +160,12 @@ public struct Input: View {
                             .foregroundColor(getTextColor())
                             .disabled(disabled || readOnly)
                             .applyPrimaryCursorColor()
+                            .onChange(of: text) { newValue in
+                                let limited = limitText(newValue)
+                                if limited != newValue {
+                                    text = limited
+                                }
+                            }
                         }
                     }
                     
@@ -239,6 +249,13 @@ public struct Input: View {
         isPasswordHidden.toggle()
         onRightIconPressed?()
     }
+
+    private func limitText(_ value: String) -> String {
+        guard let maxLength = maxLength else {
+            return value
+        }
+        return String(value.prefix(maxLength))
+    }
     
     private func borderColor() -> Color {
         if disabled {
@@ -279,6 +296,7 @@ private struct SecureInputField: UIViewRepresentable {
     var fontWeight: UIFont.Weight
     var textColor: UIColor
     var isDisabled: Bool
+    var maxLength: Int?
     var onFocusChange: (Bool) -> Void
     var onChangeText: ((String) -> Void)?
 
@@ -307,6 +325,7 @@ private struct SecureInputField: UIViewRepresentable {
     }
 
     func updateUIView(_ textField: UITextField, context: Context) {
+        context.coordinator.parent = self
         if textField.text != text {
             textField.text = text
         }
@@ -342,7 +361,7 @@ private struct SecureInputField: UIViewRepresentable {
         }
 
         func textFieldDidEndEditing(_ textField: UITextField) {
-            parent.text = textField.text ?? ""
+            parent.text = limitText(textField.text ?? "")
             parent.onFocusChange(false)
         }
 
@@ -357,7 +376,10 @@ private struct SecureInputField: UIViewRepresentable {
 
         @objc func textFieldDidChange(_ textField: UITextField) {
             if isResettingText { return }
-            let newText = textField.text ?? ""
+            let newText = limitText(textField.text ?? "")
+            if textField.text != newText {
+                textField.text = newText
+            }
             parent.text = newText
             parent.onChangeText?(newText)
         }
@@ -366,6 +388,13 @@ private struct SecureInputField: UIViewRepresentable {
             textField.resignFirstResponder()
             return true
         }
+
+        private func limitText(_ value: String) -> String {
+            guard let maxLength = parent.maxLength else {
+                return value
+            }
+            return String(value.prefix(maxLength))
+        }
     }
 }
 

package/ios/Typography/Text.swift

@@ -2,7 +2,7 @@ import SwiftUI
 
 public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
     let defaultScreenSize: CGFloat = 375
-    let maxFontScale: CGFloat = scaleRate ?? 1.2
+    let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
 
     let deviceWidth = UIScreen.main.bounds.width

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.159.1-beta.8-debug",
+  "version": "0.160.1-beta.10-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},