@onekeyfe/react-native-pager-view 6.7.0-alpha.392 → 6.7.0-alpha.394

package/android/src/androidTest/java/com/reactnativepagerview/CollapsiblePagerTabReservationTest.kt

@@ -12,6 +12,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.HorizontalScrollView
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.views.view.ReactViewGroup
 import java.util.concurrent.atomic.AtomicInteger
@@ -244,4 +246,61 @@ class CollapsiblePagerTabReservationTest : InstrumentationTestCase() {
       instrumentation.waitForIdleSync()
     }
   }
+
+  fun testUnmountWithTransitioningPageHoldersSkipsEmptyRecyclerLayout() {
+    val context = instrumentation.targetContext
+    val activity = instrumentation.startActivitySync(
+      Intent(context, CollapsiblePagerHitTestActivity::class.java)
+        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+    ) as CollapsiblePagerHitTestActivity
+    try {
+      instrumentation.runOnMainSync {
+        val density = context.resources.displayMetrics.density
+        fun dp(value: Int) = (value * density).roundToInt()
+        val width = dp(320)
+        val height = dp(500)
+        val host = CollapsiblePagerHost(context)
+        activity.setContentView(host)
+        val header = View(context)
+        val sticky = View(context)
+        val page0 = View(context)
+        val page1 = View(context)
+        host.addReactChild(header, 0)
+        host.addReactChild(sticky, 1)
+        host.addReactChild(page0, 2)
+        host.addReactChild(page1, 3)
+        host.measure(
+          View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY),
+        )
+        host.layout(0, 0, width, height)
+        val pager = (0 until host.childCount).map(host::getChildAt).filterIsInstance<ViewPager2>().first()
+        val recycler = pager.getChildAt(0) as RecyclerView
+        assertNull(recycler.itemAnimator)
+        assertTrue(host.attachedPageCount() > 0)
+
+        val transitioningHolders = (0 until recycler.childCount).map(recycler::getChildAt)
+        transitioningHolders.forEach { recycler.startViewTransition(it) }
+
+        host.removeReactChild(page1)
+        host.removeReactChild(page0)
+        host.removeReactChild(sticky)
+        host.removeReactChild(header)
+
+        host.viewTreeObserver.dispatchOnPreDraw()
+        host.measure(
+          View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY),
+        )
+        host.layout(0, 0, width, height)
+        assertTrue(host.attachedPageCount() > 0)
+
+        transitioningHolders.forEach { recycler.endViewTransition(it) }
+      }
+      instrumentation.waitForIdleSync()
+    } finally {
+      instrumentation.runOnMainSync { activity.finish() }
+      instrumentation.waitForIdleSync()
+    }
+  }
 }

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

@@ -327,6 +327,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     pager.id = View.generateViewId()
     pager.adapter = adapter
     pager.isSaveEnabled = false
+    (pager.getChildAt(0) as? RecyclerView)?.itemAnimator = null
     super.addView(
       pager,
       LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT),
@@ -708,7 +709,16 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
 
   private fun layoutPagerIfRequested() {
     val recycler = pager.getChildAt(0) as? RecyclerView ?: return
-    if (!recycler.isLayoutRequested || recycler.isLayoutSuppressed || recycler.isComputingLayout || recycler.width <= 0 || recycler.height <= 0) return
+    if (
+      !shouldDrainCollapsiblePagerLayout(
+        recycler.isLayoutRequested,
+        recycler.isLayoutSuppressed,
+        recycler.isComputingLayout,
+        recycler.width,
+        recycler.height,
+        adapter.itemCount,
+      )
+    ) return
     // OneKey patch: a non-animated page command queues RecyclerView layout, but RN
     // can stop that request after navigation. Drain it before showing the page.
     recycler.measure(
@@ -732,7 +742,11 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   private fun isPagerRecyclerLayoutSuppressed(): Boolean =
-    (pager.getChildAt(0) as? RecyclerView)?.isLayoutSuppressed == true
+    shouldSuppressCollapsiblePagerRecyclerLayout(
+      (pager.getChildAt(0) as? RecyclerView)?.isLayoutSuppressed == true,
+      adapter.itemCount,
+      attachedPageCount(),
+    )
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     val width = MeasureSpec.getSize(widthMeasureSpec)

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

@@ -39,3 +39,22 @@ internal class NativeRefreshForegroundAlpha(initialAlpha: Float) {
     return lastApplied
   }
 }
+
+// Skip ViewPager2 RecyclerView layout when explicitly suppressed or when all React page
+// children have been removed on unmount while rendered ViewHolder views remain attached.
+internal fun shouldSuppressCollapsiblePagerRecyclerLayout(
+  isLayoutSuppressed: Boolean,
+  adapterItemCount: Int,
+  attachedPageCount: Int,
+): Boolean = isLayoutSuppressed || (adapterItemCount <= 0 && attachedPageCount > 0)
+
+internal fun shouldDrainCollapsiblePagerLayout(
+  isLayoutRequested: Boolean,
+  isLayoutSuppressed: Boolean,
+  isComputingLayout: Boolean,
+  width: Int,
+  height: Int,
+  adapterItemCount: Int,
+): Boolean = adapterItemCount > 0 && isLayoutRequested && !isLayoutSuppressed &&
+  !isComputingLayout && width > 0 && height > 0
+

package/android/src/test/java/com/reactnativepagerview/NativeScrollerScrollAwayInsetsTest.kt

@@ -72,4 +72,44 @@ fun main() {
   check(nativeRefreshForegroundTop(37 + 230 + 64, 294f) == 37f)
   check(nativeRefreshForegroundTop(-40 + 294, 294f) == -40f)
   println("Refresh foreground policy: repeat, owner transfer/release, external alpha, transparent baseline, caller offset, and combined nested inset passed")
+
+  // Initial mount before any page ViewHolder is attached still measures ViewPager2.
+  check(!shouldSuppressCollapsiblePagerRecyclerLayout(isLayoutSuppressed = false, adapterItemCount = 0, attachedPageCount = 0))
+  // Unmount removes all adapter pages while rendered ViewHolder views remain attached.
+  check(shouldSuppressCollapsiblePagerRecyclerLayout(isLayoutSuppressed = false, adapterItemCount = 0, attachedPageCount = 1))
+  check(shouldSuppressCollapsiblePagerRecyclerLayout(isLayoutSuppressed = true, adapterItemCount = 2, attachedPageCount = 1))
+  // Re-adding pages resumes ViewPager2 layout.
+  check(!shouldSuppressCollapsiblePagerRecyclerLayout(isLayoutSuppressed = false, adapterItemCount = 1, attachedPageCount = 1))
+
+  check(
+    !shouldDrainCollapsiblePagerLayout(
+      isLayoutRequested = true,
+      isLayoutSuppressed = false,
+      isComputingLayout = false,
+      width = 1080,
+      height = 2400,
+      adapterItemCount = 0,
+    ),
+  )
+  check(
+    shouldDrainCollapsiblePagerLayout(
+      isLayoutRequested = true,
+      isLayoutSuppressed = false,
+      isComputingLayout = false,
+      width = 1080,
+      height = 2400,
+      adapterItemCount = 2,
+    ),
+  )
+  check(
+    !shouldDrainCollapsiblePagerLayout(
+      isLayoutRequested = true,
+      isLayoutSuppressed = true,
+      isComputingLayout = false,
+      width = 1080,
+      height = 2400,
+      adapterItemCount = 2,
+    ),
+  )
+  println("CollapsiblePager unmount layout guard: initial mount, unmount retention, suppression, and re-add passed")
 }

package/docs/SPEC.md

@@ -357,8 +357,19 @@ Status: implemented locally; unreleased. On the Android UI thread, during a
 screen removal transition,
 NativeList and CollapsiblePager layout entry points respect the RecyclerView
 suppression state established by the screen-transition owner. The owner restores
-the original state when its last transition ownership ends. This adds no public
-API and does not change Web or iOS behavior.
+the original state when its last transition ownership ends. In addition,
+`CollapsiblePagerHost` disables `DefaultItemAnimator` on its internal
+`ViewPager2` `RecyclerView` (`itemAnimator = null`) and skips pre-draw
+(`layoutPagerIfRequested`) and host-driven `ViewPager2` layout passes when all
+React page children have been removed from the adapter (`adapter.itemCount == 0`)
+while previously rendered page `ViewHolder` views remain attached
+(`attachedPageCount() > 0`), matching `PagerViewViewManagerImpl`'s unmount
+guard. Initial empty measurement before any page is attached
+(`attachedPageCount() == 0`) and subsequent page insertions (`adapter.itemCount > 0`)
+still measure and lay out normally. This prevents unmount-time empty-adapter
+layout passes from clearing visible exit frames or recycling attached
+`ViewHolder` views held in `mDisappearingChildren` by `ViewGroup.startViewTransition`.
+This adds no public API and does not change Web or iOS behavior.
 
 If Fabric removes the current NativeScroller React child while its origin-frame
 transition remains active, Android retains the already displayed native extent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "6.7.0-alpha.392",
+  "version": "6.7.0-alpha.394",
   "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.392",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.394",
     "react": "*",
     "react-native": "*"
   },