@momo-kits/native-kits 0.160.1-scrolltotop.18-debug → 0.160.1-scrolltotop.19-debug

package/compose/build.gradle.kts

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

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

@@ -3,6 +3,9 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 
 @Composable
-internal actual fun RegisterScrollToTop(navigator: Navigator, callback: (() -> Unit)?) {
+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 onNavigatorEntered(navigator: Navigator) = Unit
+internal actual fun onNavigatorExited(navigator: Navigator) = Unit

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

@@ -27,7 +27,7 @@ fun NavigationContainer(
     statusBarHeight: Dp? = null,
     config: KitConfig? = null,
     language: String? = null
-){
+) {
     val navController = rememberNavController()
     val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
@@ -39,6 +39,7 @@ fun NavigationContainer(
     val theme = remember { mutableStateOf(initialTheme) }
 
     LaunchedEffect(Unit) {
+        onNavigatorEntered(navigator)
         val headerBar = config?.headerBar
         if (headerBar != null && theme.value.assets.headerBackground == null) {
             theme.value = theme.value.copy(
@@ -47,6 +48,7 @@ fun NavigationContainer(
                 )
             )
         }
+
     }
 
     val startDestination = DynamicScreenRegistry.register(initialScreenName, initialScreen, options)
@@ -131,6 +133,7 @@ fun NavigationContainer(
 
     DisposableEffect(Unit) {
         onDispose {
+            onNavigatorExited(navigator)
             navigator.dispose()
         }
     }

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavController
+import androidx.navigation.toRoute
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

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

@@ -3,4 +3,9 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 
 @Composable
-internal expect fun RegisterScrollToTop(navigator: Navigator, callback: (() -> Unit)?)
+internal expect fun RegisterScrollToTop(navigator: Navigation, callback: (() -> Unit)?)
+
+
+internal expect fun onNavigatorEntered(navigator: Navigator)
+
+internal expect fun onNavigatorExited(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) }
 
-    options.scrollData.scrollToTopCallback?.let { cb ->
-        RegisterScrollToTop(navigator, cb)
-    }
+
+    RegisterScrollToTop(navigation, navigation.options?.scrollData?.scrollToTopCallback)
+
 
     BackHandler(true) { navigator.onBackSafe() }
 
@@ -164,15 +164,16 @@ internal fun StackScreen(
         LocalFooterHeightPx provides footerHeightPx,
         LocalHeaderRightWidthPx provides headerRightWidthPx
     ) {
-        Box(Modifier
-            .fillMaxSize()
-            .background(options.backgroundColor ?: AppTheme.current.colors.background.default)
-            .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
-                hideKeyboardOnTap()
-            }
-            .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
-                imePadding()
-            }
+        Box(
+            Modifier
+                .fillMaxSize()
+                .background(options.backgroundColor ?: AppTheme.current.colors.background.default)
+                .conditional(options.keyboardOptions.keyboardShouldPersistTaps) {
+                    hideKeyboardOnTap()
+                }
+                .conditional(options.keyboardOptions.useAvoidKeyboard && supportsImePadding()) {
+                    imePadding()
+                }
         ) {
             Box(Modifier.zIndex(1f)) {
                 HeaderBackground()
@@ -182,7 +183,7 @@ internal fun StackScreen(
                 Header(onBackHandler)
             }
 
-            Column (Modifier.zIndex(6f)) {
+            Column(Modifier.zIndex(6f)) {
                 SearchAnimated(isScrollInProgress = scrollInProcess)
             }
 
@@ -194,7 +195,7 @@ internal fun StackScreen(
                 FooterContent()
             }
 
-            Box(Modifier.zIndex(7f)){
+            Box(Modifier.zIndex(7f)) {
                 FloatingContent()
             }
 
@@ -204,15 +205,15 @@ internal fun StackScreen(
 }
 
 @Composable
-fun FloatingContent(){
+fun FloatingContent() {
     val options = LocalOptions.current
     val density = LocalDensity.current
     val footerHeightPx = LocalFooterHeightPx.current
     val scrollState = LocalScrollState.current
 
     val fabProps = options.floatingButtonProps ?: return
-    val bottomPadding = fabProps.bottom ?:
-    (Spacing.M + if (options.footerComponent != null) with(density){ footerHeightPx.intValue.toDp() } else 0.dp)
+    val bottomPadding = fabProps.bottom
+        ?: (Spacing.M + if (options.footerComponent != null) with(density) { footerHeightPx.intValue.toDp() } else 0.dp)
 
     FloatingButton(
         scrollPosition = fabProps.scrollState?.value ?: scrollState.value,
@@ -228,17 +229,19 @@ fun FloatingContent(){
 }
 
 @Composable
-fun ColumnScope.MainContent(content: @Composable ()-> Unit){
+fun ColumnScope.MainContent(content: @Composable () -> Unit) {
     val options = LocalOptions.current
     val inputSearchType = getInputSearchType(options)
     val density = LocalDensity.current
     val scrollState = LocalScrollState.current
 
-    Spacer(Modifier.height(
-        if (options.headerType is HeaderType.DefaultOrExtended || (options.headerType is HeaderType.Transparent && !options.headerType.isFullScreenContent))
-            AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp)
+    Spacer(
+        Modifier.height(
+            if (options.headerType is HeaderType.DefaultOrExtended || (options.headerType is HeaderType.Transparent && !options.headerType.isFullScreenContent))
+                AppStatusBar.current + HEADER_HEIGHT.dp else 0.dp
+        )
     )
-    if (inputSearchType == InputSearchType.Animated){
+    if (inputSearchType == InputSearchType.Animated) {
         val scrollDp = with(density) { scrollState.value.toDp() }
 
         val animatedTopPadding by animateDpAsState(
@@ -247,17 +250,18 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
         )
         Spacer(Modifier.height(animatedTopPadding))
     }
-    Column (Modifier
-        .fillMaxWidth()
-        .weight(1f)
-        .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
-            verticalScroll(scrollState)
-        }
+    Column(
+        Modifier
+            .fillMaxWidth()
+            .weight(1f)
+            .conditional(options.scrollData.scrollable && options.scrollData.scrollState is ScrollState) {
+                verticalScroll(scrollState)
+            }
     ) {
         ScreenContent(content = content)
     }
 
-    if (options.footerComponent != null){
+    if (options.footerComponent != null) {
         val footerHeight = LocalFooterHeightPx.current
         val footerHeightDp = with(density) { footerHeight.value.toDp() }
         Spacer(Modifier.height(footerHeightDp))
@@ -265,17 +269,17 @@ fun ColumnScope.MainContent(content: @Composable ()-> Unit){
 }
 
 @Composable
-fun ScreenContent(content: @Composable () -> Unit){
+fun ScreenContent(content: @Composable () -> Unit) {
     val scrollState = LocalScrollState.current
     val options = LocalOptions.current
 
-    if (options.headerType is HeaderType.Animated){
+    if (options.headerType is HeaderType.Animated) {
         val animatedHeader = options.headerType
         Box {
-            Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)){
+            Box(Modifier.fillMaxWidth().aspectRatio(animatedHeader.aspectRatio.value)) {
                 animatedHeader.composable.invoke(scrollState.value)
             }
-            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)){
+            Box(Modifier.offset(x = 0.dp, y = AppStatusBar.current + HEADER_HEIGHT.dp + animatedHeader.layoutOffSet)) {
                 content()
             }
         }
@@ -285,9 +289,9 @@ fun ScreenContent(content: @Composable () -> Unit){
 }
 
 @Composable
-fun FooterContent(){
+fun FooterContent() {
     val options = LocalOptions.current
-    if (options.footerComponent != null){
+    if (options.footerComponent != null) {
         val ime = WindowInsets.ime
         val density = LocalDensity.current
         val imeBottom = ime.getBottom(density)
@@ -299,11 +303,11 @@ fun FooterContent(){
 }
 
 @Composable
-fun OverplayView(bottomTabIndex: Int, id: Int){
+fun OverplayView(bottomTabIndex: Int, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
-        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 8f).fillMaxSize()){
+        Box(Modifier.zIndex(if (overplayType == OverplayComponentType.SNACK_BAR) 3f else 8f).fillMaxSize()) {
             if (bottomTabIndex != -1) return@Box
             if (OverplayComponentRegistry.currentRootId() != id) return@Box
             OverplayComponentRegistry.OverlayComponent()
@@ -326,22 +330,24 @@ fun Footer(footerComponent: @Composable (() -> Unit)?, bottomPadding: Dp) {
     Box(Modifier.onGloballyPositioned {
         if (footerHeightPx.intValue != it.size.height) footerHeightPx.intValue = it.size.height
     }) {
-        Box(Modifier
-            .fillMaxWidth()
-            .background(AppTheme.current.colors.background.surface)
-            .conditional(IsShowBaseLineDebug) {
-                border(1.dp, Colors.blue_03)
-            }
-            .padding(top = Spacing.S, start = Spacing.M, end = Spacing.M, bottom = bottomPadding + Spacing.S)
-        ){
+        Box(
+            Modifier
+                .fillMaxWidth()
+                .background(AppTheme.current.colors.background.surface)
+                .conditional(IsShowBaseLineDebug) {
+                    border(1.dp, Colors.blue_03)
+                }
+                .padding(top = Spacing.S, start = Spacing.M, end = Spacing.M, bottom = bottomPadding + Spacing.S)
+        ) {
             footerComponent.invoke()
         }
 
-        Box(modifier = Modifier
-            .fillMaxWidth()
-            .height(6.dp)
-            .offset(x = 0.dp, y = (-6).dp)
-            .background(shadowBrush)
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(6.dp)
+                .offset(x = 0.dp, y = (-6).dp)
+                .background(shadowBrush)
         )
     }
 }
@@ -351,6 +357,7 @@ data class InputSearchLayoutParams(
     val startPadding: Dp,
     val endPadding: Dp
 )
+
 @Composable
 fun SearchAnimated(
     isScrollInProgress: Boolean
@@ -465,6 +472,7 @@ internal fun isKeyboardVisible(): Boolean {
     val density = LocalDensity.current
     return ime.getBottom(density) > 0
 }
+
 private fun quantize(value: Int, stepPx: Int): Int {
     if (stepPx <= 1) return value
     return (value / stepPx) * stepPx
@@ -544,13 +552,14 @@ internal val LocalOptions = staticCompositionLocalOf<NavigationOptions> { error(
 
 val StackScreenScrollableState = staticCompositionLocalOf<ScrollableState?> { null }
 
-internal fun getInputSearchType(options: NavigationOptions): InputSearchType{
+internal fun getInputSearchType(options: NavigationOptions): InputSearchType {
     return when (val headerType = options.headerType) {
         is HeaderType.DefaultOrExtended -> when {
             headerType.inputSearchProps == null -> InputSearchType.None
             headerType.useAnimated -> InputSearchType.Animated
             else -> InputSearchType.Header
         }
+
         else -> InputSearchType.None
     }
 }

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

@@ -87,42 +87,27 @@ private fun uninstallStatusBarSwizzle() {
 }
 
 
-private object StatusBarObserver {
+private class StatusBarObserver {
     private var token: NSObjectProtocol? = null
-    private var refCount = 0
-
-    fun acquire() {
-        refCount++
+    fun acquire(callback: (() -> Unit)?) {
         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()
+            callback?.invoke()
         }
-        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
-        }
+        if (token == null) return
         token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
         token = null
-        uninstallStatusBarSwizzle()
-        log("StatusBarObserver uninstalled refCount=0")
     }
 }
 
@@ -144,75 +129,26 @@ private fun ts(): String {
 private fun log(msg: String) = println("${ts()} $TAG $msg")
 
 
-
 @Composable
-internal actual fun RegisterScrollToTop(navigator: Navigator, callback: (() -> Unit)?) {
+internal actual fun RegisterScrollToTop(navigator: Navigation, callback: (() -> Unit)?) {
     val token = remember { Any() }
-    DisposableEffect(navigator, callback) {
+
+    DisposableEffect(navigator, callback, token) {
         val acquired = callback != null
+        val statusBarObserver = StatusBarObserver()
         if (acquired) {
-            StatusBarObserver.acquire()
-            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)
+            statusBarObserver.acquire { callback?.invoke() }
         }
         onDispose {
-            log("RegisterScrollToTop dispose owner=${navigator.tag()} token=${token.tag()}")
-//            ScrollToTopRegistry.remove(navigator, token)
-            if (acquired) StatusBarObserver.release()
+            if (acquired) statusBarObserver.release()
         }
     }
 }
 
-//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}"
-//    }
-//}
+internal actual fun onNavigatorEntered(navigator: Navigator) {
+    installStatusBarSwizzle()
+}
+
+internal actual fun onNavigatorExited(navigator: Navigator) {
+    uninstallStatusBarSwizzle()
+}

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.18
+version=0.160.1-scrolltotop.19
 
 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.18-debug",
+  "version": "0.160.1-scrolltotop.19-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},