@onekeyfe/react-native-pager-view 6.7.0-alpha.436 → 6.7.0-alpha.445

package/README.md

@@ -87,6 +87,18 @@ non-adjacent presses jump directly to the target without passing intermediate
 pages. Set `nativeTabPressAnimationEnabled={true}` to always animate, or `false`
 to always jump. Swipe gestures and imperative page commands are unchanged.
 
+The `text` variant supports `controlled`, stable `selectedKey` and one per-key
+`toolbar` map. Controlled presses report intent; the caller keeps page commands,
+menus and routing. Label colors follow actual page movement while selected font
+weight follows business selection. Toolbar artwork, label, action key and selected
+background transfer together only when the final physical page and selection
+agree. Motion keeps the old artwork with hit/AX disabled; two present icons replace
+in place, and only presence changes fade for about 100 ms. Omitting `toolbar`
+reserves zero width; `{}` reserves 44 logical units, and nonempty maps use their
+largest `contentWidth + trailingInset`. Missing/failed content keeps that slot
+without an active control. See [the contract](docs/SPEC.md#text-tabs-controlled-selection-and-per-tab-toolbar)
+for ownership, cancellation, progress, fallback and current acceptance limits.
+
 > **Behavior change:** earlier versions animated every native tab press when
 > `nativeTabPressAnimationEnabled` was omitted. Pass
 > `nativeTabPressAnimationEnabled={true}` to keep that behavior.
@@ -142,3 +154,7 @@ position emit a momentum begin/end pair; a no-op emits no new pair. A new comman
 new touch, content-root replacement or detach ends the previous active sequence.
 The focused JS tests verify wrapper routing, not native scrolling,
 Yoga rendering, keyboard interaction or refresh placement on a device.
+
+The codegen type boundary uses React Native's public `CodegenTypes` namespace.
+RN 0.86.2/0.88.0 declaration and parser checks preserve emitted JS, native schemas
+and the existing NativeScroller method set; no private type import patch is needed.

package/android/build.gradle

@@ -227,6 +227,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'androidx.viewpager2:viewpager2:1.1.0'
   implementation project(":onekeyfe_react-native-native-logger")
+  implementation project(":onekeyfe_react-native-image")
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -6,6 +6,8 @@ import android.content.pm.ApplicationInfo
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
 import android.test.InstrumentationTestCase
 import android.view.MotionEvent
 import android.view.View
@@ -303,4 +305,137 @@ class CollapsiblePagerTabReservationTest : InstrumentationTestCase() {
       instrumentation.waitForIdleSync()
     }
   }
+  fun testControlledPagerSettlesWhenOnlyParentLayoutRequestRemains() {
+    val context = instrumentation.targetContext
+    val activity = instrumentation.startActivitySync(
+      Intent(context, CollapsiblePagerHitTestActivity::class.java)
+        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+    ) as CollapsiblePagerHitTestActivity
+    lateinit var host: CollapsiblePagerHost
+    lateinit var tab: CollapsiblePagerNativeTabBarView
+    val drain = CollapsiblePagerHost::class.java.getDeclaredMethod("layoutPagerIfRequested").apply { isAccessible = true }
+    try {
+      instrumentation.runOnMainSync {
+        val density = context.resources.displayMetrics.density
+        val width = (320 * density).roundToInt()
+        val height = (500 * density).roundToInt()
+        host = CollapsiblePagerHost(context)
+        host.pendingInitialPage = 1
+        activity.setContentView(host)
+        repeat(4) { host.addReactChild(View(context), it) }
+        host.applyPendingInitialPage()
+        host.nativeTabBarVariant = "text"
+        host.applyNativeHeaderStyle()
+        host.updateNativeTabBarItems("""[{"key":"a","title":"A"},{"key":"b","title":"B"}]""")
+        host.updateNativeTabBarConfig("""{"controlled":true,"selectedKey":"b","pageKeys":["a","b"],"toolbar":{}}""")
+        host.measure(View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY))
+        host.layout(0, 0, width, height)
+        tab = (0 until host.childCount).map(host::getChildAt)
+          .filterIsInstance<CollapsiblePagerNativeTabBarView>().single()
+        host.pager.setCurrentItem(1, false)
+        val recycler = host.pager.getChildAt(0) as RecyclerView
+        host.pager.requestLayout()
+        recycler.requestLayout()
+        recycler.measure(View.MeasureSpec.makeMeasureSpec(recycler.width, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(recycler.height, View.MeasureSpec.EXACTLY))
+        recycler.layout(recycler.left, recycler.top, recycler.right, recycler.bottom)
+        assertFalse(recycler.isLayoutRequested)
+        assertTrue(host.pager.isLayoutRequested)
+        assertTrue(tab.needsToolbarPagerSettlement(1))
+        drain.invoke(host)
+        assertFalse(host.pager.isLayoutRequested)
+      }
+      instrumentation.waitForIdleSync()
+      instrumentation.runOnMainSync {
+        assertFalse(tab.needsToolbarPagerSettlement(1))
+        val posted = CollapsiblePagerHost::class.java.getDeclaredField("toolbarSettlePostedGeneration").apply { isAccessible = true }
+        repeat(50) { drain.invoke(host) }
+        assertNull(posted.get(host))
+        assertFalse(host.pager.isLayoutRequested)
+      }
+      instrumentation.runOnMainSync {
+        val parent = host.parent as ViewGroup
+        val index = parent.indexOfChild(host)
+        parent.removeView(host)
+        parent.addView(host, index)
+        assertTrue(host.isAttachedToWindow)
+        assertTrue(host.isShown)
+        assertTrue(host.width > 0 && host.height > 0)
+        assertFalse(host.isLaidOut)
+        assertEquals(1, host.pager.currentItem)
+        drain.invoke(host)
+        assertTrue(host.isLaidOut)
+      }
+      instrumentation.waitForIdleSync()
+      instrumentation.runOnMainSync {
+        assertEquals(1, host.pager.currentItem)
+        assertFalse(tab.needsToolbarPagerSettlement(1))
+      }
+    } finally {
+      instrumentation.runOnMainSync { activity.finish() }
+      instrumentation.waitForIdleSync()
+    }
+  }
+
+  fun testTextToolbarBackgroundCoversSlotWithSingleTranslucentLayer() {
+    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(44)
+        val tab = CollapsiblePagerNativeTabBarView(context)
+        tab.layoutDirection = View.LAYOUT_DIRECTION_LTR
+        activity.setContentView(tab)
+        tab.updateItemsJSON("""[{"key":"a","title":"A"}]""")
+        fun configure(variant: String, background: Int, entry: Boolean) {
+          tab.updateStyle(44.0, variant, 20.0, 0.0, 8.0, 18.0, null, 2.0, 0.0)
+          val toolbar = if (entry) """{"a":{"iconName":"SliderHorOutline"}}""" else "{}"
+          tab.updateConfigJSON("""{"controlled":true,"selectedKey":"a","pageKeys":["a"],"toolbar":$toolbar}""")
+          tab.updateToolbarPagerState(0, false)
+          tab.updateColors(background, Color.BLACK, Color.GRAY, Color.BLACK)
+          tab.measure(View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
+            View.MeasureSpec.makeMeasureSpec(height, View.MeasureSpec.EXACTLY))
+          tab.layout(0, 0, width, height)
+        }
+        for (background in listOf(0xff204060.toInt(), 0x80204060.toInt(), Color.TRANSPARENT)) {
+          for (entry in listOf(false, true)) {
+            configure("text", background, entry)
+            val row = tab.getChildAt(0) as HorizontalScrollView
+            assertEquals(width - dp(44), row.width)
+            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+            tab.draw(Canvas(bitmap))
+            assertEquals(Color.alpha(background), Color.alpha(bitmap.getPixel(1, height - 1)))
+            assertEquals(Color.alpha(background), Color.alpha(bitmap.getPixel(width - 1, height - 1)))
+            assertEquals(Color.TRANSPARENT, (row.background as ColorDrawable).color)
+            assertEquals(Color.TRANSPARENT, ((row.getChildAt(0) as ViewGroup).background as ColorDrawable).color)
+            bitmap.recycle()
+          }
+        }
+        for (variant in listOf("underline", "text", "segmented", "text")) {
+          val background = 0xff204060.toInt()
+          configure(variant, background, false)
+          val row = tab.getChildAt(0) as HorizontalScrollView
+          assertEquals(if (variant == "text") background else Color.TRANSPARENT,
+            (tab.background as ColorDrawable).color)
+          if (variant == "underline") assertEquals(background, (row.background as ColorDrawable).color)
+          if (variant == "segmented") {
+            val content = row.getChildAt(0) as ViewGroup
+            val track = content.getChildAt(0)
+            assertEquals(background, (track.background as GradientDrawable).color?.defaultColor)
+          }
+        }
+      }
+    } finally {
+      instrumentation.runOnMainSync { activity.finish() }
+      instrumentation.waitForIdleSync()
+    }
+  }
+
 }

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

@@ -115,6 +115,16 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
 
   val pager = ViewPager2(context)
   internal val adapter = CollapsiblePagerAdapter()
+  var onNativeToolbarPress: ((String, DoubleArray) -> Unit)? = null
+  fun updateNativeTabBarConfig(value: String?) {
+    toolbarSettledStamp = null
+    nativeTabBarView.updateConfigJSON(value)
+    settleNativeTabProgressIfReady()
+  }
+
+  private var toolbarTransitionGeneration = 0
+  private var toolbarSettlePostedGeneration: Int? = null
+  private var toolbarSettledStamp: Pair<Int, Int>? = null
   private val nativeTabBarView = CollapsiblePagerNativeTabBarView(context)
   private val nativeSubHeaderView = CollapsiblePagerNativeSubHeaderView(context)
   private val logicalChildren = ArrayList<View>()
@@ -332,6 +342,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
       pager,
       LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT),
     )
+    nativeTabBarView.onToolbarPress = { key, rect -> onNativeToolbarPress?.invoke(key, rect) }
     nativeTabBarView.onItemPress = { index, key -> onNativeTabPress?.invoke(index, key) }
     nativeSubHeaderView.onItemPress = { index, key -> onNativeSubHeaderPress?.invoke(index, key) }
     super.addView(nativeTabBarView)
@@ -399,6 +410,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   fun updateNativeTabBarItems(value: String?) {
+    toolbarSettledStamp = null
     nativeTabBarView.updateItemsJSON(value)
     bringNativeHeadersToFront()
     updateHeaderLayout()
@@ -411,10 +423,44 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     updateHeaderLayout()
   }
 
-  fun updateNativeTabProgress(position: Int, offset: Float) {
+  fun updateNativeTabProgress(position: Int, offset: Float, fromActualPosition: Boolean = false) {
+    // ViewPager2 selects the target before a smooth scroll reaches it.
+    if (!fromActualPosition && nativeTabBarView.usesControlledTextProgress()) return
+    if (fromActualPosition) toolbarSettledStamp = null
     nativeTabBarView.setProgress(position + offset)
   }
 
+  private fun settledPagerPage(): Int? {
+    if (!isAttachedToWindow || !isLaidOut || width <= 0 || pager.width <= 0 ||
+      pager.isLayoutRequested || isPagerRecyclerLayoutSuppressed() || pager.isFakeDragging ||
+      pager.scrollState != ViewPager2.SCROLL_STATE_IDLE || pager.currentItem !in 0 until adapter.itemCount) return null
+    val recycler = pager.getChildAt(0) as? RecyclerView ?: return null
+    if (recycler.isLayoutRequested || recycler.isComputingLayout || recycler.width <= 0 || recycler.height <= 0) return null
+    return pager.currentItem
+  }
+
+  private fun suspendNativeToolbar() {
+    toolbarTransitionGeneration++
+    toolbarSettledStamp = null
+    nativeTabBarView.updateToolbarPagerState(-1, true)
+  }
+
+  private fun settleNativeTabProgressIfReady() {
+    val page = settledPagerPage() ?: return
+    val generation = toolbarTransitionGeneration
+    if (toolbarSettledStamp == (generation to page) && !nativeTabBarView.needsToolbarPagerSettlement(page)) return
+    if (toolbarSettlePostedGeneration == generation) return
+    toolbarSettlePostedGeneration = generation
+    postForCurrentAttachment {
+      if (toolbarTransitionGeneration != generation || toolbarSettlePostedGeneration != generation) return@postForCurrentAttachment
+      toolbarSettlePostedGeneration = null
+      val settledPage = settledPagerPage() ?: return@postForCurrentAttachment
+      if (nativeTabBarView.usesControlledTextProgress()) updateNativeTabProgress(settledPage, 0f, fromActualPosition = true)
+      nativeTabBarView.updateToolbarPagerState(settledPage, false)
+      toolbarSettledStamp = generation to settledPage
+    }
+  }
+
   fun logPagerState(reason: String) {
     log(
       "pager-state reason=$reason inner=$selectedPage outer=${outerPagerIndex()} " +
@@ -588,6 +634,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   internal fun beginPageTransition(target: Int? = null) {
+    suspendNativeToolbar()
     cancelPagerTop()
     if (adapter.itemCount == 0 || !nativeSmoothHeaderScrollEnabled || headerHeightPx <= 0) return
     if (transitionHeaderOffsets == null) {
@@ -627,10 +674,12 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   internal fun onPagerScrolled(position: Int, offset: Float) {
+    val controlledTextProgress = nativeTabBarView.usesControlledTextProgress()
+    if (controlledTextProgress) updateNativeTabProgress(position, offset, fromActualPosition = true)
     if (transitionHeaderOffsets == null) return
     alignPageBody(position)
     if (position + 1 < adapter.itemCount) alignPageBody(position + 1)
-    updateNativeTabProgress(position, offset)
+    if (!controlledTextProgress) updateNativeTabProgress(position, offset)
   }
 
   internal fun onPagerScrollStateChanged(state: Int) {
@@ -640,6 +689,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     } else if (state == ViewPager2.SCROLL_STATE_IDLE && transitionHeaderOffsets != null) {
       finishPageTransition(pager.currentItem)
     }
+    if (state == ViewPager2.SCROLL_STATE_IDLE) settleNativeTabProgressIfReady()
   }
 
   private fun finishPageTransition(position: Int) {
@@ -729,23 +779,44 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
 
   private fun layoutPagerIfRequested() {
     val recycler = pager.getChildAt(0) as? RecyclerView ?: return
-    if (
-      !shouldDrainCollapsiblePagerLayout(
+    val controlledSettlement = nativeTabBarView.usesControlledTextProgress() || nativeTabBarView.usesSettledToolbarOwner()
+    if (controlledSettlement && !isLaidOut && isAttachedToWindow && isShown &&
+      width > 0 && height > 0 && pager.width > 0 && pager.height > 0 &&
+      pager.scrollState == ViewPager2.SCROLL_STATE_IDLE && !pager.isFakeDragging &&
+      pager.currentItem in 0 until adapter.itemCount && !isPagerRecyclerLayoutSuppressed() &&
+      !recycler.isLayoutSuppressed && !recycler.isComputingLayout) {
+      // A retained Fabric host can reattach with bounds but no completed layout.
+      updateHeaderLayout()
+    }
+    if (controlledSettlement && pager.isLayoutRequested && isAttachedToWindow && isLaidOut &&
+      width > 0 && height > 0 && pager.width > 0 && pager.height > 0 &&
+      pager.scrollState == ViewPager2.SCROLL_STATE_IDLE && !pager.isFakeDragging &&
+      pager.currentItem in 0 until adapter.itemCount && !isPagerRecyclerLayoutSuppressed() &&
+      !recycler.isLayoutSuppressed && !recycler.isComputingLayout) {
+      // RN can stop the parent request after the recycler has already laid out.
+      pager.measure(
+        MeasureSpec.makeMeasureSpec(pager.width, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(pager.height, MeasureSpec.EXACTLY),
+      )
+      pager.layout(pager.left, pager.top, pager.right, pager.bottom)
+    }
+    if (shouldDrainCollapsiblePagerLayout(
         recycler.isLayoutRequested,
         recycler.isLayoutSuppressed,
         recycler.isComputingLayout,
         recycler.width,
         recycler.height,
         adapter.itemCount,
+      )) {
+      // 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),
       )
-    ) 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)
+      recycler.layout(recycler.left, recycler.top, recycler.right, recycler.bottom)
+    }
+    if (controlledSettlement) settleNativeTabProgressIfReady()
   }
 
   private fun updateHeaderLayout() {
@@ -843,6 +914,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     postForCurrentAttachment {
       prepareAdjacentPages()
       attachPrimaryScrollObserver()
+      settleNativeTabProgressIfReady()
     }
   }
 
@@ -2451,6 +2523,9 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
     attachmentGeneration += 1
+    toolbarSettledStamp = null
+    toolbarSettlePostedGeneration = null
+    postForCurrentAttachment { settleNativeTabProgressIfReady() }
     restoredRecyclerKeys.clear()
     restoredScrollerKeys.clear()
     viewTreeObserver.addOnPreDrawListener(pageContentLayoutListener)
@@ -2468,6 +2543,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   override fun onDetachedFromWindow() {
+    suspendNativeToolbar()
     cancelHeaderSettledCheck()
     headerCommandOwner = null
     publishHeaderSettledState(false)