@onekeyfe/react-native-pager-view 6.7.0-2 → 6.7.0-20

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

@@ -65,7 +65,11 @@ 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
   }
@@ -75,6 +79,8 @@ 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
@@ -96,7 +102,9 @@ 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,
@@ -149,17 +157,24 @@ 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 = indicatorHeightPx / 2f
+      indicatorBackground.cornerRadius = if (segmented) dp(14.0).toFloat() else indicatorHeightPx / 2f
     }
+    track.visibility = if (segmented) VISIBLE else GONE
+    if (segmented && !wasSegmented) scrollTo(0, 0)
     applyTypeface()
     requestLayout()
   }
@@ -171,8 +186,9 @@ private class CollapsiblePagerHorizontalItemsView(
     selectedBackgroundColor: Int,
     indicatorColor: Int,
   ) {
-    setBackgroundColor(backgroundColor)
-    content.setBackgroundColor(backgroundColor)
+    setBackgroundColor(if (segmented) Color.TRANSPARENT else backgroundColor)
+    content.setBackgroundColor(if (segmented) Color.TRANSPARENT else backgroundColor)
+    trackBackground.setColor(backgroundColor)
     this.activeTextColor = activeTextColor
     this.inactiveTextColor = inactiveTextColor
     this.selectedBackgroundColor = selectedBackgroundColor
@@ -213,6 +229,46 @@ 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()
@@ -260,6 +316,9 @@ 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
@@ -275,14 +334,16 @@ private class CollapsiblePagerHorizontalItemsView(
       val interpolatedIndicatorWidth = from[3] + (to[3] - from[3]) * fraction
       val indicatorX = interpolatedIndicatorX.roundToInt()
       val indicatorWidth = interpolatedIndicatorWidth.roundToInt()
-      val indicatorTop = max(0, measuredHeight - indicatorBottomPx - indicatorHeightPx)
+      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)
       indicator.layout(
         indicatorX,
         indicatorTop,
         indicatorX + indicatorWidth,
-        indicatorTop + indicatorHeightPx,
+        indicatorTop + indicatorHeight,
       )
-      indicator.visibility = if (indicatorHeightPx > 0) VISIBLE else GONE
+      indicator.visibility = if (indicatorHeight > 0) VISIBLE else GONE
       scrollTargetCenterX = interpolatedIndicatorX + interpolatedIndicatorWidth / 2f
       selectedIndex = clamped.roundToInt()
       buttons.forEachIndexed { index, button ->
@@ -304,7 +365,7 @@ private class CollapsiblePagerHorizontalItemsView(
       }
     }
 
-    if (centerSelectionWhenIdle && !isTouchDragging && width > 0 && selectedIndex in itemFrames.indices) {
+    if (centerSelectionWhenIdle && !segmented && !isTouchDragging && width > 0 && selectedIndex in itemFrames.indices) {
       val desired = (scrollTargetCenterX - width / 2f).roundToInt()
         .coerceIn(0, max(0, content.measuredWidth - width))
       scrollTo(desired, 0)
@@ -335,7 +396,9 @@ internal class CollapsiblePagerNativeTabBarView(context: Context) : FrameLayout(
 
   fun updateStyle(
     height: Double,
+    variant: String,
     contentPadding: Double,
+    contentPaddingVertical: Double,
     itemSpacing: Double,
     fontSize: Double,
     fontFamily: String?,
@@ -351,6 +414,8 @@ internal class CollapsiblePagerNativeTabBarView(context: Context) : FrameLayout(
       fontFamily,
       indicatorHeight,
       indicatorBottom,
+      variant,
+      contentPaddingVertical,
     )
     requestLayout()
   }

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

@@ -239,6 +239,18 @@ 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?,
@@ -249,6 +261,13 @@ 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
@@ -343,6 +362,14 @@ 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/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/main/java/com/reactnativepagerview/NativeScrollerView.kt

@@ -37,26 +37,50 @@ 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), contentWidthPx + insetLeft + insetRight),
-        contentHeightPx + contentTop + insetBottom,
+        max(MeasureSpec.getSize(widthSpec), effectiveContentWidthPx + insetLeft + insetRight),
+        effectiveContentHeightPx + 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(contentWidthPx, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(contentHeightPx, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(contentWidth, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(contentHeight, MeasureSpec.EXACTLY),
       )
-      contentOriginFrame.layout(insetLeft, contentTop, insetLeft + contentWidthPx, contentTop + contentHeightPx)
+      contentOriginFrame.layout(insetLeft, contentTop, insetLeft + contentWidth, contentTop + contentHeight)
     }
   }
   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
@@ -172,6 +196,8 @@ 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()
@@ -180,13 +206,29 @@ class NativeScrollerView(context: Context) : FrameLayout(context) {
   internal fun removeReactChild() {
     viewport.stopMotion()
     pendingRestore.cancel()
-    reactChild?.let(contentOriginFrame::removeView)
+    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 = 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)
@@ -381,6 +423,8 @@ 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()
   }
 

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")
 }