@momo-kits/native-kits 0.164.1-beta.10-debug → 0.164.1-beta.11-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.164.1-beta.10-debug"
+        version = "0.164.1-beta.11-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.164.1-beta.10-debug'
+    spec.version                  = '0.164.1-beta.11-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -163,8 +163,7 @@ fun NavigationContainer(
                                     id = route.id,
                                     name = screen.name,
                                     content = screen.content,
-                                    navigationOptions = screen.options,
-                                    isDialogRoute = true
+                                    navigationOptions = screen.options
                                 )
                             }
                         }

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

@@ -4,15 +4,11 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
-import androidx.navigation.NavGraph
 import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -83,21 +79,9 @@ class Navigator(
     }
 
     // The swipe-back opt-out predicate in StackScreen needs this: the root screen must keep custom
-    // back handling so it still reaches maxApi.dismiss. It has to read currentBackStack rather than
-    // previousBackStackEntry — the latter walks a plain ArrayDeque, so a composable reading it never
-    // recomposes and the predicate would freeze at the value it had on first composition.
-    @Composable
-    internal fun rememberCanPop(): Boolean {
-        val backStack by navController.currentBackStack.collectAsState()
-        return backStack.hasPoppableEntry()
-    }
-
-    /**
-     * Non-composable twin of [rememberCanPop] for the iOS host: its own back check is mount-based
-     * and so answers `true` even on the mini-app root, where a swipe must dismiss rather than pop.
-     * Reads the StateFlow value directly — correct here precisely because nothing recomposes on it.
-     */
-    fun canPop(): Boolean = navController.currentBackStack.value.hasPoppableEntry()
+    // back handling so it still reaches maxApi.dismiss.
+    // Public: the iOS host asks this to decide whether the kit owns the swipe on this screen.
+    fun canPop(): Boolean = navController.previousBackStackEntry != null
 
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
         scope.launch {
@@ -196,10 +180,6 @@ class Navigator(
     }
 }
 
-// The NavGraph itself sits in the back stack as an entry; only real destinations can be popped.
-private fun List<NavBackStackEntry>.hasPoppableEntry(): Boolean =
-    count { it.destination !is NavGraph } > 1
-
 val LocalNavigator = staticCompositionLocalOf<Navigator> {
     error("No NavigationStack provided")
 }

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

@@ -93,7 +93,6 @@ internal fun StackScreen(
     id: Int = -1,
     name: String = "",
     bottomTabIndex: Int = -1,
-    isDialogRoute: Boolean = false,
     onBackHandler: (() -> Unit)? = null,
 ) {
     val navigator = LocalNavigator.current
@@ -170,29 +169,17 @@ internal fun StackScreen(
         RegisterScrollToTop(navigation.options.scrollData.scrollToTopCallback)
     }
 
-    // Hoisted out of the `||` chain below: short-circuiting would drop the back-stack subscription
-    // whenever an earlier term is true.
-    val canPop = navigator.rememberCanPop()
-
     // Port of RN's `hasCustomBackHandling`: this handler is registered inside the NavHost
     // destination, so while it is enabled it beats NavHost's own predictive-back handler and
     // swallows the swipe. Enable it only when a plain pop is the wrong answer.
-    //
-    // A presented route is one of those cases: NavHost arms predictive back on back-stack size
-    // alone, so a horizontal edge drag over a dialog would seek its *vertical* slide.
     val hasCustomBackHandling = !SwipeBackConfig.enabled ||
             isBottomTabChild ||
-            isDialogRoute ||
             options.onBackHandler != null ||
             options.headerBackProps.preventBack != null ||
             OverplayComponentRegistry.isOverplayShowing() ||
-            !canPop
-
-    // BottomTab supplies a tab-aware handler; falling through to onBackSafe() there would dismiss
-    // the whole mini-app instead of returning to tab 0.
-    val onBack = onBackHandler ?: { navigator.onBackSafe() }
+            !navigator.canPop()
 
-    BackHandler(hasCustomBackHandling, onBack)
+    BackHandler(hasCustomBackHandling) { navigator.onBackSafe() }
 
     CompositionLocalProvider(
         StackScreenScrollableState provides options.scrollData.scrollState,

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

@@ -18,9 +18,7 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.drawBehind
@@ -45,15 +43,12 @@ private const val EDGE_SHADOW_MAX_ALPHA = 0.3f
 private val EDGE_SHADOW_WIDTH = 8.dp
 
 /**
- * Kill switch for the swipe-back gesture. Set to `false` to make kit back handling always win,
- * which disables the predictive-back drag on both platforms — the gesture then pops without
- * following the finger, and fires no haptic. Screen transitions stay on the parallax curve either
- * way.
+ * Kill switch for the swipe-back gesture. Set to `false` to restore pre-DS-760 behaviour (kit
+ * back handling always wins, iOS edge pan inert) without a kit release. Screen transitions stay
+ * on the new parallax curve either way.
  */
 object SwipeBackConfig {
-    // Snapshot-backed so a host toggle takes effect on the next frame instead of waiting for an
-    // unrelated recomposition of StackScreen.
-    var enabled: Boolean by mutableStateOf(true)
+    var enabled: Boolean = true
 }
 
 // LinearEasing is mandatory, not a style choice: SeekableTransitionState.seekTo() maps the drag
@@ -111,10 +106,8 @@ internal fun AnimatedVisibilityScope.StackTransitionDecor(
     content: @Composable () -> Unit,
 ) {
     val coordinator = LocalStackTransition.current
-    // attach() writes state that derivedStateOf { topStackId } reads in the same pass, so it has to
-    // stay out of the composable body.
-    DisposableEffect(coordinator, id, isStackRoute) {
-        coordinator.attach(id, isStackRoute)
+    coordinator.attach(id, isStackRoute)
+    DisposableEffect(coordinator, id) {
         onDispose { coordinator.detach(id) }
     }
 

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

@@ -17,9 +17,7 @@ private const val SWIPE_BACK_HAPTIC_THRESHOLD_DP = 50f
  */
 @Composable
 internal fun SwipeBackHaptic(maxApi: IMaxApi?) {
-    // With the kill switch off the kit's own BackHandler swallows the gesture, so the card never
-    // moves — a tick there would be a phantom.
-    if (maxApi == null || !SwipeBackConfig.enabled) return
+    if (maxApi == null) return
 
     val progress = rememberBackGestureProgress()
     val screenWidth = getScreenDimensions().width.toFloat()

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

@@ -39,7 +39,7 @@ import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
-import vn.momo.kits.navigation.ObserveBackGestureOwnership
+import vn.momo.kits.navigation.SwipeBackConfig
 
 actual fun getPlatformName(): String = "iOS"
 
@@ -62,9 +62,8 @@ actual fun getStatusBarHeight(): Dp {
     return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
 }
 
-// An enabled kit BackHandler is registered inside the NavHost destination, so it out-ranks
-// NavHost's own predictive-back handler and swallows the gesture — that is how a screen opts out
-// of swipe-back (the port of RN's `hasCustomBackHandling`).
+// An enabled kit BackHandler sits innermost and therefore consumes the edge-pan gesture — that is
+// how a screen opts out of swipe-back (the port of RN's `hasCustomBackHandling`).
 @Suppress("DEPRECATION")
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
@@ -76,18 +75,16 @@ actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
 @Composable
 actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit) {
     val platformOwner = LocalCompatNavigationEventDispatcherOwner.current
-    if (platformOwner != null) {
-        // UIKitNavigationEventInput is registered on the scene's dispatcher, and that dispatcher
-        // having enabled handlers is what arms Compose's UIKitBackGestureRecognizer. Providing a
-        // fresh NavigationEventDispatcher() here would shadow it with an input-less one that never
-        // sees a single edge-pan event — no recogniser, and no finger-following seek.
-        ObserveBackGestureOwnership(platformOwner.navigationEventDispatcher)
+    if (platformOwner != null && SwipeBackConfig.enabled) {
+        // UIKitNavigationEventInput is registered on the scene's dispatcher. Providing a fresh
+        // NavigationEventDispatcher() here would shadow it with an input-less one that never sees
+        // a single edge-pan event, enabled or not — so pass the platform owner straight through.
         content()
         return
     }
 
     // Bare UIView hosts have no scene dispatcher, and BackHandler/PredictiveBackHandler error() on
-    // a null owner. Disabled: nothing can feed it, so it exists only to keep those from throwing.
+    // a null owner. This detached fallback is also what the kill switch falls back to.
     val fallbackOwner = remember {
         object : NavigationEventDispatcherOwner {
             override val navigationEventDispatcher = NavigationEventDispatcher().apply {

package/gradle.properties

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

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.164.1-beta.10'
+  s.version          = '0.164.1-beta.11'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.164.1-beta.10'
+  s.version          = '0.164.1-beta.11'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.164.1-beta.10-debug",
+  "version": "0.164.1-beta.11-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ComposeBackGesture.ios.kt

@@ -1,65 +0,0 @@
-package vn.momo.kits.navigation
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
-import androidx.navigationevent.NavigationEventDispatcher
-import androidx.navigationevent.NavigationEventInput
-
-/**
- * Read-only answer to "will Compose consume this back?", for the iOS host.
- *
- * Compose owns the edge-pan gesture through its own `UIKitBackGestureRecognizer`; the host reads
- * this to decide whether to stand down or keep driving its own recogniser, instead of guessing.
- * Nothing here dispatches — [ObserveBackGestureOwnership] only listens.
- *
- * Pair it with [Navigator.canPop]: the mini-app root reports an enabled handler too (it swallows
- * back to reach `maxApi.dismiss`), yet there the host still owns the gesture.
- */
-object ComposeBackGesture {
-    private val observers = mutableListOf<BackHandlerObserver>()
-
-    /** State of the top-most mounted container; `false` when none is mounted. */
-    val hasEnabledHandlers: Boolean
-        get() = observers.lastOrNull()?.hasEnabledHandlers == true
-
-    internal fun attach(observer: BackHandlerObserver) {
-        observers += observer
-    }
-
-    internal fun detach(observer: BackHandlerObserver) {
-        observers -= observer
-    }
-}
-
-/**
- * Publishes one [NavigationContainer]'s back-handling state to [ComposeBackGesture] while composed.
- *
- * Only called for a container whose dispatcher is the scene's — a bare-`UIView` host gets the
- * detached fallback dispatcher, which can never receive an edge pan, so reporting its handlers
- * would tell the host to stand down in favour of a gesture that does not exist.
- */
-@Composable
-internal fun ObserveBackGestureOwnership(dispatcher: NavigationEventDispatcher) {
-    val observer = remember(dispatcher) { BackHandlerObserver() }
-
-    DisposableEffect(dispatcher, observer) {
-        dispatcher.addInput(observer)
-        ComposeBackGesture.attach(observer)
-        onDispose {
-            ComposeBackGesture.detach(observer)
-            dispatcher.removeInput(observer)
-        }
-    }
-}
-
-// A NavigationEventInput that never dispatches: adding an input is the only way to observe the
-// dispatcher's enabled-handler state without registering a handler, which would consume the gesture.
-internal class BackHandlerObserver : NavigationEventInput() {
-    var hasEnabledHandlers: Boolean = false
-        private set
-
-    override fun onHasEnabledHandlersChanged(hasEnabledHandlers: Boolean) {
-        this.hasEnabledHandlers = hasEnabledHandlers
-    }
-}