@onekeyfe/react-native-pager-view 3.0.176 → 3.0.178

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

@@ -474,6 +474,14 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     releaseRefreshForeground()
     val index = logicalChildren.indexOf(child)
     if (index < 0) return
+    if (index >= PAGE_SLOT_OFFSET) {
+      val observed = observedRecyclerView ?: observedOwnedScroller ?: observedNativeScroller
+      val removingObservedPage = observed != null && isDescendant(observed, child)
+      cancelPageTransitionForPageMutation()
+      cancelPagerTop()
+      detachPrimaryScrollObserver(recordOffset = false)
+      if (removingObservedPage) observedPageRemoved = true
+    }
     logicalChildren.removeAt(index)
     when (index) {
       0 -> {
@@ -485,12 +493,6 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
         stickyHeaderView = null
       }
       else -> {
-        val observed = observedRecyclerView ?: observedOwnedScroller ?: observedNativeScroller
-        if (observed != null && isDescendant(observed, child)) {
-          // The page detaches only later; its scroller must not keep writing this key.
-          detachPrimaryScrollObserver(recordOffset = false)
-          observedPageRemoved = true
-        }
         when (val scrollable =
           findExplicitNativeScrollerInView(child) ?: findVerticalScrollableView(child)) {
           is RecyclerView -> restoreRecyclerInsets(scrollable)
@@ -498,14 +500,17 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
           is NativeScrollerViewport -> restoreOwnedScrollerInsets(scrollable)
         }
         adapter.removePage(child)
+        selectedPage = if (adapter.itemCount == 0) 0 else selectedPage.coerceIn(0, adapter.itemCount - 1)
         log("page-detach slot=${index - PAGE_SLOT_OFFSET} nativePages=${adapter.itemCount}")
       }
     }
   }
 
   fun removeAllReactChildren() {
+    cancelPageTransitionForPageMutation()
+    cancelPagerTop()
     releaseRefreshForeground()
-    detachPrimaryScrollObserver()
+    detachPrimaryScrollObserver(recordOffset = false)
     pageRestoreRequests.clear()
     pendingPageRestores.clear()
     commandBodyKeys.clear()
@@ -534,6 +539,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     stickyHeaderView = null
     logicalChildren.clear()
     adapter.clear()
+    selectedPage = 0
     hasAppliedInitialPage = false
     log("pages-clear")
   }
@@ -542,9 +548,28 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
 
   fun reactChildAt(index: Int) = logicalChildren[index]
 
+  private fun cancelPageTransitionForPageMutation() {
+    if (transitionHeaderOffsets != null) {
+      val keys = transitionAlignedViews.values.toTypedArray().toMutableSet()
+      keys.add(pageKey(transitionSourcePage))
+      transitionTargetPage?.let { keys.add(pageKey(it)) }
+      for (key in keys) {
+        displayBodyOverrides.remove(key)
+        displayRecyclerAnchors.remove(key)
+      }
+    }
+    transitionHeaderOffsets = null
+    transitionPageOffsets = null
+    transitionTargetPage = null
+    transitionSourceRecyclerAnchor = null
+    transitionSourceDisplayBody = 0
+    transitionAlignedViews.clear()
+    resumeTransitionSource = null
+  }
+
   internal fun beginPageTransition(target: Int? = null) {
     cancelPagerTop()
-    if (!nativeSmoothHeaderScrollEnabled || headerHeightPx <= 0) return
+    if (adapter.itemCount == 0 || !nativeSmoothHeaderScrollEnabled || headerHeightPx <= 0) return
     if (transitionHeaderOffsets == null) {
       transitionSourceDisplayBody = primaryScrollableForPage(selectedPage)?.let(::verticalScrollOffset) ?: 0
       transitionSourceRecyclerAnchor = (primaryScrollableForPage(selectedPage) as? RecyclerView)?.let(::captureRecyclerAnchor)
@@ -578,6 +603,11 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   private fun finishPageTransition(position: Int) {
+    if (adapter.itemCount == 0) {
+      cancelPageTransitionForPageMutation()
+      selectedPage = 0
+      return
+    }
     val headers = transitionHeaderOffsets ?: return
     detachPrimaryScrollObserver(recordOffset = false)
     releaseRefreshForeground()

package/docs/SPEC.md

@@ -732,3 +732,9 @@ activation remain unverified.
 The Header is settled only when C is at its expanded top, the current attached view/key/index/generation still matches, and there is no actual drag, deceleration, scrolling command or horizontal transition. Offset/inset/content/header geometry MUST remain stable for 150ms before true is emitted. Motion or geometry changes revoke true promptly. Deferred reading memory alone MUST NOT be treated as active motion. Pull-to-refresh may settle at a normalized negative offset after drag, bounce and inset geometry stop; network refreshing alone is not a motion gate. Checks stop for collapsed, detached and recycled owners; delayed callbacks revalidate their captured identity. State changes are deduplicated; identity changes still publish an unknown/false snapshot.
 
 The native Home Spotlight adapter consumes this snapshot in the main UI runtime and keeps unknown states paused. It MUST use the mounted page-key mapping and reject old page/source callbacks. Native snapshots already include the 150ms stabilization delay: consumers MUST NOT add another such delay. Legacy Tabs keep their existing normalized-offset and debounce behavior. Anchor measurement, guide qualification and the existing display delay remain independent gates.
+
+### Android page mutation during horizontal transitions
+
+Removing a page or clearing the page collection MUST cancel the active horizontal transition and its temporary display snapshots before notifying the adapter. Cancellation MUST NOT rewrite the shared Header collapse or surviving pages' saved body reading memory. The previous observed owner MUST be detached without committing an offset under a shifted page key.
+
+An empty adapter MUST reject transition starts and transition completion without coercing an index into an empty range. The selected index uses zero as an empty-state sentinel; nonempty mutations clamp it to the remaining valid range. Readding pages MUST allow a fresh selection and MUST NOT resume a removed transition source. Conformance requires actual Android active-transition → zero-pages → readd/selection regression and remaining-page mutation checks; structural checks and compilation alone do not establish runtime behavior.

package/package.json

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