@momo-kits/native-kits 0.164.1-beta.17-debug → 0.164.1-beta.18-debug

package/compose/build.gradle.kts

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

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

@@ -10,3 +10,7 @@ import androidx.compose.runtime.remember
 // 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) }
+
+// No host-owned edge recogniser on Android: the system back gesture drives NavHost directly, so
+// there is nothing to hand over.
+actual fun reportFloatingArrowBack(shouldUse: Boolean) = Unit

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

@@ -8,12 +8,14 @@ import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppTheme
@@ -24,6 +26,7 @@ import vn.momo.kits.navigation.LocalNavigator
 import vn.momo.kits.navigation.NavigationOptions
 import vn.momo.kits.navigation.StackScreen
 import vn.momo.kits.navigation.component.HeaderType
+import vn.momo.kits.platform.reportFloatingArrowBack
 
 private var bottomTabOptionItems : MutableList<NavigationOptions?> = mutableListOf()
 internal fun setBottomTabOption(index: Int, options: NavigationOptions){
@@ -59,6 +62,22 @@ fun BottomTab(
         )
     }
 
+    /**
+     * Matches the React Native side. On the first tab the host replays its drag into NavHost and
+     * the stack transition seeks as usual. On any other tab it must not: every tab lives inside
+     * this one stack card, so seeking it would take them all instead of returning to the first
+     * tab, which is what `onBackHandler` below does. Hand that case to the host's floating-arrow
+     * interaction rather than leaving the swipe to do the wrong thing.
+     */
+    val currentRoute = navController.currentBackStackEntryAsState().value?.destination?.route
+    val isFirstTab = currentRoute == null || currentRoute == "option0"
+
+    DisposableEffect(isFirstTab) {
+        reportFloatingArrowBack(!isFirstTab)
+        // the flag lives on the host and would otherwise outlive the tabs that asked for it
+        onDispose { reportFloatingArrowBack(false) }
+    }
+
     Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
         Box(modifier = Modifier
             .fillMaxSize()

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

@@ -13,3 +13,12 @@ import androidx.compose.runtime.State
  */
 @Composable
 expect fun rememberBackGestureProgress(): State<Float?>
+
+/**
+ * Reports whether the host should run its floating-arrow back instead of the seeked stack
+ * transition. Set while a bottom tab other than the first one is showing.
+ *
+ * Android is a no-op: its NavHost pops through `androidx.activity`'s dispatcher and there is no
+ * host interaction to hand the gesture to.
+ */
+expect fun reportFloatingArrowBack(shouldUse: Boolean)

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

@@ -38,6 +38,18 @@ object HostBackGestureBridge {
     val hasEnabledHandlers: Boolean
         get() = attachedInputs.lastOrNull()?.hasEnabledHandlers == true
 
+    /**
+     * Whether the host should run its floating-arrow interaction instead of replaying the drag
+     * here. Set while a bottom tab other than the first one is showing: every tab lives inside a
+     * single stack card, so seeking that card would take all of them with it rather than
+     * returning to the first tab. Read it when the recogniser begins — the kit keeps it current.
+     *
+     * Mirrors `MiniAppModule.setShouldUseFloatingArrowBack` on the React Native side, so both
+     * stacks hand the same case to the same host interaction.
+     */
+    var shouldUseFloatingArrowBack: Boolean = false
+        internal set
+
     /** Begins a drag. Pairs with exactly one [completed] or [cancelled]. */
     fun started() {
         val input = attachedInputs.lastOrNull() ?: return

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

@@ -8,6 +8,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.InternalComposeUiApi
 import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.navigationevent.NavigationEventTransitionState
+import vn.momo.kits.navigation.HostBackGestureBridge
 
 // NavigationEventDispatcher.transitionState is a passive observer: UIKitNavigationEventInput
 // publishes every edge-pan event to it without any handler consuming the gesture. Its `progress`
@@ -33,3 +34,9 @@ actual fun rememberBackGestureProgress(): State<Float?> {
 
     return progress
 }
+
+// The host pulls this when its recogniser begins, so a plain assignment is enough -- no dispatch,
+// no observer. Kept next to the progress observer since both are the same host contract.
+actual fun reportFloatingArrowBack(shouldUse: Boolean) {
+    HostBackGestureBridge.shouldUseFloatingArrowBack = shouldUse
+}

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.17
+version=0.164.1-beta.18
 
 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.17'
+  s.version          = '0.164.1-beta.18'
   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.17'
+  s.version          = '0.164.1-beta.18'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.164.1-beta.17-debug",
+  "version": "0.164.1-beta.18-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},
   "license": "MoMo"
-}
+}