@onekeyfe/react-native-pager-view 6.7.0-alpha.399 → 6.7.0-alpha.400

package/android/src/main/java/com/reactnativepagerview/CollapsiblePagerHost.kt

@@ -591,9 +591,29 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     cancelPagerTop()
     if (adapter.itemCount == 0 || !nativeSmoothHeaderScrollEnabled || headerHeightPx <= 0) return
     if (transitionHeaderOffsets == null) {
-      transitionSourceDisplayBody = primaryScrollableForPage(selectedPage)?.let(::verticalScrollOffset) ?: 0
-      transitionSourceRecyclerAnchor = (primaryScrollableForPage(selectedPage) as? RecyclerView)?.let(::captureRecyclerAnchor)
-      pageHeaderOffsets[currentPageKey()] = headerOffsetPx
+      val sourceKey = currentPageKey()
+      val sourceView = primaryScrollableForPage(selectedPage)
+      val topInset = headerHeightPx + stickyHeaderHeightPx
+      val sourceRestored = sourceKey !in pendingPageRestores && when (sourceView) {
+        is RecyclerView -> restoredRecyclerKeys[sourceView] == sourceKey &&
+          originalRecyclerPadding[sourceView]?.appliedTopInset == topInset
+        is ScrollView -> restoredScrollerKeys[sourceView] == sourceKey &&
+          originalScrollerPadding[sourceView]?.appliedTopInset == topInset
+        is NativeScrollerViewport -> ownedScrollerKeys[sourceView] == sourceKey
+        else -> false
+      }
+      transitionSourceDisplayBody = if (sourceRestored && sourceView != null) {
+        verticalScrollOffset(sourceView)
+      } else {
+        displayBodyOverrides[sourceKey] ?: pageOffsets[sourceKey] ?: 0
+      }
+      transitionSourceRecyclerAnchor = if (sourceRestored && sourceView is RecyclerView) {
+        captureRecyclerAnchor(sourceView)
+      } else {
+        (displayRecyclerAnchors[sourceKey] ?: recyclerReadingAnchors[sourceKey])
+          ?.takeIf { sourceView !is RecyclerView || (it.view.get() === sourceView && it.adapter === sourceView.adapter) }
+      }
+      pageHeaderOffsets[sourceKey] = headerOffsetPx
       detachPrimaryScrollObserver()
       transitionSourcePage = selectedPage
       transitionHeaderOffsets = pageHeaderOffsets.toMap()
@@ -1684,6 +1704,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       )
     }
     updateRecyclerPaddingOwnership(recycler, original)
+    val key = pageKey(pageIndex)
     val topInset = headerHeightPx + stickyHeaderHeightPx
     recycler.clipToPadding = false
     val top = original.top + topInset
@@ -1695,12 +1716,23 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       // OneKey patch: LinearLayoutManager otherwise anchors children at their old
       // screen coordinates when a page changes the sticky header height.
       val manager = recycler.layoutManager as? LinearLayoutManager
-      val first = manager?.takeIf { it.orientation == RecyclerView.VERTICAL }
-        ?.findFirstVisibleItemPosition() ?: RecyclerView.NO_POSITION
-      val anchorOffset = if (first != RecyclerView.NO_POSITION) {
+      val savedAnchor = if (nativeSmoothHeaderScrollEnabled && original.appliedTopInset == 0) {
+        if (headerOffsetPx < headerHeightPx) {
+          recycler.adapter?.let { RecyclerReadingAnchor(recycler, it, 0, 0) }
+        } else {
+          (if (transitionPageOffsets != null && pageIndex == transitionSourcePage) transitionSourceRecyclerAnchor
+            else displayRecyclerAnchors[key] ?: recyclerReadingAnchors[key])
+            ?.takeIf { it.view.get() === recycler && it.adapter === recycler.adapter }
+        }
+      } else null
+      val first = savedAnchor?.position
+        ?: manager?.takeIf { it.orientation == RecyclerView.VERTICAL }
+          ?.findFirstVisibleItemPosition()
+        ?: RecyclerView.NO_POSITION
+      val anchorOffset = savedAnchor?.top ?: if (first != RecyclerView.NO_POSITION) {
         manager?.findViewByPosition(first)?.let { manager.getDecoratedTop(it) - recycler.paddingTop }
       } else null
-      offsetDiag("recycler-inset-before-nextTop=$top-anchorPosition=$first-anchorOffset=$anchorOffset", recycler, pageKey(pageIndex), pageIndex)
+      offsetDiag("recycler-inset-before-nextTop=$top-anchorPosition=$first-anchorOffset=$anchorOffset", recycler, key, pageIndex)
       recycler.setPadding(original.left, top, original.right, bottom)
       if (anchorOffset != null) manager?.scrollToPositionWithOffset(first, anchorOffset)
       // React Native can stop this nested requestLayout at its React-owned parent.
@@ -1714,9 +1746,8 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
         recycler.layout(recycler.left, recycler.top, recycler.right, recycler.bottom)
       }
     }
-    if (original.appliedTopInset != topInset) offsetDiag("recycler-inset-after-old=${original.appliedTopInset}-new=$topInset", recycler, pageKey(pageIndex), pageIndex)
+    if (original.appliedTopInset != topInset) offsetDiag("recycler-inset-after-old=${original.appliedTopInset}-new=$topInset", recycler, key, pageIndex)
     original.appliedTopInset = topInset
-    val key = pageKey(pageIndex)
     val geometry = Triple(recycler.computeVerticalScrollRange(), recycler.computeVerticalScrollExtent(), recycler.childCount)
     deferredRecyclerGeometry[recycler]?.let { deferred ->
       if (geometry != deferred) {

package/android/src/main/java/com/reactnativepagerview/NestedScrollableHost.kt

@@ -112,6 +112,10 @@ open class NestedScrollableHost : FrameLayout {
         else -> 0
       }
       if (smoothTouchAxis != 0) {
+        if (!nestedNativeGestureStarted) {
+          NativeGestureUtil.notifyNativeGestureStarted(this, e)
+          nestedNativeGestureStarted = true
+        }
         OneKeyLog.debug("CollapsiblePager", "content-direction owner=${if (smoothTouchAxis == 1) "list" else "horizontal"} dx=$dx dy=$dy nested=${nestedHorizontalOwner != null}")
       }
     }
@@ -184,8 +188,10 @@ open class NestedScrollableHost : FrameLayout {
       val scaledDy = dy.absoluteValue * if (isVpHorizontal) 1f else .5f
 
       if (scaledDx > touchSlop || scaledDy > touchSlop) {
-        NativeGestureUtil.notifyNativeGestureStarted(this, e)
-        nestedNativeGestureStarted = true
+        if (!nestedNativeGestureStarted) {
+          NativeGestureUtil.notifyNativeGestureStarted(this, e)
+          nestedNativeGestureStarted = true
+        }
 
         if (orientation == null) return
         if (isVpHorizontal == (scaledDy > scaledDx)) {

package/docs/SPEC.md

@@ -435,6 +435,10 @@ controls belongs to the consuming responder implementation; the Pager package
 does not contain or publish Tamagui helpers. The native application tab bar has
 a separate contract in react-native-bottom-tabs/docs/SPEC.md.
 
+On Android, smooth-touch coordination and nested interception share the same
+native-gesture state. Once either path starts the gesture, later MOVE events
+MUST NOT start it again before its end or cancellation clears that state.
+
 The current native implementation confirms horizontal intent after at least
 32 points on iOS or 32 dp on Android, with horizontal displacement exceeding
 vertical displacement. Vertical intent uses the native vertical scroll threshold

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "6.7.0-alpha.399",
+  "version": "6.7.0-alpha.400",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -73,7 +73,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.399",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.400",
     "react": "*",
     "react-native": "*"
   },