@onekeyfe/react-native-pager-view 6.7.0-alpha.359 → 6.7.0-alpha.362

package/README.md

@@ -66,11 +66,6 @@ replacing its delegate. Android coordinates nested scroll with the active
 Web scroll child can opt in by exposing a DOM element with
 `data-collapsible-pager-scroll`. CSS scroll timelines drive header/sticky
 movement, so React is not updated on each vertical scroll frame.
-`pagerRef.current?.scrollHeaderBy(delta)` immediately moves the active page's
-collapsible header by a finite logical distance, clamped to its measured range.
-`scrollHeaderToOffset(offset)` targets an absolute collapse position, so a
-keyboard's own scroll adjustment cannot add a second relative movement.
-It is useful for revealing a focused field above a keyboard.
 
 On Web, `WebCollapsiblePagerView` is an explicit root export of the existing Web
 pager. It measures Header and sticky content when their heights are omitted.

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

@@ -142,7 +142,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   private var transitionSourceRecyclerAnchor: RecyclerReadingAnchor? = null
   private val commandBodyKeys = HashSet<String>()
   private var explicitTopCommand: Pair<String, PageRestoreRequest>? = null
-  private class PagerTopRequest(view: View, val key: String, val pageIndex: Int, val generation: Int, val logicalOffset: Int, val token: Int) {
+  private class PagerTopRequest(view: View, val key: String, val pageIndex: Int, val generation: Int, val target: Int, val token: Int) {
     val view = WeakReference(view)
   }
   private var pagerTopRequest: PagerTopRequest? = null
@@ -293,23 +293,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   var onNativeSubHeaderPress: ((Int, String) -> Unit)? = null
 
   var nativeTabBarHeight = 44.0
-  var nativeTabBarVariant = "underline"
-  var nativeTabBarTrailingReservedWidth = 0.0
-    set(value) {
-      field = if (value.isFinite() && value >= 0.0) value else 0.0
-      bringNativeHeadersToFront()
-      requestLayout()
-    }
-
-  private fun nativeTabReservationPx(width: Int): Int {
-    val reserved = nativeTabBarTrailingReservedWidth
-    val density = resources.displayMetrics.density
-    return if (reserved.isFinite() && reserved > 0.0 && width > 0 && density > 0f) {
-      (reserved.coerceAtMost(width / density.toDouble()) * density).roundToInt()
-    } else 0
-  }
   var nativeTabBarContentPaddingHorizontal = 20.0
-  var nativeTabBarContentPaddingVertical = 0.0
   var nativeTabBarItemSpacing = 8.0
   var nativeTabBarFontSize = 16.0
   var nativeTabBarFontFamily: String? = null
@@ -432,9 +416,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   fun applyNativeHeaderStyle() {
     nativeTabBarView.updateStyle(
       nativeTabBarHeight,
-      nativeTabBarVariant,
       nativeTabBarContentPaddingHorizontal,
-      nativeTabBarContentPaddingVertical,
       nativeTabBarItemSpacing,
       nativeTabBarFontSize,
       nativeTabBarFontFamily,
@@ -460,7 +442,6 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   private fun bringNativeHeadersToFront() {
     nativeTabBarView.bringToFront()
     nativeSubHeaderView.bringToFront()
-    if (nativeTabBarTrailingReservedWidth > 0.0) stickyHeaderView?.bringToFront()
   }
 
   fun addReactChild(child: View, index: Int) {
@@ -708,7 +689,7 @@ 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 (!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(
@@ -731,9 +712,6 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     layout(left, top, right, bottom)
   }
 
-  private fun isPagerRecyclerLayoutSuppressed(): Boolean =
-    (pager.getChildAt(0) as? RecyclerView)?.isLayoutSuppressed == true
-
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
     val width = MeasureSpec.getSize(widthMeasureSpec)
     val height = MeasureSpec.getSize(heightMeasureSpec)
@@ -744,12 +722,10 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       return
     }
     val pagerHeight = height + headerHeightPx
-    if (!isPagerRecyclerLayoutSuppressed()) {
-      pager.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(pagerHeight, MeasureSpec.EXACTLY),
-      )
-    }
+    pager.measure(
+      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(pagerHeight, MeasureSpec.EXACTLY),
+    )
     headerView?.measure(
       MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
       MeasureSpec.makeMeasureSpec(headerHeightPx, MeasureSpec.EXACTLY),
@@ -761,9 +737,8 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     val nativeTabHeight = if (nativeTabBarView.visibility == View.VISIBLE) {
       nativeTabBarView.preferredHeightPx()
     } else 0
-    val tabReservedWidth = nativeTabReservationPx(width)
     nativeTabBarView.measure(
-      MeasureSpec.makeMeasureSpec(width - tabReservedWidth, MeasureSpec.EXACTLY),
+      MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
       MeasureSpec.makeMeasureSpec(nativeTabHeight, MeasureSpec.EXACTLY),
     )
     val nativeSubHeaderHeight = if (nativeSubHeaderView.visibility == View.VISIBLE) {
@@ -782,9 +757,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     // RN ancestors allow overflow; keep translated header content inside this viewport.
     clipBounds = Rect(0, 0, width, height)
     if (width <= 0 || height <= 0) return
-    if (!isPagerRecyclerLayoutSuppressed()) {
-      pager.layout(0, 0, width, height + headerHeightPx)
-    }
+    pager.layout(0, 0, width, height + headerHeightPx)
     headerView?.layout(0, 0, width, headerHeightPx)
     stickyHeaderView?.layout(
       0,
@@ -793,12 +766,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       headerHeightPx + stickyHeaderHeightPx,
     )
     val nativeTabHeight = nativeTabBarView.measuredHeight
-    val tabReservedWidth = nativeTabReservationPx(width)
-    val tabLeft = if (nativeTabBarView.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
-      tabReservedWidth
-    } else 0
-    nativeTabBarView.layout(tabLeft, headerHeightPx, tabLeft + width - tabReservedWidth,
-      headerHeightPx + nativeTabHeight)
+    nativeTabBarView.layout(0, headerHeightPx, width, headerHeightPx + nativeTabHeight)
     nativeSubHeaderView.layout(
       0,
       headerHeightPx + nativeTabHeight,
@@ -860,7 +828,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     }
     if (!reached()) {
       if (!isAttachedToWindow || !view.isAttachedToWindow || width <= 0 || height <= 0 ||
-          view.width <= 0 || view.height <= 0 || isInLayout || view.isInLayout || view.isLayoutSuppressed || view.isComputingLayout ||
+          view.width <= 0 || view.height <= 0 || isInLayout || view.isInLayout || view.isComputingLayout ||
           pageKey(index) != key || primaryScrollableForPage(index) !== view || !isCurrentPageRestore(key, request)) return false
       val previousSynthetic = syntheticPageRestore
       syntheticPageRestore = true
@@ -1019,33 +987,13 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     if (!settled) return
     pageOffsets[request.key] = 0
     if (view is RecyclerView) saveRecyclerReadingAnchor(request.key, view)
-    setHeaderOffset(request.logicalOffset.coerceIn(0, headerHeightPx))
-    offsetDiag("pager-top-complete-offset=${request.logicalOffset}-token=${request.token}", view, request.key)
+    setHeaderOffset(if (request.target == 1) headerHeightPx else 0)
+    offsetDiag("pager-top-complete-target=${request.target}-token=${request.token}", view, request.key)
     cancelPagerTop()
   }
 
   internal fun scrollToTop(target: Int, animated: Boolean) {
-    if (target !in 0..1) return
-    scrollHeaderToOffset(if (target == 1) headerHeightPx else 0, animated)
-  }
-
-  internal fun scrollHeaderBy(delta: Double) {
-    if (!delta.isFinite()) return
-    val density = resources.displayMetrics.density.toDouble()
-    val maxDip = headerHeightPx / density
-    val deltaPx = (delta.coerceIn(-maxDip, maxDip) * density).roundToInt()
-    scrollHeaderToOffset((headerOffsetPx.toLong() + deltaPx).coerceIn(0, headerHeightPx.toLong()).toInt(), false)
-  }
-
-  internal fun scrollHeaderToOffset(offset: Double) {
-    if (!offset.isFinite()) return
-    val density = resources.displayMetrics.density.toDouble()
-    val targetPx = (offset.coerceIn(0.0, headerHeightPx / density) * density).roundToInt()
-    scrollHeaderToOffset(targetPx, false)
-  }
-
-  private fun scrollHeaderToOffset(logicalOffset: Int, animated: Boolean) {
-    if (pager.scrollState != ViewPager2.SCROLL_STATE_IDLE || transitionHeaderOffsets != null ||
+    if (target !in 0..1 || pager.scrollState != ViewPager2.SCROLL_STATE_IDLE || transitionHeaderOffsets != null ||
       syntheticPageRestore || selectedPage !in 0 until adapter.itemCount || !isAttachedToWindow) return
     val view = observedRecyclerView ?: observedOwnedScroller ?: observedNativeScroller ?: return
     val key = currentPageKey()
@@ -1072,12 +1020,11 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     if (view is RecyclerView) deferredRecyclerGeometry.remove(view)
     if (view is ScrollView) deferredScrollerGeometry.remove(view)
     pageOffsets[key] = 0
-    val targetOffset = logicalOffset.coerceIn(0, headerHeightPx)
-    val request = PagerTopRequest(view, key, selectedPage, attachmentGeneration, targetOffset, ++pagerTopToken)
+    val request = PagerTopRequest(view, key, selectedPage, attachmentGeneration, target, ++pagerTopToken)
     pagerTopRequest = request
     commandBodyKeys.add(key)
-    setHeaderOffset(targetOffset)
-    offsetDiag("pager-top-begin-offset=$targetOffset-animated=$animated-token=${request.token}", view, key)
+    setHeaderOffset(if (target == 1) headerHeightPx else 0)
+    offsetDiag("pager-top-begin-target=$target-animated=$animated-token=${request.token}", view, key)
     dispatchingPagerTop = true
     try {
       when (view) {
@@ -1086,7 +1033,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
           if (animated && !recyclerIsAtBodyTop(view)) view.smoothScrollToPosition(0)
           else if (manager != null && manager.orientation == RecyclerView.VERTICAL) {
             manager.scrollToPositionWithOffset(0, 0)
-            if (view.width > 0 && view.height > 0 && !isInLayout && !view.isInLayout && !view.isLayoutSuppressed && !view.isComputingLayout) {
+            if (view.width > 0 && view.height > 0 && !isInLayout && !view.isInLayout && !view.isComputingLayout) {
               view.measure(MeasureSpec.makeMeasureSpec(view.width, MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(view.height, MeasureSpec.EXACTLY))
               view.layout(view.left, view.top, view.right, view.bottom)
             }
@@ -1691,7 +1638,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       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.isLayoutSuppressed && !recycler.isComputingLayout) {
+      if (recycler.width > 0 && recycler.height > 0 && !recycler.isComputingLayout) {
         recycler.forceLayout()
         recycler.measure(
           MeasureSpec.makeMeasureSpec(recycler.width, MeasureSpec.EXACTLY),
@@ -2065,16 +2012,14 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     }
   }
 
-  private fun headerRegionAt(x: Float, y: Float): String? {
+  private fun headerRegionAt(y: Float): String? {
     val headerBottom = headerHeightPx - headerOffsetPx
     val stickyBottom = headerHeightPx + stickyHeaderHeightPx - headerOffsetPx
     return when {
       y < 0 || y >= stickyBottom -> null
       y < headerBottom -> "header"
       y < headerBottom + nativeTabBarView.measuredHeight &&
-        nativeTabBarView.visibility == View.VISIBLE ->
-        if (x >= nativeTabBarView.left && x < nativeTabBarView.right) "primary-tab"
-        else "sticky-controls"
+        nativeTabBarView.visibility == View.VISIBLE -> "primary-tab"
       y < headerBottom + nativeTabBarView.measuredHeight + nativeSubHeaderView.measuredHeight &&
         nativeSubHeaderView.visibility == View.VISIBLE -> "secondary-header"
       else -> "sticky-controls"
@@ -2183,7 +2128,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
         pressCancelled = false
         nativeGestureStarted = false
         nestedNativeGestureStarted = false
-        headerTouchRegion = headerRegionAt(event.x, event.y) ?: "none"
+        headerTouchRegion = headerRegionAt(event.y) ?: "none"
         headerTouchActive = headerTouchRegion != "none"
         if (!headerTouchActive) return super.dispatchTouchEvent(event)
         headerDownX = event.x

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

@@ -65,11 +65,7 @@ private class CollapsiblePagerHorizontalItemsView(
 ) : HorizontalScrollView(context) {
   private val density = resources.displayMetrics.density
   private val content = FrameLayout(context)
-  private val track = View(context)
   private val indicator = View(context)
-  private val trackBackground = GradientDrawable().apply {
-    shape = GradientDrawable.RECTANGLE
-  }
   private val indicatorBackground = GradientDrawable().apply {
     shape = GradientDrawable.RECTANGLE
   }
@@ -79,8 +75,6 @@ private class CollapsiblePagerHorizontalItemsView(
   private var selectedKey = ""
   private var rowHeightPx = dp(if (showsProgressIndicator) 44.0 else 42.0)
   private var contentPaddingPx = dp(20.0)
-  private var contentPaddingVerticalPx = 0
-  private var segmented = false
   private var itemSpacingPx = dp(8.0)
   private var fontSize = if (showsProgressIndicator) 16.0 else 14.0
   private var fontFamily: String? = null
@@ -102,9 +96,7 @@ private class CollapsiblePagerHorizontalItemsView(
     isFillViewport = true
     overScrollMode = OVER_SCROLL_NEVER
     clipToPadding = false
-    track.background = trackBackground
     indicator.background = indicatorBackground
-    content.addView(track, FrameLayout.LayoutParams(0, 0))
     content.addView(indicator, FrameLayout.LayoutParams(0, 0))
     addView(
       content,
@@ -157,24 +149,17 @@ private class CollapsiblePagerHorizontalItemsView(
     fontFamily: String?,
     indicatorHeight: Double = 0.0,
     indicatorBottom: Double = 0.0,
-    variant: String = "underline",
-    contentPaddingVertical: Double = 0.0,
   ) {
     rowHeightPx = max(1, dp(rowHeight))
     contentPaddingPx = max(0, dp(contentPadding))
-    contentPaddingVerticalPx = max(0, dp(contentPaddingVertical))
-    val wasSegmented = segmented
-    segmented = showsProgressIndicator && variant == "segmented"
     itemSpacingPx = max(0, dp(itemSpacing))
     this.fontSize = max(1.0, fontSize)
     this.fontFamily = fontFamily
     if (showsProgressIndicator) {
       indicatorHeightPx = max(0, dp(indicatorHeight))
       indicatorBottomPx = max(0, dp(indicatorBottom))
-      indicatorBackground.cornerRadius = if (segmented) dp(14.0).toFloat() else indicatorHeightPx / 2f
+      indicatorBackground.cornerRadius = indicatorHeightPx / 2f
     }
-    track.visibility = if (segmented) VISIBLE else GONE
-    if (segmented && !wasSegmented) scrollTo(0, 0)
     applyTypeface()
     requestLayout()
   }
@@ -186,9 +171,8 @@ private class CollapsiblePagerHorizontalItemsView(
     selectedBackgroundColor: Int,
     indicatorColor: Int,
   ) {
-    setBackgroundColor(if (segmented) Color.TRANSPARENT else backgroundColor)
-    content.setBackgroundColor(if (segmented) Color.TRANSPARENT else backgroundColor)
-    trackBackground.setColor(backgroundColor)
+    setBackgroundColor(backgroundColor)
+    content.setBackgroundColor(backgroundColor)
     this.activeTextColor = activeTextColor
     this.inactiveTextColor = inactiveTextColor
     this.selectedBackgroundColor = selectedBackgroundColor
@@ -229,46 +213,6 @@ private class CollapsiblePagerHorizontalItemsView(
     }
     applyTypeface()
     itemFrames.clear()
-    if (segmented) {
-      val actualPaddingHorizontal = min(contentPaddingPx, width / 2)
-      val actualPaddingVertical = min(contentPaddingVerticalPx, height / 2)
-      val trackLeft = actualPaddingHorizontal
-      val trackRight = max(trackLeft, width - contentPaddingPx)
-      val trackTop = actualPaddingVertical
-      val trackBottom = max(trackTop, height - contentPaddingVerticalPx)
-      val trackWidth = trackRight - trackLeft
-      val trackHeight = trackBottom - trackTop
-      trackBackground.cornerRadius = trackHeight / 2f
-      indicatorBackground.cornerRadius = max(0, trackHeight - dp(4.0)) / 2f
-      track.layoutParams = FrameLayout.LayoutParams(trackWidth, trackHeight).apply {
-        gravity = Gravity.TOP or Gravity.LEFT
-        leftMargin = trackLeft
-        topMargin = trackTop
-      }
-      buttons.forEachIndexed { index, button ->
-        val count = buttons.size
-        val first = trackLeft + trackWidth * index / count
-        val last = trackLeft + trackWidth * (index + 1) / count
-        val start = if (layoutDirection == View.LAYOUT_DIRECTION_RTL) trackRight - (last - trackLeft) else first
-        val end = if (layoutDirection == View.LAYOUT_DIRECTION_RTL) trackRight - (first - trackLeft) else last
-        val buttonWidth = max(0, end - start)
-        val thumbInset = dp(2.0)
-        itemFrames.add(intArrayOf(start, buttonWidth, start + thumbInset, max(0, buttonWidth - 2 * thumbInset)))
-        button.layoutParams = FrameLayout.LayoutParams(buttonWidth, trackHeight).apply {
-          gravity = Gravity.TOP or Gravity.LEFT
-          leftMargin = start
-          topMargin = trackTop
-        }
-      }
-      content.layoutParams = LayoutParams(width, height)
-      content.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY),
-      )
-      setMeasuredDimension(width, height)
-      return
-    }
-    track.layoutParams = FrameLayout.LayoutParams(0, 0)
     var x = contentPaddingPx
     buttons.forEachIndexed { index, button ->
       val textWidth = ceil(button.paint.measureText(button.text.toString()).toDouble()).toInt()
@@ -316,9 +260,6 @@ private class CollapsiblePagerHorizontalItemsView(
     return super.onTouchEvent(event)
   }
 
-  override fun onInterceptTouchEvent(event: MotionEvent): Boolean =
-    if (segmented) false else super.onInterceptTouchEvent(event)
-
   private fun updatePresentation() {
     if (buttons.isEmpty() || itemFrames.size != buttons.size) return
     val selectedIndex: Int
@@ -334,16 +275,14 @@ private class CollapsiblePagerHorizontalItemsView(
       val interpolatedIndicatorWidth = from[3] + (to[3] - from[3]) * fraction
       val indicatorX = interpolatedIndicatorX.roundToInt()
       val indicatorWidth = interpolatedIndicatorWidth.roundToInt()
-      val actualPaddingVertical = min(contentPaddingVerticalPx, measuredHeight / 2)
-      val indicatorHeight = if (segmented) max(0, measuredHeight - 2 * actualPaddingVertical - dp(4.0)) else indicatorHeightPx
-      val indicatorTop = if (segmented) actualPaddingVertical + dp(2.0) else max(0, measuredHeight - indicatorBottomPx - indicatorHeightPx)
+      val indicatorTop = max(0, measuredHeight - indicatorBottomPx - indicatorHeightPx)
       indicator.layout(
         indicatorX,
         indicatorTop,
         indicatorX + indicatorWidth,
-        indicatorTop + indicatorHeight,
+        indicatorTop + indicatorHeightPx,
       )
-      indicator.visibility = if (indicatorHeight > 0) VISIBLE else GONE
+      indicator.visibility = if (indicatorHeightPx > 0) VISIBLE else GONE
       scrollTargetCenterX = interpolatedIndicatorX + interpolatedIndicatorWidth / 2f
       selectedIndex = clamped.roundToInt()
       buttons.forEachIndexed { index, button ->
@@ -365,7 +304,7 @@ private class CollapsiblePagerHorizontalItemsView(
       }
     }
 
-    if (centerSelectionWhenIdle && !segmented && !isTouchDragging && width > 0 && selectedIndex in itemFrames.indices) {
+    if (centerSelectionWhenIdle && !isTouchDragging && width > 0 && selectedIndex in itemFrames.indices) {
       val desired = (scrollTargetCenterX - width / 2f).roundToInt()
         .coerceIn(0, max(0, content.measuredWidth - width))
       scrollTo(desired, 0)
@@ -396,9 +335,7 @@ internal class CollapsiblePagerNativeTabBarView(context: Context) : FrameLayout(
 
   fun updateStyle(
     height: Double,
-    variant: String,
     contentPadding: Double,
-    contentPaddingVertical: Double,
     itemSpacing: Double,
     fontSize: Double,
     fontFamily: String?,
@@ -414,8 +351,6 @@ internal class CollapsiblePagerNativeTabBarView(context: Context) : FrameLayout(
       fontFamily,
       indicatorHeight,
       indicatorBottom,
-      variant,
-      contentPaddingVertical,
     )
     requestLayout()
   }

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

@@ -239,18 +239,6 @@ class CollapsiblePagerViewManager : ViewGroupManager<CollapsiblePagerHost>(),
     view.applyNativeHeaderStyle()
   }
 
-  @ReactProp(name = "nativeTabBarVariant")
-  override fun setNativeTabBarVariant(view: CollapsiblePagerHost?, value: String?) {
-    view ?: return
-    view.nativeTabBarVariant = if (value == "segmented") "segmented" else "underline"
-    view.applyNativeHeaderStyle()
-  }
-
-  @ReactProp(name = "nativeTabBarTrailingReservedWidth", defaultDouble = 0.0)
-  override fun setNativeTabBarTrailingReservedWidth(view: CollapsiblePagerHost?, value: Double) {
-    view?.nativeTabBarTrailingReservedWidth = value
-  }
-
   @ReactProp(name = "nativeTabBarContentPaddingHorizontal")
   override fun setNativeTabBarContentPaddingHorizontal(
     view: CollapsiblePagerHost?,
@@ -261,13 +249,6 @@ class CollapsiblePagerViewManager : ViewGroupManager<CollapsiblePagerHost>(),
     view.applyNativeHeaderStyle()
   }
 
-  @ReactProp(name = "nativeTabBarContentPaddingVertical")
-  override fun setNativeTabBarContentPaddingVertical(view: CollapsiblePagerHost?, value: Double) {
-    view ?: return
-    view.nativeTabBarContentPaddingVertical = if (value.isFinite()) value.coerceAtLeast(0.0) else 0.0
-    view.applyNativeHeaderStyle()
-  }
-
   @ReactProp(name = "nativeTabBarItemSpacing")
   override fun setNativeTabBarItemSpacing(view: CollapsiblePagerHost?, value: Double) {
     view ?: return
@@ -362,14 +343,6 @@ class CollapsiblePagerViewManager : ViewGroupManager<CollapsiblePagerHost>(),
     view?.scrollToTop(target, animated)
   }
 
-  override fun scrollHeaderBy(view: CollapsiblePagerHost?, delta: Double) {
-    view?.scrollHeaderBy(delta)
-  }
-
-  override fun scrollHeaderToOffset(view: CollapsiblePagerHost?, offset: Double) {
-    view?.scrollHeaderToOffset(offset)
-  }
-
   override fun setPage(view: CollapsiblePagerHost?, selectedPage: Int) {
     if (view != null && selectedPage in 0 until view.adapter.itemCount) {
       view.beginPageTransition(selectedPage)

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

@@ -37,50 +37,26 @@ class NativeScrollerView(context: Context) : FrameLayout(context) {
       setMeasuredDimension(MeasureSpec.getSize(widthSpec), MeasureSpec.getSize(heightSpec))
     }
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) = Unit
-
-    override fun startViewTransition(view: View) {
-      super.startViewTransition(view)
-      if (view === reactChild) transitioningReactChild = view
-    }
-
-    override fun endViewTransition(view: View) {
-      super.endViewTransition(view)
-      if (transitioningReactChild === view) transitioningReactChild = null
-      if (retainedReactChild === view) {
-        clearRetainedGeometry()
-        if (isAttachedToWindow) scheduleLayout()
-      }
-    }
   }
   private val contentFrame = object : FrameLayout(context) {
     override fun onMeasure(widthSpec: Int, heightSpec: Int) {
       setMeasuredDimension(
-        max(MeasureSpec.getSize(widthSpec), effectiveContentWidthPx + insetLeft + insetRight),
-        effectiveContentHeightPx + contentTop + insetBottom,
+        max(MeasureSpec.getSize(widthSpec), contentWidthPx + insetLeft + insetRight),
+        contentHeightPx + contentTop + insetBottom,
       )
     }
 
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
       // Only the native origin layer moves. Fabric owns its React child's layout/transform.
-      val contentWidth = effectiveContentWidthPx
-      val contentHeight = effectiveContentHeightPx
       contentOriginFrame.measure(
-        MeasureSpec.makeMeasureSpec(contentWidth, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(contentHeight, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(contentWidthPx, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(contentHeightPx, MeasureSpec.EXACTLY),
       )
-      contentOriginFrame.layout(insetLeft, contentTop, insetLeft + contentWidth, contentTop + contentHeight)
+      contentOriginFrame.layout(insetLeft, contentTop, insetLeft + contentWidthPx, contentTop + contentHeightPx)
     }
   }
   private val pagerInsets = WeakHashMap<View, Int>()
   private var reactChild: View? = null
-  private var transitioningReactChild: View? = null
-  private var retainedReactChild: View? = null
-  private var retainedContentWidthPx = 0
-  private var retainedContentHeightPx = 0
-  private val effectiveContentWidthPx: Int
-    get() = if (reactChild == null && retainedReactChild != null) retainedContentWidthPx else contentWidthPx
-  private val effectiveContentHeightPx: Int
-    get() = if (reactChild == null && retainedReactChild != null) retainedContentHeightPx else contentHeightPx
   private var fabricState: StateWrapper? = null
   private var lastOriginX: Int? = null
   private var lastOriginY: Int? = null
@@ -196,8 +172,6 @@ class NativeScrollerView(context: Context) : FrameLayout(context) {
   internal fun addReactChild(child: View, index: Int) {
     require(index == 0 && reactChild == null) { "NativeScroller requires one React content view" }
     viewport.stopMotion()
-    clearRetainedGeometry()
-    transitioningReactChild = null
     reactChild = child
     contentOriginFrame.addView(child)
     scheduleLayout()
@@ -206,29 +180,13 @@ class NativeScrollerView(context: Context) : FrameLayout(context) {
   internal fun removeReactChild() {
     viewport.stopMotion()
     pendingRestore.cancel()
-    reactChild?.let { child ->
-      clearRetainedGeometry()
-      // Fabric removes the child before its disappearing view finishes drawing.
-      if (transitioningReactChild === child &&
-        contentOriginFrame.width > 0 && contentOriginFrame.height > 0) {
-        retainedReactChild = child
-        retainedContentWidthPx = contentOriginFrame.width
-        retainedContentHeightPx = contentOriginFrame.height
-      }
-      contentOriginFrame.removeView(child)
-    }
+    reactChild?.let(contentOriginFrame::removeView)
     reactChild = null
     contentWidthPx = 0
     contentHeightPx = 0
     scheduleLayout()
   }
 
-  private fun clearRetainedGeometry() {
-    retainedReactChild = null
-    retainedContentWidthPx = 0
-    retainedContentHeightPx = 0
-  }
-
   internal fun reactChildCount() = if (reactChild == null) 0 else 1
   internal fun reactChildAt(index: Int): View {
     require(index == 0)
@@ -423,8 +381,6 @@ class NativeScrollerView(context: Context) : FrameLayout(context) {
     lastContentViewportHeight = null
     viewport.stopMotion()
     viewport.setTag(R.id.onekey_native_scroll_coordinator_offset_listener, null)
-    transitioningReactChild = null
-    clearRetainedGeometry()
     super.onDetachedFromWindow()
   }