@momo-kits/native-kits 0.161.2-nocompotie.999-debug → 0.161.2-scrolltop.1-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.161.2-nocompotie.999-debug"
+        version = "0.161.2-scrolltop.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/src/commonMain/kotlin/vn/momo/kits/components/LazyColumnWithBouncing.kt

@@ -55,6 +55,8 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
+import androidx.compose.runtime.rememberCoroutineScope
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.conditional
 import vn.momo.kits.platform.getPlatformName
@@ -96,10 +98,12 @@ fun LazyColumnWithBouncing(
     flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
     userScrollEnabled: Boolean = true,
     pullRefreshState: PullToRefreshCustomState? = null,
+    scrollToTopOnStatusBarTap: Boolean = true,
     content: LazyListScope.() -> Unit,
 ) {
     val height = remember { mutableIntStateOf(0) }
     val maxConstraint = remember { mutableIntStateOf(0) }
+    val scope = rememberCoroutineScope()
 
     LaunchedEffect(Unit) {
         val addOn = 1
@@ -119,6 +123,8 @@ fun LazyColumnWithBouncing(
         }.collect()
     }
 
+
+
     val measureLayout =
         remember<MeasureScope.(Measurable, Constraints) -> MeasureResult>(maxConstraint) {
             { m, c ->

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

@@ -1,33 +1,47 @@
 package vn.momo.kits.navigation
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import platform.Foundation.NSNotification
-import platform.Foundation.NSNotificationCenter
-import platform.Foundation.NSOperationQueue
-import platform.darwin.NSObjectProtocol
+import androidx.compose.runtime.remember
+import androidx.compose.ui.viewinterop.UIKitView
+import kotlinx.cinterop.ExperimentalForeignApi
+import platform.CoreGraphics.CGPointMake
+import platform.CoreGraphics.CGRectMake
+import platform.CoreGraphics.CGSizeMake
+import platform.UIKit.UIColor
+import platform.UIKit.UIScrollView
+import platform.UIKit.UIScrollViewDelegateProtocol
+import platform.darwin.NSObject
+import vn.momo.kits.platform.getScreenDimensions
 
-private const val STATUS_BAR_TAPPED_NOTIFICATION = "statusBarSelected"
 
+class ScrollToTopDelegate(private val callback: (() -> Unit)?) : NSObject(), UIScrollViewDelegateProtocol {
+    override fun scrollViewShouldScrollToTop(scrollView: UIScrollView): Boolean {
+        println("scrollViewShouldScrollToTop aaaaaaaaaaaa")
+        callback?.invoke()
+        return false
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
 @Composable
 internal actual fun RegisterScrollToTop(callback: (() -> Unit)?) {
-    val maxApi = LocalMaxApi.current
-    DisposableEffect(callback) {
-        val cb = callback
-        val token: NSObjectProtocol? = if (cb != null) {
-            NSNotificationCenter.defaultCenter.addObserverForName(
-                name = STATUS_BAR_TAPPED_NOTIFICATION,
-                `object` = null,
-                queue = NSOperationQueue.mainQueue,
-            ) { _: NSNotification? ->
-                runCatching { cb() }.onFailure {
-                    maxApi?.logFile("[ScrollToTop] callback threw: ${it.message}") {}
-
-                }
-            }
-        } else null
-        onDispose {
-            token?.let { NSNotificationCenter.defaultCenter.removeObserver(it) }
+    val width = getScreenDimensions().width
+    val scrollToTopDelegate = remember(callback) { ScrollToTopDelegate { callback?.invoke() } }
+    UIKitView(
+        factory = {
+            val scrollView = UIScrollView()
+            scrollView.setFrame(CGRectMake(0.0, 0.0, width.toDouble(), 2.0))
+            scrollView.setContentOffset(CGPointMake(0.0, 2.0))
+            scrollView.setContentSize(CGSizeMake(0.0, 3.0))
+            scrollView.backgroundColor = UIColor.redColor
+            scrollView.setScrollsToTop(true)
+            scrollView.setDelegate(
+                delegate = scrollToTopDelegate
+            )
+            scrollView
+        },
+        update = {
+            it.setDelegate(delegate = scrollToTopDelegate)
         }
-    }
+    )
 }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.161.2-nocompotie.999
+version=0.161.2-scrolltop.1
 
 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.161.2-nocompotie.999-debug",
+  "version": "0.161.2-scrolltop.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},