@momo-kits/native-kits 0.160.1-scrolltotop.12-debug → 0.160.1-scrolltotop.13-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.160.1-scrolltotop.12-debug"
+        version = "0.160.1-scrolltotop.13-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

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

@@ -3,12 +3,33 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+
+private const val TAG = "[ScrollToTop]"
+
+private fun Any.tag(): String = "${this::class.simpleName ?: "Any"}@${hashCode().toString(16)}"
+
+@OptIn(ExperimentalTime::class)
+private fun ts(): String {
+    val ms = Clock.System.now().toEpochMilliseconds()
+    val s = ms / 1000
+    val hh = ((s / 3600) % 24).toString().padStart(2, '0')
+    val mm = ((s / 60) % 60).toString().padStart(2, '0')
+    val ss = (s % 60).toString().padStart(2, '0')
+    val mmm = (ms % 1000).toString().padStart(3, '0')
+    return "$hh:$mm:$ss.$mmm"
+}
+
+private fun log(msg: String) = println("${ts()} $TAG $msg")
 
 actual fun onNavigatorEntered(navigator: Navigator) {
+    log("onNavigatorEntered owner=${navigator.tag()}")
     ScrollToTopRegistry.pushOwner(navigator)
 }
 
 actual fun onNavigatorExited(navigator: Navigator) {
+    log("onNavigatorExited owner=${navigator.tag()}")
     ScrollToTopRegistry.removeOwner(navigator)
 }
 
@@ -17,11 +38,16 @@ internal actual fun RegisterScrollToTop(navigator: Navigator, callback: (() -> U
     val token = remember { Any() }
     DisposableEffect(navigator, callback) {
         if (callback != null) {
+            log("RegisterScrollToTop push owner=${navigator.tag()} token=${token.tag()}")
             ScrollToTopRegistry.push(navigator, token, callback)
         } else {
+            log("RegisterScrollToTop remove(callback=null) owner=${navigator.tag()} token=${token.tag()}")
+            ScrollToTopRegistry.remove(navigator, token)
+        }
+        onDispose {
+            log("RegisterScrollToTop dispose owner=${navigator.tag()} token=${token.tag()}")
             ScrollToTopRegistry.remove(navigator, token)
         }
-        onDispose { ScrollToTopRegistry.remove(navigator, token) }
     }
 }
 
@@ -42,39 +68,57 @@ object ScrollToTopRegistry {
     private val ownerStack = mutableListOf<Any>()
 
     fun pushOwner(owner: Any) {
-        ownerStack.remove(owner)
+        val existed = ownerStack.remove(owner)
         ownerStack.add(owner)
+        log("pushOwner owner=${owner.tag()} reorder=$existed ownerStack=${ownerStack.size} state=${dump()}")
     }
 
     fun removeOwner(owner: Any) {
-        ownerStack.remove(owner)
-        stacksByOwner.remove(owner)
+        val removedFromStack = ownerStack.remove(owner)
+        val removedScreens = stacksByOwner.remove(owner)?.size ?: 0
+        log("removeOwner owner=${owner.tag()} removedFromStack=$removedFromStack droppedScreens=$removedScreens state=${dump()}")
     }
 
     internal fun push(owner: Any, token: Any, callback: () -> Unit) {
         val stack = stacksByOwner.getOrPut(owner) { mutableListOf() }
         val idx = stack.indexOfFirst { it.token === token }
         if (idx >= 0) {
-            // Same screen, callback changed (e.g. via setOptions) — replace in place
-            // so we don't reorder the per-owner stack.
             stack[idx] = Entry(token, callback)
+            log("push(update) owner=${owner.tag()} token=${token.tag()} idx=$idx size=${stack.size} state=${dump()}")
         } else {
             stack.add(Entry(token, callback))
+            log("push(new) owner=${owner.tag()} token=${token.tag()} size=${stack.size} state=${dump()}")
         }
     }
 
     internal fun remove(owner: Any, token: Any) {
-        stacksByOwner[owner]?.removeAll { it.token === token }
+        val stack = stacksByOwner[owner]
+        val before = stack?.size ?: 0
+        val removed = stack?.removeAll { it.token === token } ?: false
+        log("remove owner=${owner.tag()} token=${token.tag()} removed=$removed size=${before}->${stack?.size ?: 0} state=${dump()}")
     }
 
     fun trigger() {
-        val owner = ownerStack.lastOrNull() ?: run {
-            // Fallback: no owner registered yet — fire the only owner if there's exactly one.
+        val owner = ownerStack.lastOrNull()
+        if (owner == null) {
             if (stacksByOwner.size == 1) {
-                stacksByOwner.values.first().lastOrNull()?.callback?.invoke()
+                val only = stacksByOwner.entries.first()
+                val cb = only.value.lastOrNull()?.callback
+                log("trigger(fallback singleOwner) owner=${only.key.tag()} hasCallback=${cb != null}")
+                cb?.invoke()
+            } else {
+                log("trigger NO-OP (no owner, owners=${stacksByOwner.size}) state=${dump()}")
             }
             return
         }
-        stacksByOwner[owner]?.lastOrNull()?.callback?.invoke()
+        val cb = stacksByOwner[owner]?.lastOrNull()?.callback
+        log("trigger owner=${owner.tag()} hasCallback=${cb != null} state=${dump()}")
+        cb?.invoke()
+    }
+
+    private fun dump(): String {
+        val owners = ownerStack.joinToString(",") { it.tag() }
+        val stacks = stacksByOwner.entries.joinToString(",") { (o, s) -> "${o.tag()}:${s.size}" }
+        return "ownerStack=[$owners] stacks={$stacks}"
     }
 }

package/example/ios/Example.xcodeproj/xcuserdata/thanhle.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict />
+</plist>

package/example/ios/Example.xcworkspace/xcuserdata/thanhle.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict />
+</plist>

package/gradle.properties

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

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Jun 17 09:25:26 ICT 2025
+sdk.dir=/Users/thanhle/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.160.1-scrolltotop.12-debug",
+  "version": "0.160.1-scrolltotop.13-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},