@momo-kits/native-kits 0.164.1-beta.5-debug → 0.164.1-beta.6-debug

package/compose/build.gradle.kts

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

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

@@ -94,8 +94,6 @@ fun NavigationContainer(
                     setNavigator?.invoke(navigator)
                 }
 
-                SwipeBackHaptic(maxApi)
-
                 // Gesture pops never reach Navigator.dismissScreen(), so prune the registry from
                 // the back stack itself. collectLatest lets a rapid re-push cancel a pending prune.
                 LaunchedEffect(navController, registry) {

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

@@ -4,11 +4,14 @@ 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.NavController
+import androidx.navigation.NavGraph
 import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -79,8 +82,14 @@ 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.
-    internal fun canPop(): Boolean = navController.previousBackStackEntry != null
+    // 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.count { it.destination !is NavGraph } > 1
+    }
 
     fun pop(count: Int = 1, callBack: (() -> Unit)? = null) {
         scope.launch {

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

@@ -169,6 +169,10 @@ 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.
@@ -177,9 +181,13 @@ internal fun StackScreen(
             options.onBackHandler != null ||
             options.headerBackProps.preventBack != null ||
             OverplayComponentRegistry.isOverplayShowing() ||
-            !navigator.canPop()
+            !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() }
 
-    BackHandler(hasCustomBackHandling) { navigator.onBackSafe() }
+    BackHandler(hasCustomBackHandling, onBack)
 
     CompositionLocalProvider(
         StackScreenScrollableState provides options.scrollData.scrollState,

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

@@ -18,7 +18,9 @@ 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
@@ -43,12 +45,14 @@ 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 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.
+ * Kill switch for the swipe-back gesture. Set to `false` to make kit back handling always win,
+ * which disables Android's predictive back drag, without a kit release. It has no effect on iOS —
+ * the host owns the edge gesture there. Screen transitions stay on the parallax curve either way.
  */
 object SwipeBackConfig {
-    var enabled: Boolean = true
+    // 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)
 }
 
 // LinearEasing is mandatory, not a style choice: SeekableTransitionState.seekTo() maps the drag
@@ -106,8 +110,10 @@ internal fun AnimatedVisibilityScope.StackTransitionDecor(
     content: @Composable () -> Unit,
 ) {
     val coordinator = LocalStackTransition.current
-    coordinator.attach(id, isStackRoute)
-    DisposableEffect(coordinator, id) {
+    // 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)
         onDispose { coordinator.detach(id) }
     }
 

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

@@ -17,7 +17,6 @@ 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.backhandler.BackHandler as ComposeBackHandler
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.NativePaint
 import androidx.compose.ui.graphics.toArgb
@@ -39,7 +38,6 @@ import platform.Foundation.NSBundle
 import platform.UIKit.UIColor
 import platform.UIKit.UIDevice
 import platform.UIKit.UIScreen
-import vn.momo.kits.navigation.SwipeBackConfig
 
 actual fun getPlatformName(): String = "iOS"
 
@@ -62,30 +60,14 @@ actual fun getStatusBarHeight(): Dp {
     return WindowInsets.systemBars.asPaddingValues().calculateTopPadding()
 }
 
-// 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
 actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
-    ComposeBackHandler(enabled = enabled, onBack = onBack)
 }
 
 @OptIn(InternalComposeUiApi::class)
 @Composable
 actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit) {
-    val platformOwner = LocalCompatNavigationEventDispatcherOwner.current
-    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. This detached fallback is also what the kill switch falls back to.
-    val fallbackOwner = remember {
+    val navigationEventDispatcherOwner = remember {
         object : NavigationEventDispatcherOwner {
             override val navigationEventDispatcher = NavigationEventDispatcher().apply {
                 isEnabled = false
@@ -94,7 +76,7 @@ actual fun ProvideNavigationEventDispatcherOwner(content: @Composable () -> Unit
     }
 
     CompositionLocalProvider(
-        LocalCompatNavigationEventDispatcherOwner provides fallbackOwner,
+        LocalCompatNavigationEventDispatcherOwner provides navigationEventDispatcherOwner,
         content = content
     )
 }

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.5
+version=0.164.1-beta.6
 
 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.5'
+  s.version          = '0.164.1-beta.6'
   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.5'
+  s.version          = '0.164.1-beta.6'
   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.5-debug",
+  "version": "0.164.1-beta.6-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

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

@@ -1,12 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-
-// No passive observer exists at androidx.activity 1.10.x — a second enabled callback would steal
-// the gesture from NavHost. Android's system back gesture emits its own platform haptic on commit.
-// Revisit if androidx.activity >= 1.12 is adopted; this then becomes a copy of the iOS actual.
-@Composable
-actual fun rememberBackGestureProgress(): State<Float?> = remember { mutableStateOf(null) }

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

@@ -1,39 +0,0 @@
-package vn.momo.kits.navigation
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.snapshotFlow
-import vn.momo.kits.platform.getScreenDimensions
-import vn.momo.kits.platform.rememberBackGestureProgress
-import vn.momo.maxapi.IMaxApi
-
-// RN fires the tick at a flat 100 px of thumb travel; keep it unscaled so the physical distance is
-// the same on every device.
-private const val SWIPE_BACK_HAPTIC_THRESHOLD_DP = 100f
-
-/**
- * Fires one light tick once the back gesture has travelled ~100dp, re-arming when the finger drops
- * back below the threshold. iOS only — [rememberBackGestureProgress] is always `null` on Android.
- */
-@Composable
-internal fun SwipeBackHaptic(maxApi: IMaxApi?) {
-    if (maxApi == null) return
-
-    val progress = rememberBackGestureProgress()
-    val screenWidth = getScreenDimensions().width.toFloat()
-
-    LaunchedEffect(maxApi, screenWidth) {
-        if (screenWidth <= 0f) return@LaunchedEffect
-        val threshold = SWIPE_BACK_HAPTIC_THRESHOLD_DP / screenWidth
-        var isSendHaptic = false
-        snapshotFlow { progress.value }.collect { fraction ->
-            val travelled = fraction ?: 0f
-            if (travelled >= threshold && !isSendHaptic) {
-                runCatching { maxApi.triggerEventVibration("light", callback = null) }
-                isSendHaptic = true
-            } else if (travelled < threshold && isSendHaptic) {
-                isSendHaptic = false
-            }
-        }
-    }
-}

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

@@ -1,15 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-
-/**
- * Progress of an in-flight back gesture as a fraction of the container width, or `null` while no
- * gesture is running. Observing only — it must never consume the gesture, otherwise it would steal
- * it from NavHost.
- *
- * Android always returns `null`: its NavHost runs on `androidx.activity`'s OnBackPressedDispatcher,
- * which exposes progress only to the top-most enabled callback, and that has to stay NavHost's.
- */
-@Composable
-expect fun rememberBackGestureProgress(): State<Float?>

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

@@ -1,35 +0,0 @@
-package vn.momo.kits.platform
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
-import androidx.navigationevent.NavigationEventTransitionState
-
-// NavigationEventDispatcher.transitionState is a passive observer: UIKitNavigationEventInput
-// publishes every edge-pan event to it without any handler consuming the gesture. Its `progress`
-// is touch.x / view width, i.e. a plain fraction of the screen width.
-@OptIn(InternalComposeUiApi::class)
-@Composable
-actual fun rememberBackGestureProgress(): State<Float?> {
-    val dispatcher = LocalCompatNavigationEventDispatcherOwner.current?.navigationEventDispatcher
-    val progress = remember { mutableStateOf<Float?>(null) }
-
-    LaunchedEffect(dispatcher) {
-        if (dispatcher == null) {
-            progress.value = null
-            return@LaunchedEffect
-        }
-        dispatcher.transitionState.collect { state ->
-            progress.value = (state as? NavigationEventTransitionState.InProgress)
-                ?.takeIf { it.direction == NavigationEventTransitionState.TRANSITIONING_BACK }
-                ?.latestEvent
-                ?.progress
-        }
-    }
-
-    return progress
-}