@momo-kits/native-kits 0.160.1-scrolltotop.20-debug → 0.160.1-scrolltotop.21-debug

package/compose/build.gradle.kts

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

package/compose/src/androidMain/kotlin/vn/momo/kits/navigation/ScrollToTop.android.kt

@@ -3,9 +3,7 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 
 @Composable
-internal actual fun RegisterScrollToTop(navigator: Navigation, callback: (() -> Unit)?) {
-    // No-op on Android: status bar tap doesn't trigger scroll-to-top on this platform.
-}
+internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) = Unit
 
 internal actual fun onNavigatorEntered(navigator: Navigator) = Unit
 internal actual fun onNavigatorExited(navigator: Navigator) = Unit

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

@@ -40,12 +40,6 @@ fun NavigationContainer(
 
     val theme = remember { mutableStateOf(initialTheme) }
 
-
-    LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
-        // Code to run when the screen is resumed
-        onNavigatorEntered(navigator)
-    }
-
     LaunchedEffect(Unit) {
         val headerBar = config?.headerBar
         if (headerBar != null && theme.value.assets.headerBackground == null) {
@@ -140,7 +134,6 @@ fun NavigationContainer(
 
     DisposableEffect(Unit) {
         onDispose {
-            onNavigatorExited(navigator)
             navigator.dispose()
         }
     }

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

@@ -3,7 +3,7 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 
 @Composable
-internal expect fun RegisterScrollToTop(navigator: Navigation, callback: (() -> Unit)?)
+internal expect fun RegisterScrollToTop(callback: (() -> Unit)?)
 
 
 internal expect fun onNavigatorEntered(navigator: Navigator)

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

@@ -150,9 +150,9 @@ internal fun StackScreen(
     val footerHeightPx = remember { mutableIntStateOf(0) }
     val headerRightWidthPx = remember { mutableIntStateOf(0) }
 
-
-    RegisterScrollToTop(navigation, navigation.options?.scrollData?.scrollToTopCallback)
-
+    if (navigation.options.scrollData.scrollToTopCallback != null) {
+        RegisterScrollToTop(navigation.options.scrollData.scrollToTopCallback)
+    }
 
     BackHandler(true) { navigator.onBackSafe() }
 

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

@@ -2,27 +2,12 @@ package vn.momo.kits.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
-import kotlinx.cinterop.BetaInteropApi
-import kotlinx.cinterop.CFunction
-import kotlinx.cinterop.COpaquePointer
-import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.ObjCClass
-import kotlinx.cinterop.reinterpret
-import kotlinx.cinterop.staticCFunction
-import kotlinx.cinterop.toKString
+import kotlinx.cinterop.*
 import platform.Foundation.NSNotification
 import platform.Foundation.NSNotificationCenter
 import platform.Foundation.NSOperationQueue
 import platform.darwin.NSObjectProtocol
-import platform.objc.class_getInstanceMethod
-import platform.objc.class_replaceMethod
-import platform.objc.method_getImplementation
-import platform.objc.method_getTypeEncoding
-import platform.objc.method_setImplementation
-import platform.objc.objc_getClass
-import platform.objc.sel_registerName
+import platform.objc.*
 import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
@@ -31,58 +16,58 @@ private val replacementHandleTap = staticCFunction<COpaquePointer, COpaquePointe
     NSNotificationCenter.defaultCenter.postNotificationName("statusBarSelected", null)
 }
 
-@OptIn(ExperimentalForeignApi::class)
-private var originalHandleTapImp: CPointer<CFunction<() -> Unit>>? = null
-
-private var swizzleInstalled = false
-
 @OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
-private fun installStatusBarSwizzle() {
-    try {
-        if (swizzleInstalled) return
-        // objc_getClass returns Any? in the binding, but the underlying value is
-        // the ObjC Class metaobject — safe to cast to ObjCClass for the other
-        // runtime calls that require it.
-        val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: run {
-            log("swizzle skipped: UIStatusBarManager class not found")
-            return
-        }
-        val selector = sel_registerName("handleTapAction:") ?: run {
-            log("swizzle skipped: handleTapAction: selector unavailable")
-            return
-        }
-        val method = class_getInstanceMethod(cls, selector) ?: run {
-            log("swizzle skipped: handleTapAction: method not found")
-            return
+private object StatusBarSwizzleManager {
+    var originalHandleTapImp: CPointer<CFunction<() -> Unit>>? = null
+    var swizzleInstalled = false
+    var observerCount = 0
+
+    fun install() {
+        try {
+            if (swizzleInstalled) return
+            // objc_getClass returns Any? in the binding, but the underlying value is
+            // the ObjC Class metaobject — safe to cast to ObjCClass for the other
+            // runtime calls that require it.
+            val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: run {
+                log("swizzle skipped: UIStatusBarManager class not found")
+                return
+            }
+            val selector = sel_registerName("handleTapAction:") ?: run {
+                log("swizzle skipped: handleTapAction: selector unavailable")
+                return
+            }
+            val method = class_getInstanceMethod(cls, selector) ?: run {
+                log("swizzle skipped: handleTapAction: method not found")
+                return
+            }
+            // Capture original IMP so we can restore it on uninstall.
+            originalHandleTapImp = method_getImplementation(method)
+            val typeEncoding = method_getTypeEncoding(method)?.toKString()
+            class_replaceMethod(cls, selector, replacementHandleTap.reinterpret(), typeEncoding)
+            swizzleInstalled = true
+            log("UIStatusBarManager handleTapAction: replaced (originalImp captured)")
+        } catch (e: Throwable) {
+            log("install error: ${e.message}")
         }
-        // Capture original IMP so we can restore it on uninstall.
-        originalHandleTapImp = method_getImplementation(method)
-        val typeEncoding = method_getTypeEncoding(method)?.toKString()
-        class_replaceMethod(cls, selector, replacementHandleTap.reinterpret(), typeEncoding)
-        swizzleInstalled = true
-        log("UIStatusBarManager handleTapAction: replaced (originalImp captured)")
-    } catch (e: Throwable) {
-        log("install error: ${e.message}")
     }
-}
 
-@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class)
-private fun uninstallStatusBarSwizzle() {
-    try {
-        if (!swizzleInstalled) return
-        val original = originalHandleTapImp ?: run {
-            log("uninstall skipped: no original IMP captured")
-            return
+    fun uninstall() {
+        try {
+            if (!swizzleInstalled) return
+            val original = originalHandleTapImp ?: run {
+                log("uninstall skipped: no original IMP captured")
+                return
+            }
+            val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: return
+            val selector = sel_registerName("handleTapAction:") ?: return
+            val method = class_getInstanceMethod(cls, selector) ?: return
+            method_setImplementation(method, original)
+            originalHandleTapImp = null
+            swizzleInstalled = false
+            log("UIStatusBarManager handleTapAction: original IMP restored")
+        } catch (e: Throwable) {
+            log("uninstall error: ${e.message}")
         }
-        val cls = objc_getClass("UIStatusBarManager") as? ObjCClass ?: return
-        val selector = sel_registerName("handleTapAction:") ?: return
-        val method = class_getInstanceMethod(cls, selector) ?: return
-        method_setImplementation(method, original)
-        originalHandleTapImp = null
-        swizzleInstalled = false
-        log("UIStatusBarManager handleTapAction: original IMP restored")
-    } catch (e: Throwable) {
-        log("uninstall error: ${e.message}")
     }
 }
 
@@ -93,6 +78,9 @@ private class StatusBarObserver {
         if (token != null) {
             return
         }
+        if (StatusBarSwizzleManager.observerCount == 0) {
+            StatusBarSwizzleManager.install()
+        }
         token = NSNotificationCenter.defaultCenter.addObserverForName(
             name = "statusBarSelected",
             `object` = null,
@@ -101,6 +89,8 @@ private class StatusBarObserver {
             log("statusBar tap notification → ScrollToTopRegistry.trigger()")
             callback?.invoke()
         }
+        StatusBarSwizzleManager.observerCount++
+        log("observerCount acquire ${StatusBarSwizzleManager.observerCount}")
 
     }
 
@@ -108,6 +98,11 @@ private class StatusBarObserver {
         if (token == null) return
         token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
         token = null
+        StatusBarSwizzleManager.observerCount--
+        if (StatusBarSwizzleManager.observerCount == 0) {
+            StatusBarSwizzleManager.uninstall()
+        }
+        log("observerCount release ${StatusBarSwizzleManager.observerCount}")
     }
 }
 
@@ -130,10 +125,8 @@ private fun log(msg: String) = println("${ts()} $TAG $msg")
 
 
 @Composable
-internal actual fun RegisterScrollToTop(navigator: Navigation, callback: (() -> Unit)?) {
-    val token = remember { Any() }
-
-    DisposableEffect(navigator, callback, token) {
+internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) {
+    DisposableEffect(callback) {
         val acquired = callback != null
         val statusBarObserver = StatusBarObserver()
         if (acquired) {
@@ -146,9 +139,9 @@ internal actual fun RegisterScrollToTop(navigator: Navigation, callback: (() ->
 }
 
 internal actual fun onNavigatorEntered(navigator: Navigator) {
-    installStatusBarSwizzle()
+    StatusBarSwizzleManager.install()
 }
 
 internal actual fun onNavigatorExited(navigator: Navigator) {
-    uninstallStatusBarSwizzle()
+    StatusBarSwizzleManager.uninstall()
 }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.160.1-scrolltotop.20
+version=0.160.1-scrolltotop.21
 
 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.160.1-scrolltotop.20-debug",
+  "version": "0.160.1-scrolltotop.21-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},