@momo-kits/native-kits 0.162.2-beta.1-debug → 0.162.2-beta.15-debug

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

@@ -41,7 +41,7 @@ import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Typography
 import vn.momo.kits.navigation.tracking.ScreenTracker
@@ -73,7 +73,7 @@ internal fun BottomSheet(
     val coroutineScope = rememberCoroutineScope()
 
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     DisposableEffect(Unit) {
         ScreenTracker.trackPopupDisplayed(

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

@@ -10,11 +10,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
@@ -22,7 +18,7 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.IsShowBaseLineDebug
 import vn.momo.kits.const.Colors
 import vn.momo.kits.modifier.conditional
@@ -44,7 +40,7 @@ internal fun ModalScreen(
     val coroutineScope = rememberCoroutineScope()
 
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
 
     DisposableEffect(Unit) {
         ScreenTracker.trackPopupDisplayed(

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

@@ -1,24 +1,16 @@
 package vn.momo.kits.navigation
 
 import androidx.compose.foundation.gestures.ScrollableState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
 import vn.momo.kits.navigation.bottomtab.setBottomTabOption
-import vn.momo.kits.navigation.component.FloatingButtonProps
-import vn.momo.kits.navigation.component.HeaderBackProps
-import vn.momo.kits.navigation.component.HeaderRight
-import vn.momo.kits.navigation.component.HeaderTitle
-import vn.momo.kits.navigation.component.HeaderType
-import vn.momo.kits.navigation.component.TitlePosition
+import vn.momo.kits.navigation.component.*
 
 class Navigation(
     val id: Int = -1,
     val bottomTabIndex: Int = -1,
-    val initOptions: NavigationOptions? = null
+    val initOptions: NavigationOptions? = null,
+    private val registry: DynamicScreenRegistry? = null
 ) {
     private val _options = mutableStateOf(initOptions ?: NavigationOptions())
     val currentOptions: State<NavigationOptions> get() = _options
@@ -65,7 +57,7 @@ class Navigation(
     private fun updateOptions(updated: NavigationOptions) {
         _options.value = updated
         if (bottomTabIndex != -1) setBottomTabOption(bottomTabIndex, updated)
-        if (id != -1) DynamicScreenRegistry.setOptions(id, updated)
+        if (id != -1) registry?.setOptions(id, updated)
     }
 }
 
@@ -95,8 +87,6 @@ data class KeyboardOptions(
     val keyboardShouldPersistTaps: Boolean = false,
     val useAvoidKeyboard: Boolean = true
 )
-
-
 data class ScrollData(
     val scrollable: Boolean = true,
     val scrollState: ScrollableState? = null,

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

@@ -22,52 +22,52 @@ fun NavigationContainer(
     initialScreen: @Composable () -> Unit,
     options: NavigationOptions? = null,
     initialTheme: Theme = defaultTheme,
-    applicationContext: MiniAppContext? = null,
+    miniAppContext: MiniAppContext? = null,
     maxApi: IMaxApi? = null,
     setNavigator: ((Navigator) -> Unit)? = null,
     statusBarHeight: Dp? = null,
-    config: KitConfig? = null,
-    language: String? = null
+    localize: Localize? = null,
 ){
     val navController = rememberNavController()
-    val navigator = remember { Navigator(navController = navController, maxApi = maxApi) }
+    val registry = remember { DynamicScreenRegistry() }
+    val navigator = remember { Navigator(navController = navController, maxApi = maxApi, registry = registry) }
     val statusBarHeight = statusBarHeight ?: getAppStatusBarHeight()
     val navigationBarHeight = getNavigationBarHeight()
 
-    val parentContext = ApplicationContext.current
-    val mergedContext = MiniAppContext.merge(parentContext, applicationContext)
+    val parentContext = LocalContext.current
+    val mergedContext = MiniAppContext.merge(parentContext, miniAppContext)
 
     val theme = remember { mutableStateOf(initialTheme) }
+    val fallbackLocalize = remember { Localize() }
 
-    LaunchedEffect(Unit) {
-        val headerBar = config?.headerBar
-        if (headerBar != null && theme.value.assets.headerBackground == null) {
-            theme.value = theme.value.copy(
-                assets = ThemeAssets(
-                    headerBackground = headerBar
-                )
-            )
+    val resolvedLocalize = localize ?: fallbackLocalize
+
+    LaunchedEffect(maxApi, resolvedLocalize) {
+        val api = maxApi ?: return@LaunchedEffect
+        runCatching {
+            api.getLanguage(callback = { data ->
+                if (parseLanguage(data) == Localize.EN) {
+                    resolvedLocalize.changeLanguage(Localize.EN)
+                }
+            })
         }
     }
 
-    val screenId = rememberSaveable { DynamicScreenRegistry.nextId() }
-    DynamicScreenRegistry.bind(screenId, initialScreenName, initialScreen, options)
+    val screenId = rememberSaveable { registry.nextId() }
+    registry.bind(screenId, initialScreenName, initialScreen, options)
     val startDestination = remember(screenId) { DynamicScreenRoute(screenId) }
 
     ProvideNavigationEventDispatcherOwner {
         CompositionLocalProvider(
             LocalNavigator provides navigator,
+            LocalDynamicScreenRegistry provides registry,
             LocalMaxApi provides maxApi,
             AppTheme provides theme.value,
             AppStatusBar provides statusBarHeight,
             AppNavigationBar provides navigationBarHeight,
-            ApplicationContext provides mergedContext,
-            AppConfig provides config,
-            AppLanguage provides language,
-            ScaleSizeMaxRate provides mergedContext?.scaleSizeMaxRate,
-            FollowOSScale provides mergedContext?.followOSScale,
-            FontSizeRatio provides mergedContext?.fontSizeRatio,
-        ) {
+            LocalContext provides mergedContext,
+            LocalLocalize provides resolvedLocalize,
+            ) {
             LaunchedEffect(Unit) {
                 setNavigator?.invoke(navigator)
             }
@@ -90,7 +90,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicScreenRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -119,7 +119,7 @@ fun NavigationContainer(
                     }
                 ) { backStackEntry ->
                     val route = backStackEntry.toRoute<DynamicDialogRoute>()
-                    val screen = DynamicScreenRegistry.getScreen(route.id)
+                    val screen = registry.getScreen(route.id)
 
                     if (screen != null) {
                         StackScreen(
@@ -137,7 +137,7 @@ fun NavigationContainer(
     DisposableEffect(Unit) {
         onDispose {
             navigator.dispose()
-            DynamicScreenRegistry.unregisterScreen(screenId)
+            registry.unregisterScreen(screenId)
         }
     }
 }
@@ -145,3 +145,10 @@ fun NavigationContainer(
 val LocalMaxApi = staticCompositionLocalOf<IMaxApi?> {
     error("No MaxApi provided")
 }
+
+private fun parseLanguage(raw: Map<String, Any?>?): String? {
+    val code = (raw?.get("response") as? String)?.trim()?.lowercase()
+    if (code.isNullOrEmpty()) return null
+    return if (code.startsWith(Localize.EN)) Localize.EN else Localize.VI
+}
+

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
@@ -21,30 +22,38 @@ import vn.momo.kits.components.PopupNotify
 import vn.momo.kits.navigation.BottomHeader.*
 import vn.momo.kits.navigation.component.SnackBar
 import vn.momo.maxapi.IMaxApi
+import kotlin.time.Duration.Companion.milliseconds
 
 class Navigator(
     private val navController: NavController,
-    private val maxApi: IMaxApi?
+    private val maxApi: IMaxApi?,
+    private val registry: DynamicScreenRegistry
 ) {
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
 
+    private fun currentScreen(): DynamicScreen? {
+        val entry = navController.currentBackStackEntry ?: return null
+        val id = runCatching { entry.toRoute<DynamicScreenRoute>().id }.getOrNull()
+            ?: runCatching { entry.toRoute<DynamicDialogRoute>().id }.getOrNull()
+            ?: return null
+        return registry.getScreen(id)
+    }
+
     fun push(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicScreenRoute(route.id))
     }
 
     fun replace(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        if (navController.previousBackStackEntry != null){
-            val latestScreen = DynamicScreenRegistry.getLatestScreen()
-            latestScreen?.let { DynamicScreenRegistry.unregisterScreen(it.id) }
-            navController.popBackStack()
-            push(screenName, content, options)
-        }
+        val replacedScreen = currentScreen()
+        replacedScreen?.let { registry.unregisterScreen(it.id) }
+        navController.popBackStack()
+        push(screenName, content, options)
     }
 
     fun onBackSafe(callBack: (() -> Unit)? = null) {
-        val latestScreen = DynamicScreenRegistry.getLatestScreen()
-        val options = latestScreen?.options
+        val currentScreen = currentScreen()
+        val options = currentScreen?.options
         if (options?.onBackHandler != null) {
             options.onBackHandler.invoke()
             return
@@ -87,31 +96,30 @@ class Navigator(
     }
     private suspend fun dismissOverplay(isDelay: Boolean = true) {
         OverplayComponentRegistry.clear()
-        if (isDelay) delay(300L)
+        if (isDelay) delay(300L.milliseconds)
         OverplayComponentRegistry.hardClearAfterDismiss()
     }
 
     private suspend fun dismissScreen() {
         if (navController.previousBackStackEntry != null){
+            val dismissing = currentScreen()
             navController.popBackStack()
-            delay(300L)
-            DynamicScreenRegistry.getLatestScreen()?.let { it1 ->
-                DynamicScreenRegistry.unregisterScreen(it1.id)
-            }
+            delay(300L.milliseconds)
+            dismissing?.let { registry.unregisterScreen(it.id) }
         } else {
             maxApi?.dismiss {  }
         }
     }
 
     fun present(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicDialogRoute(route.id))
     }
 
     fun reset(screenName: String, content: @Composable () -> Unit, options: NavigationOptions? = null) {
-        DynamicScreenRegistry.unregisterAll()
+        registry.unregisterAll()
 
-        val route = DynamicScreenRegistry.register(screenName, content, options)
+        val route = registry.register(screenName, content, options)
         navController.navigate(DynamicScreenRoute(route.id)) {
             popUpTo(0) { inclusive = true }
         }
@@ -122,7 +130,7 @@ class Navigator(
         barrierDismissible: Boolean = true,
         onDismiss: (() -> Unit)? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.MODAL, false, barrierDismissible, onDismiss)
     }
 
@@ -133,12 +141,12 @@ class Navigator(
         onDismiss: (() -> Unit)? = null,
         bottomSheetHeader: BottomHeader? = null
     ){
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         OverplayComponentRegistry.registerOverplay(id, content, OverplayComponentType.BOTTOM_SHEET, isSurface, barrierDismissible, onDismiss, bottomSheetHeader)
     }
 
     fun showSnackBar(snackBar: SnackBar, onDismiss: (() -> Unit)? = null) {
-        val id = DynamicScreenRegistry.getLatestScreen()?.id ?: -1
+        val id = currentScreen()?.id ?: -1
         scope.launch {
             OverplayComponentRegistry.registerOverplay(
                 id = id,
@@ -154,7 +162,7 @@ class Navigator(
     fun hideSnackBar() {
         scope.launch {
             OverplayComponentRegistry.clear()
-            delay(250L)
+            delay(250L.milliseconds)
             OverplayComponentRegistry.hardClearAfterDismiss()
         }
     }
@@ -181,12 +189,11 @@ data class DynamicScreen(
     var options: NavigationOptions? = null
 )
 
-object DynamicScreenRegistry {
+class DynamicScreenRegistry {
     private val screens = mutableMapOf<Int, DynamicScreen>()
-    private var idCounter = 1
 
     fun register(screenName: String, content: @Composable () -> Unit, options: NavigationOptions?): DynamicScreenRoute {
-        val id = idCounter++
+        val id = nextGlobalId()
         screens[id] = DynamicScreen(
             id = id,
             name = screenName,
@@ -196,7 +203,7 @@ object DynamicScreenRegistry {
         return DynamicScreenRoute(id)
     }
 
-    fun nextId(): Int = idCounter++
+    fun nextId(): Int = nextGlobalId()
 
     fun bind(id: Int, screenName: String, content: @Composable () -> Unit, options: NavigationOptions?) {
         screens[id] = DynamicScreen(
@@ -205,17 +212,13 @@ object DynamicScreenRegistry {
             content = content,
             options = options
         )
-        if (id >= idCounter) idCounter = id + 1 // keep counter ahead after process-death restore
+        advanceGlobalIdPast(id) // keep counter ahead after process-death restore
     }
 
     fun unregisterScreen(id: Int) {
         screens.remove(id)
     }
 
-    fun getLatestScreen(): DynamicScreen?{
-        return screens.entries.lastOrNull()?.value
-    }
-
     fun unregisterAll(){
         val ids = screens.keys.toList()
         for (id in ids) {
@@ -228,8 +231,20 @@ object DynamicScreenRegistry {
     fun setOptions(id: Int, options: NavigationOptions){
         screens[id]?.options = options
     }
+
+    companion object {
+        private var globalIdCounter = 1
+
+        private fun nextGlobalId(): Int = globalIdCounter++
+
+        private fun advanceGlobalIdPast(id: Int) {
+            if (id >= globalIdCounter) globalIdCounter = id + 1
+        }
+    }
 }
 
+val LocalDynamicScreenRegistry = staticCompositionLocalOf<DynamicScreenRegistry?> { null }
+
 
 sealed class OverplayComponentParams {
     class Modal(
@@ -244,7 +259,7 @@ sealed class OverplayComponentParams {
         val bottomSheetHeader: BottomHeader? = null,
     ) : OverplayComponentParams()
 
-    class SnackBar() : OverplayComponentParams()
+    class SnackBar : OverplayComponentParams()
 }
 
 data class OverplayComponent(
@@ -308,7 +323,7 @@ object OverplayComponentRegistry {
     }
 
     @Composable
-    fun OverlayComponent(){
+    internal fun OverlayComponent(){
         val overplay = currentOverlayComponent.value ?: return
 
         when (val params = overplay.params) {

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

@@ -45,8 +45,8 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.min
 import androidx.compose.ui.zIndex
+import kotlinx.coroutines.flow.Flow
 import vn.momo.kits.components.InputSearch
 import vn.momo.kits.const.AppNavigationBar
 import vn.momo.kits.const.AppStatusBar
@@ -69,8 +69,9 @@ import vn.momo.kits.platform.supportsImePadding
 import vn.momo.kits.navigation.tracking.ScreenTracker
 import vn.momo.kits.navigation.tracking.ScreenTrackingState
 import kotlinx.coroutines.delay
-import vn.momo.kits.application.ApplicationContext
+import vn.momo.kits.application.LocalContext
 import kotlin.time.Clock
+import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.ExperimentalTime
 
 internal val LocalFooterHeightPx = staticCompositionLocalOf { mutableIntStateOf(0) }
@@ -88,17 +89,18 @@ internal fun StackScreen(
 ) {
     val navigator = LocalNavigator.current
     val maxApi = LocalMaxApi.current
-    val context = ApplicationContext.current
+    val context = LocalContext.current
     val statusBar = AppStatusBar.current
     val density = LocalDensity.current
-    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions) }
+    val screenRegistry = LocalDynamicScreenRegistry.current
+    val navigation = remember { Navigation(id = id, bottomTabIndex = bottomTabIndex, initOptions = navigationOptions, registry = screenRegistry) }
 
     val options by navigation.currentOptions
 
     // Auto tracking state
     val trackingState = remember {
         ScreenTrackingState().apply {
-            startTime = Clock.System.now().toEpochMilliseconds()
+            time = Clock.System.now().toEpochMilliseconds()
         }
     }
 
@@ -119,8 +121,8 @@ internal fun StackScreen(
         )
 
         // Track screen displayed after 2 seconds (debounce)
-        delay(2000)
-        val loadTime = Clock.System.now().toEpochMilliseconds() - trackingState.startTime
+        delay(2000.milliseconds)
+        val loadTime = Clock.System.now().toEpochMilliseconds() - trackingState.time
         ScreenTracker.trackScreenDisplayed(
             maxApi = maxApi,
             context = context,
@@ -130,7 +132,7 @@ internal fun StackScreen(
         )
 
         // Track screen interacted after displayed
-        val interactionTime = Clock.System.now().toEpochMilliseconds() - trackingState.startTime
+        val interactionTime = Clock.System.now().toEpochMilliseconds() - trackingState.time
         ScreenTracker.trackScreenInteracted(
             maxApi = maxApi,
             context = context,
@@ -204,8 +206,9 @@ internal fun StackScreen(
     }
 }
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun FloatingContent() {
+internal fun FloatingContent() {
     val options = LocalOptions.current
     val density = LocalDensity.current
     val footerHeightPx = LocalFooterHeightPx.current
@@ -229,7 +232,7 @@ fun FloatingContent() {
 }
 
 @Composable
-fun ColumnScope.MainContent(content: @Composable () -> Unit) {
+internal fun ColumnScope.MainContent(content: @Composable () -> Unit) {
     val options = LocalOptions.current
     val inputSearchType = getInputSearchType(options)
     val density = LocalDensity.current
@@ -264,7 +267,7 @@ fun ColumnScope.MainContent(content: @Composable () -> Unit) {
 }
 
 @Composable
-fun ScreenContent(content: @Composable () -> Unit) {
+internal fun ScreenContent(content: @Composable () -> Unit) {
     val scrollState = LocalScrollState.current
     val options = LocalOptions.current
 
@@ -284,7 +287,7 @@ fun ScreenContent(content: @Composable () -> Unit) {
 }
 
 @Composable
-fun FooterContent() {
+internal fun FooterContent() {
     val options = LocalOptions.current
     if (options.footerComponent != null) {
         val keyboardSize = keyboardSizeState()
@@ -294,13 +297,13 @@ fun FooterContent() {
 }
 
 @Composable
-fun keyboardSizeState(): State<Dp> {
+internal fun keyboardSizeState(): State<Dp> {
     val bottom = WindowInsets.ime.asPaddingValues()
     return rememberUpdatedState(bottom.calculateBottomPadding())
 }
 
 @Composable
-fun OverplayView(bottomTabIndex: Int, id: Int) {
+internal fun OverplayView(bottomTabIndex: Int, id: Int) {
     val overplayType = OverplayComponentRegistry.getOverplayType()
 
     if (overplayType != null) {
@@ -355,8 +358,9 @@ data class InputSearchLayoutParams(
     val endPadding: Dp
 )
 
+@Suppress("FrequentlyChangingValue")
 @Composable
-fun SearchAnimated(
+internal fun SearchAnimated(
     isScrollInProgress: Boolean
 ) {
     val scrollState = LocalScrollState.current
@@ -469,64 +473,61 @@ private fun quantize(value: Int, stepPx: Int): Int {
 }
 
 @Composable
-fun LazyListState.proxyScrollState(
+internal fun LazyListState.proxyScrollState(
     thresholdPx: Int = 200,
     stepPx: Int = 4
-): Pair<ScrollState, Boolean> {
-    val scrollState = rememberScrollState()
-    val locked = remember { mutableStateOf(false) }
-
-    LaunchedEffect(this, scrollState, thresholdPx, stepPx) {
-        snapshotFlow { firstVisibleItemIndex to firstVisibleItemScrollOffset }
-            .collect { (index, offset) ->
-                val rawTarget = if (index == 0) offset else SCROLLED_PAST_FIRST_ITEM_THRESHOLD
-                val shouldLock = rawTarget > thresholdPx
-                if (locked.value != shouldLock) locked.value = shouldLock
-
-                val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
-
-                if (scrollState.value != desired) {
-                    scrollState.scrollTo(desired.coerceAtLeast(0))
-                }
-            }
-    }
-
-    val inProgress = remember { mutableStateOf(false) }
-    LaunchedEffect(this, thresholdPx) {
-        snapshotFlow { isScrollInProgress }
-            .collect { progressing ->
-                inProgress.value = if (locked.value) false else progressing
-            }
-    }
-
-    return scrollState to inProgress.value
-}
+): Pair<ScrollState, Boolean> = proxyScroll(
+    source = this,
+    thresholdPx = thresholdPx,
+    stepPx = stepPx,
+    isScrollInProgress = { isScrollInProgress },
+    rawTargetFlow = {
+        snapshotFlow {
+            if (firstVisibleItemIndex == 0) firstVisibleItemScrollOffset
+            else SCROLLED_PAST_FIRST_ITEM_THRESHOLD
+        }
+    },
+)
 
 @Composable
-fun ScrollState.proxyLimitedScrollState(
+internal fun ScrollState.proxyLimitedScrollState(
     thresholdPx: Int = 200,
     stepPx: Int = 4
+): Pair<ScrollState, Boolean> = proxyScroll(
+    source = this,
+    thresholdPx = thresholdPx,
+    stepPx = stepPx,
+    isScrollInProgress = { isScrollInProgress },
+    rawTargetFlow = { snapshotFlow { value } },
+)
+
+@Composable
+private fun proxyScroll(
+    source: Any,
+    thresholdPx: Int,
+    stepPx: Int,
+    isScrollInProgress: () -> Boolean,
+    rawTargetFlow: () -> Flow<Int>,
 ): Pair<ScrollState, Boolean> {
     val proxy = rememberScrollState()
     val locked = remember { mutableStateOf(false) }
 
-    LaunchedEffect(this, proxy, thresholdPx, stepPx) {
-        snapshotFlow { value }
-            .collect { rawTarget ->
-                val shouldLock = rawTarget > thresholdPx
-                if (locked.value != shouldLock) locked.value = shouldLock
+    LaunchedEffect(source, proxy, thresholdPx, stepPx) {
+        rawTargetFlow().collect { rawTarget ->
+            val shouldLock = rawTarget > thresholdPx
+            if (locked.value != shouldLock) locked.value = shouldLock
 
-                val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
+            val desired = if (shouldLock) thresholdPx else quantize(rawTarget, stepPx)
 
-                if (proxy.value != desired) {
-                    proxy.scrollTo(desired.coerceAtLeast(0))
-                }
+            if (proxy.value != desired) {
+                proxy.scrollTo(desired.coerceAtLeast(0))
             }
+        }
     }
 
     val inProgress = remember { mutableStateOf(false) }
-    LaunchedEffect(this, thresholdPx) {
-        snapshotFlow { isScrollInProgress }
+    LaunchedEffect(source, thresholdPx) {
+        snapshotFlow { isScrollInProgress() }
             .collect { progressing ->
                 inProgress.value = if (locked.value) false else progressing
             }