@momo-kits/native-kits 0.162.1-beta.2-debug → 0.162.1-beta.3-debug

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

@@ -88,7 +88,7 @@ data class ComponentInformation(
     val action: String? = null
 )
 
-var IsShowBaseLineDebug = true
+var IsShowBaseLineDebug = false
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
     null

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

@@ -9,7 +9,8 @@ import vn.momo.kits.navigation.component.*
 class Navigation(
     val id: Int = -1,
     val bottomTabIndex: Int = -1,
-    val initOptions: NavigationOptions? = null
+    val initOptions: NavigationOptions? = null,
+    private val registry: DynamicScreenRegistry? = null
 ) {
     private val _options = mutableStateOf(initOptions ?: NavigationOptions())
     val currentOptions: State<NavigationOptions> get() = _options
@@ -56,7 +57,7 @@ class Navigation(
     private fun updateOptions(updated: NavigationOptions) {
         _options.value = updated
         if (bottomTabIndex != -1) setBottomTabOption(bottomTabIndex, updated)
-        if (id != -1) DynamicScreenRegistry.setOptions(id, updated)
+        if (id != -1) registry?.setOptions(id, updated)
     }
 }
 

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

@@ -5,6 +5,7 @@ import androidx.compose.animation.core.tween
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.unit.Dp
+import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -27,10 +28,18 @@ fun NavigationContainer(
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
     config: KitConfig? = null,
-    language: String? = null
+    language: String? = null,
+    onNavigationEvent: ((NavigationEvent) -> Unit)? = null
 ){
     val navController = rememberNavController()
-    val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
+    val registry = remember { DynamicScreenRegistry() }
+    val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry, onNavigationEvent = onNavigationEvent) }
+
+    val recomposeCount = remember { mutableStateOf(0) }
+    SideEffect {
+        recomposeCount.value += 1
+        onNavigationEvent?.invoke(NavigationEvent.ContainerRecompose(recomposeCount.value))
+    }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
 
@@ -50,13 +59,14 @@ fun NavigationContainer(
         }
     }
 
-    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
-    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
+    val screenId = rememberSaveable { registry.nextId() }
+    registry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
+            LocalDynamicScreenRegistry provides registry,
             LocalMaxApi provides maxApi,
             AppTheme provides theme.value,
             AppStatusBar provides statusBarHeight,
@@ -88,7 +98,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -117,7 +127,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -132,10 +142,18 @@ fun NavigationContainer(
         }
     }
 
-    DisposableEffect(Unit) {
+    DisposableEffect(navController) {
+        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
+            val current = registry.getLatestScreen()
+            onNavigationEvent?.invoke(
+                NavigationEvent.DestinationChanged(destination.route, current?.id, current?.name)
+            )
+        }
+        navController.addOnDestinationChangedListener(listener)
         onDispose {
+            navController.removeOnDestinationChangedListener(listener)
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
+            registry.unregisterScreen(screenId)
         }
     }
 }

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

@@ -0,0 +1,53 @@
+package vn.momo.kits.navigation
+
+sealed class NavigationEvent {
+    abstract val label: String
+
+    data class Push(val screenName: String, val id: Int) : NavigationEvent() {
+        override val label get() = "Push(screen=$screenName, id=$id)"
+    }
+
+    data class Replace(val screenName: String, val id: Int) : NavigationEvent() {
+        override val label get() = "Replace(screen=$screenName, id=$id)"
+    }
+
+    data class Pop(val count: Int, val overlayType: OverplayComponentType?) : NavigationEvent() {
+        override val label get() = "Pop(count=$count, overlay=$overlayType)"
+    }
+
+    data class Present(val screenName: String, val id: Int) : NavigationEvent() {
+        override val label get() = "Present(screen=$screenName, id=$id)"
+    }
+
+    data class Reset(val screenName: String, val id: Int) : NavigationEvent() {
+        override val label get() = "Reset(screen=$screenName, id=$id)"
+    }
+
+    data class ShowModal(val parentId: Int, val barrierDismissible: Boolean) : NavigationEvent() {
+        override val label get() = "ShowModal(parentId=$parentId, barrierDismissible=$barrierDismissible)"
+    }
+
+    data class ShowBottomSheet(val parentId: Int, val barrierDismissible: Boolean) : NavigationEvent() {
+        override val label get() = "ShowBottomSheet(parentId=$parentId, barrierDismissible=$barrierDismissible)"
+    }
+
+    data class ShowSnackBar(val parentId: Int) : NavigationEvent() {
+        override val label get() = "ShowSnackBar(parentId=$parentId)"
+    }
+
+    data class DestinationChanged(
+        val route: String?,
+        val id: Int?,
+        val screenName: String?
+    ) : NavigationEvent() {
+        override val label get() = "DestinationChanged(route=$route, id=$id, screen=$screenName)"
+    }
+
+    data class ContainerRecompose(val recomposeCount: Int) : NavigationEvent() {
+        override val label get() = "ContainerRecompose(count=$recomposeCount)"
+    }
+
+    object Dispose : NavigationEvent() {
+        override val label get() = "Dispose"
+    }
+}

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
+import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -25,26 +26,51 @@ import kotlin.time.Duration.Companion.milliseconds
 
 class Navigator(
     private val navController: NavController,
-    private val maxApi: IMaxApi?
+    private val maxApi: IMaxApi?,
+    private val registry: DynamicScreenRegistry,
+    private val onNavigationEvent: ((NavigationEvent) -> Unit)? = null
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
+    private fun emit(event: NavigationEvent) {
+        onNavigationEvent?.invoke(event)
+    }
+
+    /**
+     * The screen currently on top of THIS container's [navController] back stack.
+     *
+     * Use this instead of [DynamicScreenRegistry.getLatestScreen], which returns the globally
+     * last-registered screen across every NavigationContainer. With multiple containers sharing
+     * the single [DynamicScreenRegistry], the global "latest" is not guaranteed to belong to this
+     * navController, so back/dismiss/overlay logic could read the wrong options or unregister the
+     * wrong screen.
+     */
+    private fun currentScreen(): DynamicScreen? {
+        val entry = navController.currentBackStackEntry ?: return null
+        val id = runCatching { entry.toRoute<DynamicScreenRoute>().id }.getOrNull()
+            ?: runCatching { entry.toRoute<DynamicDialogRoute>().id }.getOrNull()
+            ?: return null
+        return registry.getScreen(id)
+    }
+
     fun push(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
+        emit(NavigationEvent.Push(screenName, route.id))
         navController.navigate(DynamicScreenRoute(route.id))
     }
 
     fun replace(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
         if (navController.previousBackStackEntry != null){
-            val latestScreen = DynamicScreenRegistry.getLatestScreen()
-            latestScreen?.let { DynamicScreenRegistry.unregisterScreen(it.id) }
+            val replacedScreen = currentScreen()
+            emit(NavigationEvent.Replace(screenName, replacedScreen?.id ?: -1))
+            replacedScreen?.let { registry.unregisterScreen(it.id) }
             navController.popBackStack()
             push(screenName, content, options)
         }
     }
 
     fun onBackSafe(callBack: (() -> Unit)? = null) {
-        val latestScreen = DynamicScreenRegistry.getLatestScreen()
+        val latestScreen = currentScreen()
         val options = latestScreen?.options
         if (options?.onBackHandler != null) {
             options.onBackHandler.invoke()
@@ -71,6 +97,7 @@ class Navigator(
     }
 
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
+        emit(NavigationEvent.Pop(count, OverplayComponentRegistry.getOverplayType()))
         scope.launch {
             repeat(count) {
                 if (OverplayComponentRegistry.getOverplayType() == OverplayComponentType.SNACK_BAR){
@@ -94,25 +121,28 @@ class Navigator(
 
     private suspend fun dismissScreen() {
         if (navController.previousBackStackEntry != null){
+            // Capture the screen being dismissed BEFORE popping; after popBackStack the current
+            // entry is the revealed screen, so reading it post-pop would unregister the wrong one.
+            val dismissing = currentScreen()
             navController.popBackStack()
             delay(300L.milliseconds)
-            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                DynamicScreenRegistry.unregisterScreen(it1.id)
-            }
+            dismissing?.let { registry.unregisterScreen(it.id) }
         } else {
             maxApi?.dismiss {  }
         }
     }
 
     fun present(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
+        emit(NavigationEvent.Present(screenName, route.id))
         navController.navigate(DynamicDialogRoute(route.id))
     }
 
     fun reset(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        DynamicScreenRegistry.unregisterAll()
+        registry.unregisterAll()
 
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
+        emit(NavigationEvent.Reset(screenName, route.id))
         navController.navigate(DynamicScreenRoute(route.id)) {
             popUpTo(0) { inclusive = true }
         }
@@ -123,7 +153,8 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
+        emit(NavigationEvent.ShowModal(id, barrierDismissible))
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
@@ -134,12 +165,14 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
+        emit(NavigationEvent.ShowBottomSheet(id, barrierDismissible))
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
     }
 
     fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
+        emit(NavigationEvent.ShowSnackBar(id))
         scope.launch {
             OverplayComponentRegistry.registerOverplay(
                 id = id,
@@ -161,6 +194,7 @@ class Navigator(
     }
 
     fun dispose(){
+        emit(NavigationEvent.Dispose)
         scope.cancel()
     }
 }
@@ -182,12 +216,19 @@ data class DynamicScreen(
     var options: NavigationOptions? = null
 )
 
-object DynamicScreenRegistry {
+/**
+ * Per-container store of dynamic screens. Each [NavigationContainer] owns its own instance, so the
+ * number of live containers no longer matters: `getLatestScreen`/`unregisterAll` only ever see the
+ * screens of their own container.
+ *
+ * Ids are still drawn from a process-wide counter so they stay globally unique — this keeps the
+ * still-global [OverplayComponentRegistry] (which keys overlays by screen id) collision-free.
+ */
+class DynamicScreenRegistry {
     private val screens = mutableMapOf<Int, DynamicScreen>()
-    private var idCounter = 1
 
     fun register(screenName: String, content: @Composable () -> Unit, options: NavigationOptions?): DynamicScreenRoute {
-        val id = idCounter++
+        val id = nextGlobalId()
         screens[id] = DynamicScreen(
             id = id,
             name = screenName,
@@ -197,7 +238,7 @@ object DynamicScreenRegistry {
         return DynamicScreenRoute(id)
     }
 
-    fun nextId(): Int = idCounter++
+    fun nextId(): Int = nextGlobalId()
 
     fun bind(id: Int, screenName: String, content: @Composable () -> Unit, options: NavigationOptions?) {
         screens[id] = DynamicScreen(
@@ -206,7 +247,7 @@ object DynamicScreenRegistry {
             content = content,
             options = options
         )
-        if (id >= idCounter) idCounter = id + 1 // keep counter ahead after process-death restore
+        advanceGlobalIdPast(id) // keep counter ahead after process-death restore
     }
 
     fun unregisterScreen(id: Int) {
@@ -229,8 +270,20 @@ object DynamicScreenRegistry {
     fun setOptions(id: Int, options: NavigationOptions){
         screens[id]?.options = options
     }
+
+    companion object {
+        private var globalIdCounter = 1
+
+        private fun nextGlobalId(): Int = globalIdCounter++
+
+        private fun advanceGlobalIdPast(id: Int) {
+            if (id >= globalIdCounter) globalIdCounter = id + 1
+        }
+    }
 }
 
+val LocalDynamicScreenRegistry = staticCompositionLocalOf<DynamicScreenRegistry?> { null }
+
 
 sealed class OverplayComponentParams {
     class Modal(

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

@@ -92,7 +92,8 @@ internal fun StackScreen(
     val context = ApplicationContext.current
     val statusBar = AppStatusBar.current
     val density = LocalDensity.current
-    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions) }
+    val screenRegistry = LocalDynamicScreenRegistry.current
+    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions, registry = screenRegistry) }
 
     val options by navigation.currentOptions
 

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

@@ -5,16 +5,6 @@ import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.InternalResourceApi
 import org.jetbrains.compose.resources.ResourceItem
 import org.jetbrains.compose.resources.readResourceBytes
-
-@OptIn(InternalResourceApi::class)
-@Composable
-internal fun getResource(name: String): DrawableResource {
-    return DrawableResource(
-        "drawable:$name",
-        setOf(ResourceItem(setOf(), "drawable/$name", -1, -1))
-    )
-}
-
 @OptIn(InternalResourceApi::class)
 @Composable
 internal fun readJson(name: String): String {

package/gradle.properties

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.1-beta.2-debug",
+  "version": "0.162.1-beta.3-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},