@momo-kits/native-kits 0.160.1-scrolltotop.15-debug → 0.160.1-scrolltotop.17-debug

package/compose/build.gradle.kts

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

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

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

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

@@ -216,6 +216,10 @@ object DynamicScreenRegistry {
     fun setOptions(id: Int, options: NavigationOptions){
         screens[id]?.options = options
     }
+
+    fun scrollToTop() {
+        getLatestScreen()?.options?.scrollData?.scrollToTopCallback?.invoke()
+    }
 }
 
 

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

@@ -4,15 +4,3 @@ import androidx.compose.runtime.Composable
 
 @Composable
 internal expect fun RegisterScrollToTop(navigator: Navigator, callback: (() -> Unit)?)
-
-/**
- * Call when a Navigator becomes the active (visually topmost) one — e.g. from
- * `ComposeNavigatorManager.push`. Android: no-op.
- */
-expect fun onNavigatorEntered(navigator: Navigator)
-
-/**
- * Call when a Navigator is no longer active — e.g. from
- * `ComposeNavigatorManager.removeLast`. Android: no-op.
- */
-expect fun onNavigatorExited(navigator: Navigator)

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

@@ -3,9 +3,129 @@ 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 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 kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalForeignApi::class)
+private val replacementHandleTap = staticCFunction<COpaquePointer, COpaquePointer, COpaquePointer?, Unit> { _, _, _ ->
+    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
+        }
+        // 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
+        }
+        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}")
+    }
+}
+
+
+private object StatusBarObserver {
+    private var token: NSObjectProtocol? = null
+    private var refCount = 0
+
+    fun acquire() {
+        refCount++
+        if (token != null) {
+            log("acquire (already installed) refCount=$refCount")
+            return
+        }
+        installStatusBarSwizzle()
+        token = NSNotificationCenter.defaultCenter.addObserverForName(
+            name = "statusBarSelected",
+            `object` = null,
+            queue = NSOperationQueue.mainQueue,
+        ) { _: NSNotification? ->
+            log("statusBar tap notification → ScrollToTopRegistry.trigger()")
+            DynamicScreenRegistry.scrollToTop()
+        }
+        log("StatusBarObserver installed refCount=$refCount")
+    }
+
+    fun release() {
+        if (refCount <= 0) {
+            log("release ignored (refCount already 0)")
+            return
+        }
+        refCount--
+        if (refCount > 0) {
+            log("release refCount=$refCount")
+            return
+        }
+        token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
+        token = null
+        uninstallStatusBarSwizzle()
+        log("StatusBarObserver uninstalled refCount=0")
+    }
+}
+
 private const val TAG = "[ScrollToTop]"
 
 private fun Any.tag(): String = "${this::class.simpleName ?: "Any"}@${hashCode().toString(16)}"
@@ -23,102 +143,76 @@ private fun ts(): String {
 
 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)
-}
 
 @Composable
 internal actual fun RegisterScrollToTop(navigator: Navigator, callback: (() -> Unit)?) {
     val token = remember { Any() }
     DisposableEffect(navigator, callback) {
-        if (callback != null) {
+        val acquired = callback != null
+        if (acquired) {
+            StatusBarObserver.acquire()
             log("RegisterScrollToTop push owner=${navigator.tag()} token=${token.tag()}")
-            ScrollToTopRegistry.push(navigator, token, callback)
+//            ScrollToTopRegistry.push(navigator, token, callback)
         } else {
             log("RegisterScrollToTop remove(callback=null) owner=${navigator.tag()} token=${token.tag()}")
-            ScrollToTopRegistry.remove(navigator, token)
+//            ScrollToTopRegistry.remove(navigator, token)
         }
         onDispose {
             log("RegisterScrollToTop dispose owner=${navigator.tag()} token=${token.tag()}")
-            ScrollToTopRegistry.remove(navigator, token)
+//            ScrollToTopRegistry.remove(navigator, token)
+            if (acquired) StatusBarObserver.release()
         }
     }
 }
 
-/**
- * iOS-only scroll-to-top dispatch.
- *
- * Per-Navigator stack of screen callbacks, plus a module-level stack of owners
- * (Navigators). The host project's Navigator-of-Navigators (e.g.
- * `ComposeNavigatorManager`) must call [pushOwner] / [removeOwner] when its
- * top Navigator changes, so [trigger] hits the visually topmost screen.
- *
- * Call [trigger] from Swift on status-bar tap.
- */
-object ScrollToTopRegistry {
-    private data class Entry(val token: Any, val callback: () -> Unit)
-
-    private val stacksByOwner = mutableMapOf<Any, MutableList<Entry>>()
-    private val ownerStack = mutableListOf<Any>()
-
-    fun pushOwner(owner: Any) {
-        val existed = ownerStack.remove(owner)
-        ownerStack.add(owner)
-        log("pushOwner owner=${owner.tag()} reorder=$existed ownerStack=${ownerStack.size} state=${dump()}")
-    }
-
-    fun removeOwner(owner: Any) {
-        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) {
-            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) {
-        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()
-        if (owner == null) {
-            if (stacksByOwner.size == 1) {
-                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
-        }
-        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}"
-    }
-}
+//object ScrollToTopRegistry {
+//    private data class Entry(val token: Any, val callback: () -> Unit)
+//
+//    private val stacksByOwner = mutableMapOf<Any, MutableList<Entry>>()
+//    private val ownerStack = mutableListOf<Any>()
+//
+//
+//    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) {
+//            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) {
+//        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()
+//        if (owner == null) {
+//            if (stacksByOwner.size == 1) {
+//                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
+//        }
+//        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/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.15
+version=0.160.1-scrolltotop.17
 
 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.15-debug",
+  "version": "0.160.1-scrolltotop.17-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/ios/Extensions/ScrollToTop.swift

@@ -1,94 +0,0 @@
-//
-//  ScrollToTop.swift
-//  
-//
-//  Created by Thành Lê on 26/5/26.
-//
-import Foundation
-import SwiftUI
-import Combine
-extension UIStatusBarManager {
-    public static var statusBarTappedNotification: Notification.Name = {
-        if let originalMethod = class_getInstanceMethod(UIStatusBarManager.self, Selector(("handleTapAction:"))),
-           let swizzledMethod = class_getInstanceMethod(UIStatusBarManager.self, #selector(_handleTapAction)) {
-            method_exchangeImplementations(originalMethod, swizzledMethod)
-        }
-        return .init("statusBarSelected")
-    }()
-    
-    @objc private func _handleTapAction(_ action: Any?) {
-        _handleTapAction(action) // Call the original implementation
-        NotificationCenter.default.post(name: UIStatusBarManager.statusBarTappedNotification, object: nil)
-    }
-}
-
-public struct StatusBarTapModifier: ViewModifier {
-
-    let action: () -> Void
-
-    @State private var observer: AnyCancellable?
-
-    public init(action: @escaping () -> Void) {
-        self.action = action
-    }
-
-    public func body(content: Content) -> some View {
-        content
-            .onAppear {
-                observer = NotificationCenter.default
-                    .publisher(for: UIStatusBarManager.statusBarTappedNotification)
-                    .sink { _ in
-                        action()
-                    }
-            }
-            .onDisappear {
-                observer = nil
-            }
-    }
-}
-
-extension View {
-    public func onStatusBarTap(_ action: @escaping () -> Void) -> some View {
-        modifier(StatusBarTapModifier(action: action))
-    }
-}
-
-extension UIViewController {
-
-    private static var statusBarTapActionKey: UInt8 = 0
-    private static var statusBarTapObserverKey: UInt8 = 0
-
-    private var statusBarTapAction: (() -> Void)? {
-        get { objc_getAssociatedObject(self, &Self.statusBarTapActionKey) as? () -> Void }
-        set { objc_setAssociatedObject(self, &Self.statusBarTapActionKey, newValue, .OBJC_ASSOCIATION_COPY_NONATOMIC) }
-    }
-
-    private var statusBarTapObserver: NSObjectProtocol? {
-        get { objc_getAssociatedObject(self, &Self.statusBarTapObserverKey) as? NSObjectProtocol }
-        set { objc_setAssociatedObject(self, &Self.statusBarTapObserverKey, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC) }
-    }
-
-    /// Register a callback fired when the user taps the status bar / notch.
-    /// Host app wires `action` to its scroll-to-top bridge (e.g. Navigation.scrollData.scrollToTopCallback).
-    public func registerStatusBarTap(_ action: @escaping () -> Void) {
-        unregisterStatusBarTap()
-        statusBarTapAction = action
-        statusBarTapObserver = NotificationCenter.default.addObserver(
-            forName: UIStatusBarManager.statusBarTappedNotification,
-            object: nil,
-            queue: .main
-        ) { [weak self] _ in
-            self?.statusBarTapAction?()
-        }
-    }
-
-    public func unregisterStatusBarTap() {
-        if let observer = statusBarTapObserver {
-            NotificationCenter.default.removeObserver(observer)
-        }
-        statusBarTapObserver = nil
-        statusBarTapAction = nil
-    }
-}
-
-