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

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

@@ -5,7 +5,6 @@ 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
@@ -28,18 +27,11 @@ fun NavigationContainer(
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
     config: KitConfig? = null,
-    language: String? = null,
-    onNavigationEvent: ((NavigationEvent) -> Unit)? = null
+    language: String? = null
 ){
     val navController = rememberNavController()
     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 navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
 
@@ -142,16 +134,8 @@ fun NavigationContainer(
         }
     }
 
-    DisposableEffect(navController) {
-        val listener = NavController.OnDestinationChangedListener { _, destination, _ ->
-            val current = registry.getLatestScreen()
-            onNavigationEvent?.invoke(
-                NavigationEvent.DestinationChanged(destination.route, current?.id, current?.name)
-            )
-        }
-        navController.addOnDestinationChangedListener(listener)
+    DisposableEffect(Unit) {
         onDispose {
-            navController.removeOnDestinationChangedListener(listener)
             navigator.dispose()
             registry.unregisterScreen(screenId)
         }

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

@@ -27,24 +27,10 @@ import kotlin.time.Duration.Companion.milliseconds
 class Navigator(
     private val navController: NavController,
     private val maxApi: IMaxApi?,
-    private val registry: DynamicScreenRegistry,
-    private val onNavigationEvent: ((NavigationEvent) -> Unit)? = null
+    private val registry: DynamicScreenRegistry
 ) {
     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()
@@ -55,18 +41,14 @@ class Navigator(
 
     fun push(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
         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 replacedScreen = currentScreen()
-            emit(NavigationEvent.Replace(screenName, replacedScreen?.id ?: -1))
-            replacedScreen?.let { registry.unregisterScreen(it.id) }
-            navController.popBackStack()
-            push(screenName, content, options)
-        }
+        val replacedScreen = currentScreen()
+        replacedScreen?.let { registry.unregisterScreen(it.id) }
+        navController.popBackStack()
+        push(screenName, content, options)
     }
 
     fun onBackSafe(callBack: (() -> Unit)? = null) {
@@ -97,7 +79,6 @@ 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){
@@ -121,8 +102,6 @@ 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)
@@ -134,7 +113,6 @@ class Navigator(
 
     fun present(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
         val route = registry.register(screenName, content, options)
-        emit(NavigationEvent.Present(screenName, route.id))
         navController.navigate(DynamicDialogRoute(route.id))
     }
 
@@ -142,7 +120,6 @@ class Navigator(
         registry.unregisterAll()
 
         val route = registry.register(screenName, content, options)
-        emit(NavigationEvent.Reset(screenName, route.id))
         navController.navigate(DynamicScreenRoute(route.id)) {
             popUpTo(0) { inclusive = true }
         }
@@ -154,7 +131,6 @@ class Navigator(
         onDismiss: (() -> Unit)? = null
     ){
         val id = currentScreen()?.id ?: -1
-        emit(NavigationEvent.ShowModal(id, barrierDismissible))
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
@@ -166,13 +142,11 @@ class Navigator(
         bottomSheetHeader: BottomHeader? = null
     ){
         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 = currentScreen()?.id ?: -1
-        emit(NavigationEvent.ShowSnackBar(id))
         scope.launch {
             OverplayComponentRegistry.registerOverplay(
                 id = id,
@@ -194,7 +168,6 @@ class Navigator(
     }
 
     fun dispose(){
-        emit(NavigationEvent.Dispose)
         scope.cancel()
     }
 }
@@ -216,14 +189,6 @@ data class DynamicScreen(
     var options: NavigationOptions? = null
 )
 
-/**
- * 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>()
 

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.3
+version=0.162.1-beta.4
 
 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.3-debug",
+  "version": "0.162.1-beta.4-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

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

@@ -1,53 +0,0 @@
-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"
-    }
-}