@onekeyfe/react-native-pager-view 3.0.113 → 3.0.115

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

@@ -5,7 +5,8 @@ import android.graphics.Rect
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import android.widget.FrameLayout
+// OneKey patch: FrameLayout is inherited through NestedScrollableHost.
+// import android.widget.FrameLayout
 import androidx.core.view.NestedScrollingParent3
 import androidx.core.view.NestedScrollingParentHelper
 import androidx.core.view.ViewCompat
@@ -15,6 +16,7 @@ import androidx.viewpager2.widget.ViewPager2
 import java.util.WeakHashMap
 import kotlin.math.max
 import kotlin.math.min
+import kotlin.math.roundToInt
 
 internal class CollapsiblePagerAdapter : RecyclerView.Adapter<ViewPagerViewHolder>() {
   private val pages = ArrayList<View>()
@@ -67,13 +69,16 @@ internal class CollapsiblePagerAdapter : RecyclerView.Adapter<ViewPagerViewHolde
  * vertical scroll view remains the content scroll source and horizontal gestures
  * remain owned by ViewPager2.
  */
-class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrollingParent3 {
+// OneKey patch: Match the standard pager's nested horizontal gesture host.
+// Original: class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrollingParent3 {
+class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), NestedScrollingParent3 {
   private data class RecyclerPadding(
-    val left: Int,
-    val top: Int,
-    val right: Int,
-    val bottom: Int,
-    val clipToPadding: Boolean,
+    var left: Int,
+    var top: Int,
+    var right: Int,
+    var bottom: Int,
+    var clipToPadding: Boolean,
+    var appliedTopInset: Int = 0,
   )
 
   val pager = ViewPager2(context)
@@ -85,33 +90,38 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
   private val pageOffsets = HashMap<String, Int>()
   private var observedRecyclerView: RecyclerView? = null
   private var observedScrollListener: RecyclerView.OnScrollListener? = null
+  private var attachmentGeneration = 0
   private var headerView: View? = null
   private var stickyHeaderView: View? = null
   private val pageContentLayoutListener = ViewTreeObserver.OnPreDrawListener {
+    if (width > 0 && height > 0 && isShown) layoutPagerIfRequested()
     // Fabric can mount a retained list without another Android layout pass.
     // Apply its header insets before that list first draws.
     prepareAdjacentPages()
     attachRecyclerObserver()
+    // OneKey patch: a filtered short page can reduce the existing collapse range.
+    setHeaderOffset(headerOffsetPx)
     true
   }
 
   var selectedPage = 0
     private set
   var pendingInitialPage = 0
+  private var hasAppliedInitialPage = false
   var headerHeightPx = 0
     set(value) {
       if (field == value) return
       field = max(0, value)
       headerOffsetPx = min(headerOffsetPx, field)
       reapplyRecyclerInsets()
-      requestLayout()
+      updateHeaderLayout()
     }
   var stickyHeaderHeightPx = 0
     set(value) {
       if (field == value) return
       field = max(0, value)
       reapplyRecyclerInsets()
-      requestLayout()
+      updateHeaderLayout()
     }
   var headerOffsetPx = 0
     private set
@@ -184,6 +194,7 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     stickyHeaderView = null
     logicalChildren.clear()
     adapter.clear()
+    hasAppliedInitialPage = false
   }
 
   fun reactChildCount() = logicalChildren.size
@@ -194,14 +205,29 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     if (adapter.itemCount == 0) return
     detachRecyclerObserver()
     selectedPage = position.coerceIn(0, adapter.itemCount - 1)
-    post {
+    val savedOffset = pageOffsets[currentPageKey()]
+      ?: recyclerViewForPage(selectedPage)?.computeVerticalScrollOffset()
+      ?: 0
+    if (savedOffset > 0) setHeaderOffset(headerHeightPx)
+    postForCurrentAttachment {
       prepareAdjacentPages()
       attachRecyclerObserver()
     }
   }
 
+  private fun postForCurrentAttachment(block: () -> Unit) {
+    val generation = attachmentGeneration
+    post {
+      if (isAttachedToWindow && generation == attachmentGeneration) block()
+    }
+  }
+
   fun applyPendingInitialPage() {
+    // OneKey patch: Fabric can resend initialPage while retained pages change.
+    // Reapplying it interrupts the current gesture and can leave ViewPager2 settling.
+    if (hasAppliedInitialPage) return
     if (pendingInitialPage !in 0 until adapter.itemCount) return
+    hasAppliedInitialPage = true
     if (pager.currentItem != pendingInitialPage) {
       pager.setCurrentItem(pendingInitialPage, false)
     }
@@ -212,9 +238,40 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
 
   fun observedScrollableCount(): Int = originalRecyclerPadding.size
 
+  private fun layoutPagerIfRequested() {
+    val recycler = pager.getChildAt(0) as? RecyclerView ?: return
+    if (!recycler.isLayoutRequested || recycler.isComputingLayout || recycler.width <= 0 || recycler.height <= 0) 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(
+      MeasureSpec.makeMeasureSpec(recycler.width, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(recycler.height, MeasureSpec.EXACTLY),
+    )
+    recycler.layout(recycler.left, recycler.top, recycler.right, recycler.bottom)
+  }
+
+  private fun updateHeaderLayout() {
+    requestLayout()
+    if (width <= 0 || height <= 0) return
+    // OneKey patch: React Native ancestors can stop requestLayout after header props change.
+    // Commit the custom native slots at their existing bounds before the next draw.
+    forceLayout()
+    measure(
+      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
+    )
+    layout(left, top, right, bottom)
+  }
+
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     val width = MeasureSpec.getSize(widthMeasureSpec)
     val height = MeasureSpec.getSize(heightMeasureSpec)
+    // OneKey patch: a detached Fabric page has a zero viewport. Measuring ViewPager2
+    // at width zero spuriously selects page zero and replaces the retained JS pages.
+    if (width <= 0 || height <= 0) {
+      setMeasuredDimension(width, height)
+      return
+    }
     val pagerHeight = height + headerHeightPx
     pager.measure(
       MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
@@ -236,6 +293,7 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     val height = bottom - top
     // RN ancestors allow overflow; keep translated header content inside this viewport.
     clipBounds = Rect(0, 0, width, height)
+    if (width <= 0 || height <= 0) return
     pager.layout(0, 0, width, height + headerHeightPx)
     headerView?.layout(0, 0, width, headerHeightPx)
     stickyHeaderView?.layout(
@@ -245,14 +303,26 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
       headerHeightPx + stickyHeaderHeightPx,
     )
     applyHeaderOffset()
-    post {
+    postForCurrentAttachment {
       prepareAdjacentPages()
       attachRecyclerObserver()
     }
   }
 
+  private fun maximumHeaderOffset(): Int {
+    val recycler = observedRecyclerView ?: return headerHeightPx
+    if (recycler.childCount == 0 || recycler.canScrollVertically(-1) || recycler.canScrollVertically(1)) {
+      return headerHeightPx
+    }
+    // OneKey patch: short pages use the original rounded-DIP minimum content height.
+    val density = resources.displayMetrics.density
+    val contentHeight = ((height / density).roundToInt() + (headerHeightPx / density).roundToInt()) * density
+    return (contentHeight.roundToInt() - height).coerceIn(0, headerHeightPx)
+  }
+
   private fun setHeaderOffset(offset: Int) {
-    val next = offset.coerceIn(0, headerHeightPx)
+    // val next = offset.coerceIn(0, headerHeightPx)
+    val next = offset.coerceIn(0, maximumHeaderOffset())
     if (headerOffsetPx == next) return
     headerOffsetPx = next
     applyHeaderOffset()
@@ -327,7 +397,13 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     applyRecyclerInsets(recycler, selectedPage)
     val listener = object : RecyclerView.OnScrollListener() {
       override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-        pageOffsets[currentPageKey()] = recyclerView.computeVerticalScrollOffset()
+        val contentOffset = recyclerView.computeVerticalScrollOffset()
+        pageOffsets[currentPageKey()] = contentOffset
+        // Nested touch scrolling moves list content only after the header has
+        // collapsed. Programmatic list jumps bypass those parent callbacks.
+        if (contentOffset > 0 && headerOffsetPx < headerHeightPx) {
+          setHeaderOffset(headerHeightPx)
+        }
       }
     }
     observedScrollListener = listener
@@ -360,6 +436,7 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
         recycler.clipToPadding,
       )
     }
+    updateRecyclerPaddingOwnership(recycler, original)
     val topInset = headerHeightPx + stickyHeaderHeightPx
     recycler.clipToPadding = false
     val top = original.top + topInset
@@ -368,13 +445,39 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     val bottom = original.bottom
     if (recycler.paddingLeft != original.left || recycler.paddingTop != top ||
       recycler.paddingRight != original.right || recycler.paddingBottom != bottom) {
+      // 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) {
+        manager?.findViewByPosition(first)?.let { manager.getDecoratedTop(it) - recycler.paddingTop }
+      } else null
       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.
+      // Commit the changed inset before drawing instead of waiting for a data update.
+      if (recycler.width > 0 && recycler.height > 0 && !recycler.isComputingLayout) {
+        recycler.forceLayout()
+        recycler.measure(
+          MeasureSpec.makeMeasureSpec(recycler.width, MeasureSpec.EXACTLY),
+          MeasureSpec.makeMeasureSpec(recycler.height, MeasureSpec.EXACTLY),
+        )
+        recycler.layout(recycler.left, recycler.top, recycler.right, recycler.bottom)
+      }
     }
+    original.appliedTopInset = topInset
     val key = pageKey(pageIndex)
     if (restoredRecyclerKeys[recycler] != key) {
       restoredRecyclerKeys[recycler] = key
+      val generation = attachmentGeneration
       recycler.post {
-        if (restoredRecyclerKeys[recycler] != key) return@post
+        if (!isAttachedToWindow || generation != attachmentGeneration ||
+          restoredRecyclerKeys[recycler] != key ||
+          originalRecyclerPadding[recycler] !== original) {
+          if (restoredRecyclerKeys[recycler] == key) restoredRecyclerKeys.remove(recycler)
+          return@post
+        }
         val saved = pageOffsets[key] ?: 0
         val current = recycler.computeVerticalScrollOffset()
         if (saved != current) recycler.scrollBy(0, saved - current)
@@ -382,12 +485,29 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
     }
   }
 
+  private fun updateRecyclerPaddingOwnership(
+    recycler: RecyclerView,
+    original: RecyclerPadding,
+  ) {
+    val expectedTop = original.top + original.appliedTopInset
+    if (recycler.paddingLeft != original.left) original.left = recycler.paddingLeft
+    if (recycler.paddingTop != expectedTop) {
+      // A React-owned list can replace its content padding while it remains
+      // attached. Remove our inset before retaining that value as the new base.
+      original.top = (recycler.paddingTop - original.appliedTopInset).coerceAtLeast(0)
+    }
+    if (recycler.paddingRight != original.right) original.right = recycler.paddingRight
+    if (recycler.paddingBottom != original.bottom) original.bottom = recycler.paddingBottom
+    if (recycler.clipToPadding) original.clipToPadding = true
+  }
+
   private fun reapplyRecyclerInsets() {
     prepareAdjacentPages()
   }
 
   private fun restoreRecyclerInsets(recycler: RecyclerView) {
     val original = originalRecyclerPadding.remove(recycler) ?: return
+    updateRecyclerPaddingOwnership(recycler, original)
     restoredRecyclerKeys.remove(recycler)
     recycler.clipToPadding = original.clipToPadding
     recycler.setPadding(original.left, original.top, original.right, original.bottom)
@@ -436,8 +556,12 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
 
   override fun onNestedPreScroll(target: View, dx: Int, dy: Int, consumed: IntArray, type: Int) {
     if (!isCurrentPageTarget(target)) return
-    if (dy > 0 && headerOffsetPx < headerHeightPx) {
-      val used = min(dy, headerHeightPx - headerOffsetPx)
+    // OneKey patch: consume only the distance the short-page header can actually move.
+    val maximumOffset = maximumHeaderOffset()
+    // if (dy > 0 && headerOffsetPx < headerHeightPx) {
+    //   val used = min(dy, headerHeightPx - headerOffsetPx)
+    if (dy > 0 && headerOffsetPx < maximumOffset) {
+      val used = min(dy, maximumOffset - headerOffsetPx)
       setHeaderOffset(headerOffsetPx + used)
       consumed[1] += used
     } else if (dy < 0 && headerOffsetPx > 0 && !target.canScrollVertically(-1)) {
@@ -485,10 +609,13 @@ class CollapsiblePagerHost(context: Context) : FrameLayout(context), NestedScrol
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
+    attachmentGeneration += 1
+    restoredRecyclerKeys.clear()
     viewTreeObserver.addOnPreDrawListener(pageContentLayoutListener)
   }
 
   override fun onDetachedFromWindow() {
+    attachmentGeneration += 1
     viewTreeObserver.removeOnPreDrawListener(pageContentLayoutListener)
     detachRecyclerObserver()
     for (recycler in originalRecyclerPadding.keys.toList()) {

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

@@ -19,6 +19,7 @@ import com.reactnativepagerview.event.PageScrollEvent
 import com.reactnativepagerview.event.PageScrollStateChangedEvent
 import com.reactnativepagerview.event.PageSelectedEvent
 import org.json.JSONArray
+import kotlin.math.roundToInt
 
 @ReactModule(name = CollapsiblePagerViewManager.NAME)
 class CollapsiblePagerViewManager : ViewGroupManager<CollapsiblePagerHost>(),
@@ -145,14 +146,20 @@ class CollapsiblePagerViewManager : ViewGroupManager<CollapsiblePagerHost>(),
     }
   }
 
+  @ReactProp(name = "nestedScrollEnabled", defaultBoolean = false)
+  override fun setNestedScrollEnabled(view: CollapsiblePagerHost?, value: Boolean) {
+    // OneKey patch: CollapsiblePagerHost always coordinates nested pagers on Android.
+  }
+
+  // OneKey patch: round Yoga header dimensions to the nearest physical pixel.
   @ReactProp(name = "headerHeight", defaultInt = 0)
   override fun setHeaderHeight(view: CollapsiblePagerHost?, value: Int) {
-    view?.headerHeightPx = PixelUtil.toPixelFromDIP(value.toDouble()).toInt()
+    view?.headerHeightPx = PixelUtil.toPixelFromDIP(value.toDouble()).roundToInt()
   }
 
   @ReactProp(name = "stickyHeaderHeight", defaultInt = 0)
   override fun setStickyHeaderHeight(view: CollapsiblePagerHost?, value: Int) {
-    view?.stickyHeaderHeightPx = PixelUtil.toPixelFromDIP(value.toDouble()).toInt()
+    view?.stickyHeaderHeightPx = PixelUtil.toPixelFromDIP(value.toDouble()).roundToInt()
   }
 
   @ReactProp(name = "pageKeys")

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

@@ -21,7 +21,9 @@ import kotlin.math.sign
  * Supports multiple levels of nested PagerViews by re-asserting
  * requestDisallowInterceptTouchEvent after child dispatch.
  */
-class NestedScrollableHost : FrameLayout {
+// OneKey patch: Let the collapsible pager reuse same-direction nested pager coordination.
+// Original: class NestedScrollableHost : FrameLayout {
+open class NestedScrollableHost : FrameLayout {
   constructor(context: Context) : super(context)
   constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
   public var initialIndex: Int? = null