@momo-kits/native-kits 0.160.1-searchinput.2-debug → 0.160.1-test.1-debug

package/.claude/settings.local.json

@@ -0,0 +1,15 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(yarn react-native:*)",
+      "Read(//Users/phuc/.claude/skills/ai-skill-generator/**)",
+      "Bash(python3 scripts/install_skill.py --update)",
+      "Bash(cd /Users/phuc/momo-kits/.claude/skills/design-system-kits && mkdir -p .claude/skills/design-system-kits && mv SKILL.md README.md references .claude/skills/design-system-kits/)",
+      "Bash(mv .claude/skills/design-system-kits/* . && rmdir .claude/skills/design-system-kits && rmdir .claude/skills)",
+      "WebFetch(domain:via.placeholder.com)",
+      "WebFetch(domain:image.tmdb.org)",
+      "WebFetch(domain:placehold.co)",
+      "WebFetch(domain:dummyimage.com)"
+    ]
+  }
+}

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-searchinput.2-debug"
+        version = "0.160.1-test.1-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.159.1-beta.7'
+    spec.version                  = '0.159.1-beta.12'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -70,13 +70,14 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp + if (getOSVersion() >= 35) 0.dp else AppStatusBar.current + AppNavigationBar.current
 }
 
-actual fun getOSVersion(): 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

@@ -59,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.getOSVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.utils.getAppStatusBarHeight
+import vn.momo.kits.utils.getNavigationBarHeight
 
 enum class HeaderType {
     DEFAULT,
@@ -102,7 +103,7 @@ fun Screen(
     val keyboardController = LocalSoftwareKeyboardController.current
 
     val isKeyboardVisible = isKeyboardVisible()
-    val indicator = getAppStatusBarHeight()
+    val indicator = getNavigationBarHeight()
     val bottomPadding = if (isKeyboardVisible) 0.dp else indicator
 
     val headerHeight = if (animatedHeader !== null)
@@ -134,7 +135,7 @@ fun Screen(
         Box(
             Modifier.fillMaxSize()
                 .background(backgroundColor ?: AppTheme.current.colors.background.default)
-                .conditional(useAvoidKeyboard && getOSVersion() > 29) {
+                .conditional(useAvoidKeyboard && supportsImePadding()) {
                     imePadding()
                 }.then(DeprecatedModifier())
         ) {

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

@@ -105,8 +105,6 @@ 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
@@ -147,13 +145,12 @@ 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,
@@ -187,14 +184,13 @@ fun InputSearch(
                         horizontalArrangement = Arrangement.Start,
                         verticalAlignment = Alignment.CenterVertically
                     ) {
-
                         Row(
                             modifier = Modifier.padding(
                                 horizontal = Spacing.M
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
-                            inputSearchProps.searchIcon?.invoke() ?: Icon(
+                            Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
                                 size = 24.dp,
@@ -202,14 +198,13 @@ fun InputSearch(
                             )
                             Box(Modifier.weight(1f)) {
                                 if (inputSearchProps.text.value.isEmpty()) {
-                                    inputSearchProps.placeholderCustomRender?.invoke()
-                                        ?: Text(
-                                            text = inputSearchProps.placeholder,
-                                            style = placeHolderStyle,
-                                            maxLines = 1,
-                                            color = placeholderColor,
-                                            overflow = TextOverflow.Ellipsis
-                                        )
+                                    Text(
+                                        text = inputSearchProps.placeholder,
+                                        style = placeHolderStyle,
+                                        maxLines = 1,
+                                        color = placeholderColor,
+                                        overflow = TextOverflow.Ellipsis
+                                    )
                                 }
                                 innerTextField()
                             }

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

@@ -49,7 +49,7 @@ fun NavigationContainer(
         }
     }
 
-    val startDestination = DynamicScreenRegistry.register(initialScreenName, initialScreen, options)
+    val startDestination = remember { DynamicScreenRegistry.register(initialScreenName, initialScreen, options) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(

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

@@ -28,6 +28,13 @@ class Navigator(
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
+    internal var currentScreenId: Int = -1
+        private set
+
+    internal fun setCurrentScreenId(id: Int) {
+        currentScreenId = id
+    }
+
     fun push(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
         val route = DynamicScreenRegistry.register(screenName, content, options)
         navController.navigate(DynamicScreenRoute(route.id))
@@ -122,7 +129,9 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED START: use per-Navigator currentScreenId; fall back to global registry if not yet set
+        val id = currentScreenId.takeIf { it != -1 } ?: DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED END: use per-Navigator currentScreenId; fall back to global registry if not yet set
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
@@ -133,12 +142,16 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED START: use per-Navigator currentScreenId; fall back to global registry if not yet set
+        val id = currentScreenId.takeIf { it != -1 } ?: DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED END: use per-Navigator currentScreenId; fall back to global registry if not yet set
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
     }
 
     fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED START: use per-Navigator currentScreenId; fall back to global registry if not yet set
+        val id = currentScreenId.takeIf { it != -1 } ?: DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        // AI-GENERATED END: use per-Navigator currentScreenId; fall back to global registry if not yet set
         scope.launch {
             OverplayComponentRegistry.registerOverplay(
                 id = id,

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.getOSVersion
+import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
@@ -90,6 +90,12 @@ internal fun StackScreen(
     val density = LocalDensity.current
     val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions) }
 
+    if (bottomTabIndex == -1) {
+        LaunchedEffect(id) {
+            navigator.setCurrentScreenId(id)
+        }
+    }
+
     val options by navigation.currentOptions
 
     // Auto tracking state
@@ -166,7 +172,7 @@ internal fun StackScreen(
             .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
                 hideKeyboardOnTap()
             }
-            .conditional(options.keyboardOptions.useAvoidKeyboard && getOSVersion() > 29) {
+            .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
                 imePadding()
             }
         ) {

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 getOSVersion(): 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/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
@@ -85,16 +87,17 @@ actual fun getScreenHeight(): Dp {
     return getScreenDimensions().height.dp
 }
 
-actual fun getOSVersion(): Int {
-    return UIDevice.currentDevice.systemVersion.substringBefore(".").toIntOrNull() ?: 0
-}
+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) }
@@ -112,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)
@@ -137,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.160.1-test.1
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Thu Oct 02 17:53:13 ICT 2025
+sdk.dir=/Users/phuc/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-searchinput.2-debug",
+  "version": "0.160.1-test.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},