@onekeyfe/react-native-pager-view 3.0.157-alpha.256 → 3.0.157-alpha.257

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

@@ -9,6 +9,7 @@ import android.view.ViewConfiguration
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.HorizontalScrollView
+import android.widget.ImageView
 import android.widget.ScrollView
 // OneKey patch: FrameLayout is inherited through NestedScrollableHost.
 // import android.widget.FrameLayout
@@ -17,11 +18,14 @@ import androidx.core.view.NestedScrollingParentHelper
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.react.R as ReactR
 import com.facebook.react.uimanager.events.NativeGestureUtil
 import com.facebook.react.views.scroll.ReactScrollView
+import com.facebook.react.views.swiperefresh.ReactSwipeRefreshLayout
 import com.margelo.nitro.nativelogger.OneKeyLog
+import java.lang.ref.WeakReference
 import java.util.WeakHashMap
 import kotlin.math.max
 import kotlin.math.min
@@ -116,6 +120,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   private val restoredRecyclerKeys = WeakHashMap<RecyclerView, String>()
   private val originalScrollerPadding = WeakHashMap<ScrollView, ScrollerPadding>()
   private val restoredScrollerKeys = WeakHashMap<ScrollView, String>()
+  private val scrollerRefreshIndicators = WeakHashMap<ScrollView, WeakReference<View>>()
   private val pageOffsets = HashMap<String, Int>()
   private var observedRecyclerView: RecyclerView? = null
   private var observedScrollListener: RecyclerView.OnScrollListener? = null
@@ -604,6 +609,12 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   private fun prepareAdjacentPages() {
+    // Retained pages and replaced controls may leave the attached view tree.
+    for ((scroller, indicator) in scrollerRefreshIndicators.toMap()) {
+      if (nativeScrollerRefreshIndicator(scroller) !== indicator.get()) {
+        restoreNativeScrollerRefreshIndicator(scroller)
+      }
+    }
     val first = max(0, selectedPage - 1)
     val last = min(adapter.itemCount - 1, selectedPage + 1)
     for (index in first..last) {
@@ -794,6 +805,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     updateScrollerPaddingOwnership(scroller, original)
     val topInset = headerHeightPx + stickyHeaderHeightPx
     scroller.clipToPadding = false
+    applyNativeScrollerRefreshIndicator(scroller, topInset)
     if (scroller is ReactScrollView) {
       // Fabric owns the content child's layout, so ScrollView padding alone
       // cannot move it. RN's native ScrollAway API also updates Fabric culling.
@@ -896,6 +908,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   private fun restoreNativeScrollerInsets(scroller: ScrollView) {
+    restoreNativeScrollerRefreshIndicator(scroller)
     val original = originalScrollerPadding.remove(scroller) ?: return
     updateScrollerPaddingOwnership(scroller, original)
     restoredScrollerKeys.remove(scroller)
@@ -910,6 +923,44 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
     scroller.setPadding(original.left, original.top, original.right, original.bottom)
   }
 
+  private fun nativeScrollerRefreshIndicator(scroller: ScrollView): View? {
+    if (!nativeSmoothHeaderScrollEnabled) return null
+    var ancestor = scroller.parent
+    while (ancestor != null && ancestor !== this) ancestor = ancestor.parent
+    if (ancestor !== this) return null
+    val refresh = scroller.parent as? ReactSwipeRefreshLayout ?: return null
+    for (index in 0 until refresh.childCount) {
+      val child = refresh.getChildAt(index)
+      if (child is ImageView && child.drawable is CircularProgressDrawable) return child
+    }
+    return null
+  }
+
+  private fun applyNativeScrollerRefreshIndicator(scroller: ScrollView, inset: Int) {
+    val indicator = nativeScrollerRefreshIndicator(scroller)
+    if (scrollerRefreshIndicators[scroller]?.get() !== indicator) {
+      restoreNativeScrollerRefreshIndicator(scroller)
+    }
+    if (indicator == null) return
+    if (scrollerRefreshIndicators[scroller]?.get() !== indicator) {
+      scrollerRefreshIndicators[scroller] = WeakReference(indicator)
+    }
+    val translation = refreshIndicatorTranslations.getOrPut(indicator) {
+      NativeScrollerRefreshTranslation(indicator.translationY)
+    }
+    // Moving only the drawing preserves RN's offsets and AndroidX's active pull/refresh animation.
+    // setProgressViewOffset would reset that animation and clear isRefreshing.
+    val next = translation.update(indicator.translationY, this, inset.toFloat())
+    if (indicator.translationY != next) indicator.translationY = next
+  }
+
+  private fun restoreNativeScrollerRefreshIndicator(scroller: ScrollView) {
+    val indicator = scrollerRefreshIndicators.remove(scroller)?.get() ?: return
+    val translation = refreshIndicatorTranslations[indicator] ?: return
+    indicator.translationY = translation.update(indicator.translationY, this, null)
+    if (translation.isEmpty) refreshIndicatorTranslations.remove(indicator)
+  }
+
   private fun headerRegionAt(y: Float): String? {
     val headerBottom = headerHeightPx - headerOffsetPx
     val stickyBottom = headerHeightPx + stickyHeaderHeightPx - headerOffsetPx
@@ -1232,6 +1283,7 @@ class CollapsiblePagerHost(context: Context) : NestedScrollableHost(context), Ne
   }
 
   companion object {
+    private val refreshIndicatorTranslations = WeakHashMap<View, NativeScrollerRefreshTranslation>()
     const val NATIVE_SCROLLER_ID_PREFIX = "rnc-collapsible-pager-native-scroller:"
     const val PAGE_SLOT_OFFSET = 2
   }

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

@@ -1,5 +1,7 @@
 package com.reactnativepagerview
 
+import java.util.WeakHashMap
+
 // Replace only this pager's contribution; another native owner may share the scroller.
 internal fun nativeScrollerScrollAwayTop(currentTop: Int, previousInset: Int, nextInset: Int): Int =
   (currentTop - previousInset).coerceAtLeast(0) + nextInset
@@ -15,3 +17,21 @@ internal fun nativeScrollerPaddingWasResetByScrollAway(
   scrollAwayBottom: Int,
 ): Boolean = appliedInset > 0 && left == 0 && top == 0 && right == 0 &&
   bottom == scrollAwayTop + scrollAwayBottom
+
+internal class NativeScrollerRefreshTranslation(initialTranslation: Float) {
+  private val contributions = WeakHashMap<Any, Float>()
+  private var baseline = initialTranslation
+  private var lastApplied = initialTranslation
+
+  val isEmpty: Boolean
+    get() = contributions.isEmpty()
+
+  fun update(currentTranslation: Float, owner: Any, inset: Float?): Float {
+    // Native refresh layout owns top/scale, while an external translation is
+    // an absolute baseline rather than another copy of our previous inset.
+    if (currentTranslation != lastApplied) baseline = currentTranslation
+    if (inset == null) contributions.remove(owner) else contributions[owner] = inset
+    lastApplied = baseline + contributions.values.sum()
+    return lastApplied
+  }
+}

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

@@ -34,4 +34,62 @@ fun main() {
   // Initial discovery must capture caller values before this pager owns an inset.
   check(!nativeScrollerPaddingWasResetByScrollAway(0, 0, 0, 0, 230, 230, 0))
   println("NativeScroller ScrollAway ownership: initial, repeat, measured resize, nested detach, Fabric reset, RN padding replay, and caller updates passed")
+
+  val firstOwner = Any()
+  val secondOwner = Any()
+  val translation = NativeScrollerRefreshTranslation(7.5f)
+  check(translation.isEmpty)
+  var current = translation.update(7.5f, firstOwner, 230f)
+  check(current == 237.5f)
+  check(!translation.isEmpty)
+  current = translation.update(current, firstOwner, 230f)
+  check(current == 237.5f)
+  current = translation.update(current, firstOwner, 358f)
+  check(current == 365.5f)
+  current = translation.update(current, secondOwner, 64f)
+  check(current == 429.5f)
+  current = translation.update(current, firstOwner, null)
+  check(current == 71.5f)
+  check(!translation.isEmpty)
+  current = translation.update(current, secondOwner, null)
+  check(current == 7.5f)
+  check(translation.isEmpty)
+
+  // Reversing release order must restore the same original translation.
+  current = translation.update(current, firstOwner, 230f)
+  current = translation.update(current, secondOwner, 64f)
+  current = translation.update(current, secondOwner, null)
+  check(current == 237.5f)
+  current = translation.update(current, firstOwner, null)
+  check(current == 7.5f)
+  check(translation.isEmpty)
+
+  // A caller's absolute translation update replaces the baseline, not its inset.
+  current = translation.update(current, firstOwner, 230f)
+  check(current == 237.5f)
+  current = translation.update(-12.5f, firstOwner, 230f)
+  check(current == 217.5f)
+  current = translation.update(current, secondOwner, 64f)
+  check(current == 281.5f)
+  current = translation.update(current, firstOwner, null)
+  check(current == 51.5f)
+  current = translation.update(current, secondOwner, null)
+  check(current == -12.5f)
+  check(translation.isEmpty)
+
+  // Zero is a real owned contribution; only null releases ownership.
+  current = translation.update(current, firstOwner, 0f)
+  check(current == -12.5f)
+  check(!translation.isEmpty)
+  current = translation.update(current, secondOwner, 0f)
+  current = translation.update(current, firstOwner, null)
+  check(current == -12.5f)
+  check(!translation.isEmpty)
+  current = translation.update(current, secondOwner, null)
+  check(current == -12.5f)
+  check(translation.isEmpty)
+  current = translation.update(9f, firstOwner, null)
+  check(current == 9f)
+  check(translation.isEmpty)
+  println("NativeScroller refresh translation: repeat, resize, nested release orders, external baseline, zero contribution, and final restoration passed")
 }

package/docs/SPEC.md

@@ -3,6 +3,40 @@
 Existing PagerView and CollapsiblePagerView APIs are documented in README.md.
 The sections below define native coordination boundaries without new React props.
 
+## Android NativeScroller refresh indicator placement
+
+Status: implemented; Android API 36 Home pull-gesture visibility verified on
+2026-09-28. Spot, Perps and DeFi (RN NativeScroller), plus the unchanged NFT and
+History (NativeList), each pass header-origin and content-origin pulls. Ten
+recordings show a visible indicator below the shared tabs, one refresh event and
+normal disappearance. This verifies UI feedback and event dispatch, not
+downstream request completion. Dynamic caller offset, refresh-time header resize
+and nested-pager replacement remain separate device acceptance work.
+In smooth-header mode, each pager contributes its header-plus-sticky height in
+physical pixels to the RN NativeScroller refresh indicator's `translationY`.
+The coordinator identifies only the refresh layout's direct indicator child;
+it MUST NOT translate the content ScrollView or change refresh offsets, bounds,
+scale, animation, visibility, trigger distance, refreshing state or callbacks.
+RN retains ownership of `progressViewOffset`, including dynamic caller updates.
+NativeList keeps its existing independent refresh-indicator positioning.
+
+One state per indicator combines weak owner contributions on the UI thread.
+Repeated application and header resizing replace only the calling owner's
+contribution. An external translation different from the last applied value
+becomes the new baseline. Removing an owner preserves the remaining contributions;
+removing the final owner restores the latest baseline. A zero contribution still
+has an owner until explicitly released. State MUST NOT strongly retain an owner
+or the indicator. Late mounting, indicator replacement and scroller/pager detach
+use the existing native layout lifecycle; there is no JavaScript frame callback.
+
+The standalone JVM policy test covers nonzero baselines, repeated application,
+resize, nested owners removed in either order, external translation updates,
+zero contributions and final restoration. It does not prove Android view
+discovery, actual refresh state or rendered placement. Runtime acceptance requires
+header-origin and content-origin pulls on NativeScroller pages, caller offset
+changes, refresh-time layout changes, replacement/detach, and visible disappearance
+after completion; existing NativeList pages must remain unchanged.
+
 ## iOS refresh indicator placement
 
 Status: source implementation; real refresh-cycle acceptance pending.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "3.0.157-alpha.256",
+  "version": "3.0.157-alpha.257",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",