@onekeyfe/react-native-pager-view 3.0.122 → 3.0.124

package/ios/RNCCollapsiblePagerViewComponentView.mm

@@ -6,12 +6,16 @@
 #import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
 
 #import "React/RCTConversions.h"
+#import "React/RCTMountingTransactionObserving.h"
+#import "React/RCTScrollViewComponentView.h"
 #import "React/RCTSurfaceTouchHandler.h"
 #import "React/RCTTouchHandler.h"
 
 using namespace facebook::react;
 
 static void *RNCCollapsiblePagerContentOffsetContext = &RNCCollapsiblePagerContentOffsetContext;
+static NSString *const RNCCollapsiblePagerNativeScrollerIDPrefix =
+  @"rnc-collapsible-pager-native-scroller:";
 
 typedef void (^RNCCollapsiblePagerNativeTabPressHandler)(NSInteger index, NSString *key);
 
@@ -825,6 +829,22 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 - (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
+  if (gestureRecognizer == self.panGestureRecognizer) {
+    UIPanGestureRecognizer *pan = self.panGestureRecognizer;
+    CGPoint translation = [pan translationInView:self];
+    CGPoint velocity = [pan velocityInView:self];
+    CGPoint intent = fabs(translation.x) + fabs(translation.y) >= 1
+      ? translation
+      : velocity;
+    BOOL hasMotion = MAX(fabs(intent.x), fabs(intent.y)) >= 1;
+    if (hasMotion && fabs(intent.y) > fabs(intent.x)) {
+      RNCCollapsiblePagerLog([NSString stringWithFormat:
+        @"pager-axis dx=%.2f dy=%.2f result=vertical-rejected",
+        intent.x,
+        intent.y]);
+      return NO;
+    }
+  }
   if (gestureRecognizer == self.panGestureRecognizer && self.excludedHeaderView != nil) {
     CGPoint point = [gestureRecognizer locationInView:self.excludedHeaderView];
     if ([self.excludedHeaderView hitTest:point withEvent:nil] != nil) {
@@ -895,7 +915,8 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   UIPageViewControllerDataSource,
   UIPageViewControllerDelegate,
   UIScrollViewDelegate,
-  UIGestureRecognizerDelegate
+  UIGestureRecognizerDelegate,
+  RCTMountingTransactionObserving
 >
 - (void)finishPagerScrollEmittingSelection:(BOOL)emitSelection;
 - (void)completeTransitionOnNextRunLoopForGeneration:(NSUInteger)generation
@@ -905,6 +926,12 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 - (void)liftSharedHeadersForPagerTransition:(NSString *)reason;
 - (void)restoreSharedHeadersToContainer;
 - (void)layoutSharedHeaders;
+- (UIScrollView *)currentVerticalScrollViewForParentPager;
+- (UIScrollView *)verticalScrollViewForPageAtIndex:(NSInteger)pageIndex;
+- (UIScrollView *)findExplicitNativeScrollerInView:(UIView *)view;
+- (UIScrollView *)findFabricScrollViewInView:(UIView *)view;
+- (UIScrollView *)findVerticalScrollViewInView:(UIView *)view;
+- (void)scheduleScrollObserverRetryForCurrentPage;
 - (void)preparePageForHorizontalTransitionAtIndex:(NSInteger)pageIndex;
 - (void)updateSharedHeaderPressCancellationGesture;
 - (void)detachSharedHeaderPressCancellationGesture;
@@ -964,12 +991,18 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSMapTable<UIScrollView *, NSNumber *> *_originalInsetAdjustmentBehavior;
   __weak UIScrollView *_observedScrollView;
   __weak UIScrollView *_sharedHeaderScrollView;
+  __weak UIScrollView *_pendingFallbackScrollView;
   __weak UIView *_sharedHeaderPressCancellationGestureHost;
   __weak UIGestureRecognizer *_reactTouchHandler;
   UIPanGestureRecognizer *_sharedHeaderPressCancellationGesture;
   RNCCollapsiblePagerOuterPagerPanGestureRecognizer *_sharedHeaderOuterPagerGesture;
   UIPanGestureRecognizer *_verticalPagerGesture;
   BOOL _observingContentOffset;
+  BOOL _scrollResolveRetryScheduled;
+  CFTimeInterval _pendingFallbackScrollViewDetectedAt;
+  NSInteger _scrollResolveRetryPageIndex;
+  NSInteger _scrollResolveRetryAttempt;
+  NSUInteger _scrollResolveRetryToken;
   CGFloat _currentLogicalOffset;
   CGFloat _observedListPanStartLogicalOffset;
   BOOL _sharedHeadersLiftedForPagerTransition;
@@ -1010,6 +1043,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
     _hasPendingDirectNativePagerChange = NO;
     _pendingGoToIndex = -1;
     _pendingGoToAnimated = YES;
+    _scrollResolveRetryPageIndex = NSNotFound;
     _hasAppliedInitialPage = NO;
     _needsPropsReapply = YES;
     _layoutDirection = @"ltr";
@@ -1067,6 +1101,18 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   return self;
 }
 
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+  if (_nativeSmoothHeaderScrollEnabled && !_isBeingRecycled &&
+      _sharedHeaderHostView.superview != _containerView) {
+    CGPoint headerPoint = [_sharedHeaderHostView convertPoint:point fromView:self];
+    UIView *headerHitView =
+      [_sharedHeaderHostView hitTest:headerPoint withEvent:event];
+    if (headerHitView != nil) return headerHitView;
+  }
+  return [super hitTest:point withEvent:event];
+}
+
 - (void)willMoveToSuperview:(UIView *)newSuperview
 {
   [super willMoveToSuperview:newSuperview];
@@ -1224,6 +1270,14 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 {
   if (!_nativeSmoothHeaderScrollEnabled || _transitioning || _isPagerDragging ||
       scrollView == nil || _isBeingRecycled) return;
+  if ((UIView *)scrollView == _sharedHeaderHostView ||
+      [scrollView isDescendantOfView:_sharedHeaderHostView]) {
+    [self restoreSharedHeadersToContainer];
+    RNCCollapsiblePagerLog([NSString stringWithFormat:
+      @"header-owner=pager page=%ld reason=cycle-guard",
+      (long)_currentIndex]);
+    return;
+  }
   if (_sharedHeaderScrollView == scrollView &&
       _sharedHeaderHostView.superview == scrollView) {
     [self layoutSharedHeaders];
@@ -1240,8 +1294,12 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   [_nativeSubHeaderView updateAncestorGesturePrecedence];
   _currentLogicalOffset = scrollView.contentOffset.y + scrollView.contentInset.top;
   [self layoutSharedHeaders];
+  NSString *scrollKind = [scrollView isKindOfClass:UICollectionView.class]
+    ? @"list"
+    : @"scroller";
   RNCCollapsiblePagerLog([NSString stringWithFormat:
-    @"header-owner=list page=%ld offset=%.2f",
+    @"header-owner=%@ page=%ld offset=%.2f",
+    scrollKind,
     (long)_currentIndex,
     _currentLogicalOffset]);
 }
@@ -1282,13 +1340,15 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   CGFloat stickyY = _headerHeight;
   _headerView.frame = CGRectMake(0, 0, width, _headerHeight);
   _stickyHeaderView.frame = CGRectMake(0, stickyY, width, _stickyHeaderHeight);
+  CGFloat nativeTabBarVisibleHeight = _nativeTabBarView.hidden
+    ? 0
+    : MIN(_stickyHeaderHeight, _nativeTabBarHeight);
   _nativeTabBarView.frame = CGRectMake(
     0,
     stickyY,
     width,
-    MIN(_stickyHeaderHeight, _nativeTabBarHeight)
+    nativeTabBarVisibleHeight
   );
-  CGFloat nativeTabBarVisibleHeight = CGRectGetHeight(_nativeTabBarView.frame);
   _nativeSubHeaderView.frame = CGRectMake(
     0,
     stickyY + nativeTabBarVisibleHeight,
@@ -1307,7 +1367,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
       pageIndex < 0 || pageIndex >= _pageControllers.count) return;
 
   _pageOffsets[[self pageKeyForIndex:pageIndex]] = @(_headerOffset);
-  UIScrollView *scrollView = [self findVerticalScrollViewInView:_pageControllers[pageIndex].view];
+  UIScrollView *scrollView = [self verticalScrollViewForPageAtIndex:pageIndex];
   if (scrollView != nil && scrollView != _observedScrollView) {
     [self applyInsetsToScrollView:scrollView pageIndex:pageIndex restore:YES];
   }
@@ -1315,6 +1375,25 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
 
 #pragma mark - React mounting
 
+- (void)mountingTransactionDidMount:(const MountingTransaction &)transaction
+               withSurfaceTelemetry:(const SurfaceTelemetry &)surfaceTelemetry
+{
+  if (!_nativeSmoothHeaderScrollEnabled || _transitioning ||
+      _isPagerDragging || _isBeingRecycled || self.window == nil ||
+      _currentIndex < 0 || _currentIndex >= _pageControllers.count) return;
+
+  UIView *pageView = _pageControllers[_currentIndex].view;
+  BOOL shouldResolve = _observedScrollView == nil ||
+    ![_observedScrollView isDescendantOfView:pageView];
+  if (!shouldResolve &&
+      [_observedScrollView isKindOfClass:UICollectionView.class]) {
+    UIScrollView *preferred = [self findExplicitNativeScrollerInView:pageView];
+    if (preferred == nil) preferred = [self findFabricScrollViewInView:pageView];
+    shouldResolve = preferred != nil && preferred != _observedScrollView;
+  }
+  if (shouldResolve) [self attachScrollObserverForCurrentPage];
+}
+
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
                           index:(NSInteger)index
 {
@@ -1738,17 +1817,89 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   return [NSString stringWithFormat:@"page-%ld", (long)index];
 }
 
+- (UIScrollView *)currentVerticalScrollViewForParentPager
+{
+  return [self verticalScrollViewForPageAtIndex:_currentIndex];
+}
+
+- (UIScrollView *)verticalScrollViewForPageAtIndex:(NSInteger)pageIndex
+{
+  if (pageIndex < 0 || pageIndex >= _pageControllers.count) return nil;
+  UIView *pageView = _pageControllers[pageIndex].view;
+  UIScrollView *explicitScroller = [self findExplicitNativeScrollerInView:pageView];
+  if (explicitScroller != nil) return explicitScroller;
+  UIScrollView *fabricScrollView = [self findFabricScrollViewInView:pageView];
+  return fabricScrollView ?: [self findVerticalScrollViewInView:pageView];
+}
+
+- (UIScrollView *)findExplicitNativeScrollerInView:(UIView *)view
+{
+  if (view == _sharedHeaderHostView) return nil;
+  if (view != self &&
+      [view isKindOfClass:RNCCollapsiblePagerViewComponentView.class]) {
+    return [(RNCCollapsiblePagerViewComponentView *)view
+      currentVerticalScrollViewForParentPager];
+  }
+  if ([view isKindOfClass:RCTScrollViewComponentView.class]) {
+    RCTScrollViewComponentView *componentView =
+      (RCTScrollViewComponentView *)view;
+    if ([componentView.nativeId hasPrefix:RNCCollapsiblePagerNativeScrollerIDPrefix]) {
+      return componentView.scrollView;
+    }
+  }
+  for (UIView *subview in view.subviews) {
+    UIScrollView *candidate = [self findExplicitNativeScrollerInView:subview];
+    if (candidate != nil) return candidate;
+  }
+  return nil;
+}
+
+- (UIScrollView *)findFabricScrollViewInView:(UIView *)view
+{
+  if (view == _sharedHeaderHostView) return nil;
+  if (view != self &&
+      [view isKindOfClass:RNCCollapsiblePagerViewComponentView.class]) {
+    return [(RNCCollapsiblePagerViewComponentView *)view
+      currentVerticalScrollViewForParentPager];
+  }
+  if ([view isKindOfClass:RCTScrollViewComponentView.class]) {
+    UIScrollView *scrollView =
+      ((RCTScrollViewComponentView *)view).scrollView;
+    if (!scrollView.alwaysBounceHorizontal) {
+      return scrollView;
+    }
+  }
+  for (UIView *subview in view.subviews) {
+    UIScrollView *candidate = [self findFabricScrollViewInView:subview];
+    if (candidate != nil) return candidate;
+  }
+  return nil;
+}
+
 - (UIScrollView *)findVerticalScrollViewInView:(UIView *)view
 {
+  if (view == _sharedHeaderHostView) return nil;
+  // A parent pager must follow the nested pager's active page instead of the
+  // first retained page found by recursive subview order.
+  if (view != self &&
+      [view isKindOfClass:RNCCollapsiblePagerViewComponentView.class]) {
+    UIScrollView *nestedScrollView =
+      [(RNCCollapsiblePagerViewComponentView *)view
+        currentVerticalScrollViewForParentPager];
+    if (nestedScrollView != nil) return nestedScrollView;
+  }
   if ([view isKindOfClass:UICollectionView.class]) {
     UICollectionView *collectionView = (UICollectionView *)view;
     UICollectionViewLayout *layout = collectionView.collectionViewLayout;
-    if (![layout isKindOfClass:UICollectionViewFlowLayout.class] ||
-        ((UICollectionViewFlowLayout *)layout).scrollDirection == UICollectionViewScrollDirectionVertical) {
+    BOOL hasUsableBounds = CGRectGetWidth(collectionView.bounds) > 0 &&
+      CGRectGetHeight(collectionView.bounds) > 0;
+    if (hasUsableBounds &&
+        (![layout isKindOfClass:UICollectionViewFlowLayout.class] ||
+         ((UICollectionViewFlowLayout *)layout).scrollDirection == UICollectionViewScrollDirectionVertical)) {
       return collectionView;
     }
   }
-  // Empty pages may use an RN ScrollView instead of a native row list.
+  // Preserve compatibility with non-Fabric or custom vertical scroll views.
   if ([view isKindOfClass:UIScrollView.class] &&
       ![view isKindOfClass:UICollectionView.class]) {
     UIScrollView *scrollView = (UIScrollView *)view;
@@ -1764,12 +1915,66 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   return nil;
 }
 
+- (void)scheduleScrollObserverRetryForCurrentPage
+{
+  if (_scrollResolveRetryScheduled || _scrollResolveRetryAttempt >= 12 ||
+      _isBeingRecycled) return;
+  _scrollResolveRetryScheduled = YES;
+  _scrollResolveRetryPageIndex = _currentIndex;
+  _scrollResolveRetryAttempt += 1;
+  NSUInteger token = _scrollResolveRetryToken;
+  NSUInteger generation = _generation;
+  NSInteger pageIndex = _currentIndex;
+  dispatch_after(
+    // Fabric can mount a recycled child's native view before attaching its
+    // replacement ScrollView component. Let that transaction settle before
+    // accepting an automatically discovered UICollectionView fallback.
+    dispatch_time(DISPATCH_TIME_NOW, (int64_t)(100 * NSEC_PER_MSEC)),
+    dispatch_get_main_queue(),
+    ^{
+      if (self->_scrollResolveRetryToken != token) return;
+      self->_scrollResolveRetryScheduled = NO;
+      if (self->_isBeingRecycled || self->_generation != generation ||
+          self->_currentIndex != pageIndex) return;
+      [self attachScrollObserverForCurrentPage];
+    }
+  );
+}
+
 - (void)attachScrollObserverForCurrentPage
 {
   [self restoreDetachedScrollInsets];
-  if (_currentIndex < 0 || _currentIndex >= _pageControllers.count) return;
-  UIScrollView *candidate = [self findVerticalScrollViewInView:_pageControllers[_currentIndex].view];
-  if (candidate == nil) return;
+  if (_scrollResolveRetryPageIndex != _currentIndex) {
+    _scrollResolveRetryToken += 1;
+    _scrollResolveRetryScheduled = NO;
+    _scrollResolveRetryAttempt = 0;
+    _scrollResolveRetryPageIndex = _currentIndex;
+    _pendingFallbackScrollView = nil;
+    _pendingFallbackScrollViewDetectedAt = 0;
+  }
+  UIScrollView *candidate = [self verticalScrollViewForPageAtIndex:_currentIndex];
+  if (candidate == nil) {
+    [self scheduleScrollObserverRetryForCurrentPage];
+    return;
+  }
+  if ([candidate isKindOfClass:UICollectionView.class] &&
+      candidate != _observedScrollView) {
+    if (_pendingFallbackScrollView != candidate) {
+      _pendingFallbackScrollView = candidate;
+      _pendingFallbackScrollViewDetectedAt = CACurrentMediaTime();
+      _scrollResolveRetryAttempt = 0;
+    }
+    if (CACurrentMediaTime() - _pendingFallbackScrollViewDetectedAt < 0.5) {
+      [self scheduleScrollObserverRetryForCurrentPage];
+      return;
+    }
+  }
+  _scrollResolveRetryAttempt = 0;
+  _scrollResolveRetryPageIndex = _currentIndex;
+  _scrollResolveRetryToken += 1;
+  _scrollResolveRetryScheduled = NO;
+  _pendingFallbackScrollView = nil;
+  _pendingFallbackScrollViewDetectedAt = 0;
   // Legacy mode keeps the historical pager-first dependency. Smooth mode
   // arbitrates header touches by axis so the vertical list can begin directly.
   if (_pagerScrollView != nil && !_nativeSmoothHeaderScrollEnabled && !_needsPropsReapply) {
@@ -2153,7 +2358,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   NSInteger last = MIN((NSInteger)_pageControllers.count - 1, _currentIndex + 1);
   if (last < first) return;
   for (NSInteger index = first; index <= last; index++) {
-    UIScrollView *scrollView = [self findVerticalScrollViewInView:_pageControllers[index].view];
+    UIScrollView *scrollView = [self verticalScrollViewForPageAtIndex:index];
     if (scrollView != nil && scrollView != _observedScrollView) {
       [self applyInsetsToScrollView:scrollView pageIndex:index restore:YES];
     }
@@ -2356,7 +2561,7 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
   if (index == NSNotFound) return nil;
   NSInteger target = index + delta;
   if (target < 0 || target >= _pageControllers.count) return nil;
-  UIScrollView *scrollView = [self findVerticalScrollViewInView:_pageControllers[target].view];
+  UIScrollView *scrollView = [self verticalScrollViewForPageAtIndex:target];
   if (scrollView != nil) {
     [self applyInsetsToScrollView:scrollView pageIndex:target restore:YES];
   }

package/lib/module/CollapsiblePagerView.js

@@ -30,6 +30,9 @@ export class CollapsiblePagerView extends React.PureComponent {
   lastMountSignature = null;
   nativeTabCommandId = 0;
   latestNativeTabTarget = null;
+  latestNativeSelectedPage = this.state.selectedPage;
+  nativePagerScrollState = "idle";
+  nativeTabCommandQueuedDuringScroll = false;
   componentDidMount() {
     this.notifyMountedPagesChanged();
   }
@@ -77,6 +80,7 @@ export class CollapsiblePagerView extends React.PureComponent {
   }
   dispatchNativeTabPageCommand(position, animated) {
     const commandId = ++this.nativeTabCommandId;
+    this.nativeTabCommandQueuedDuringScroll = this.nativePagerScrollState !== "idle";
     this.latestNativeTabTarget = position;
     this.setState(state => ({
       transientRetainedPages: state.transientRetainedPages.includes(position) ? state.transientRetainedPages : [...state.transientRetainedPages, position]
@@ -126,11 +130,13 @@ export class CollapsiblePagerView extends React.PureComponent {
   };
   onPageSelected = event => {
     const position = clampedPageIndex(event.nativeEvent.position, this.pages().length);
+    this.latestNativeSelectedPage = position;
     if (position !== this.state.selectedPage || this.state.transientRetainedPages.length > 0) {
       const pendingTarget = this.latestNativeTabTarget;
       const transitionComplete = pendingTarget === position;
       if (transitionComplete) {
         this.latestNativeTabTarget = null;
+        this.nativeTabCommandQueuedDuringScroll = false;
       }
       this.setState({
         selectedPage: position,
@@ -139,7 +145,29 @@ export class CollapsiblePagerView extends React.PureComponent {
     }
     this.props.onPageSelected?.(event);
   };
+  onPageScrollStateChanged = event => {
+    const scrollState = event.nativeEvent.pageScrollState;
+    const queuedDuringPreviousScroll = this.nativeTabCommandQueuedDuringScroll;
+    this.nativePagerScrollState = scrollState;
+    // Native drains tab commands queued during an active drag after reporting
+    // that drag as idle. Preserve the newer target through that first idle.
+    if (scrollState === "idle" && this.latestNativeTabTarget !== null && this.latestNativeTabTarget !== this.latestNativeSelectedPage && !queuedDuringPreviousScroll) {
+      ++this.nativeTabCommandId;
+      this.latestNativeTabTarget = null;
+      this.setState({
+        transientRetainedPages: []
+      }, this.notifyMountedPagesChanged);
+    }
+    if (scrollState === "idle") {
+      this.nativeTabCommandQueuedDuringScroll = false;
+    }
+    this.props.onPageScrollStateChanged?.(event);
+  };
   onNativeTabPress = event => {
+    const position = pageIndex(event.nativeEvent.position);
+    if (position !== null && position >= 0 && position < this.pages().length && (position !== this.state.selectedPage || this.latestNativeTabTarget !== null)) {
+      this.dispatchNativeTabPageCommand(position, true);
+    }
     this.props.onNativeTabPress?.(event);
   };
   onNativeSubHeaderPress = event => {
@@ -156,6 +184,7 @@ export class CollapsiblePagerView extends React.PureComponent {
       pageRetentionDistance: _pageRetentionDistance,
       onMountedPagesChanged: _onMountedPagesChanged,
       onPageSelected: _onPageSelected,
+      onPageScrollStateChanged: _onPageScrollStateChanged,
       nativeTabBar,
       onNativeTabPress: _onNativeTabPress,
       nativeSubHeader,
@@ -194,6 +223,7 @@ export class CollapsiblePagerView extends React.PureComponent {
       pageKeys: JSON.stringify(pageKeys),
       retainedPages: JSON.stringify([...retained]),
       onPageSelected: this.onPageSelected,
+      onPageScrollStateChanged: this.onPageScrollStateChanged,
       nativeTabBarItems: nativeTabBarEnabled ? JSON.stringify(nativeTabBar.items) : undefined,
       nativeTabBarHeight: nativeTabBarEnabled ? nativeTabBarStyle?.height ?? 44 : undefined,
       nativeTabBarContentPaddingHorizontal: nativeTabBarEnabled ? nativeTabBarStyle?.contentPaddingHorizontal ?? 20 : undefined,

package/lib/module/NativeScroller.js

@@ -0,0 +1,26 @@
+"use strict";
+
+import * as React from "react";
+import { ScrollView } from "react-native";
+import { jsx as _jsx } from "react/jsx-runtime";
+export const NATIVE_SCROLLER_NATIVE_ID_PREFIX = "rnc-collapsible-pager-native-scroller";
+/**
+ * Primary non-virtualized vertical scroller for a CollapsiblePagerView page.
+ */
+export const NativeScroller = /*#__PURE__*/React.forwardRef(function NativeScroller({
+  nativeID,
+  nestedScrollEnabled = true,
+  pagerScrollKey,
+  ...props
+}, ref) {
+  const generatedId = React.useId();
+  const scrollKey = pagerScrollKey ?? nativeID ?? generatedId;
+  return /*#__PURE__*/_jsx(ScrollView, {
+    ...props,
+    ref: ref,
+    nativeID: `${NATIVE_SCROLLER_NATIVE_ID_PREFIX}:${scrollKey}`,
+    nestedScrollEnabled: nestedScrollEnabled
+  });
+});
+NativeScroller.displayName = "NativeScroller";
+//# sourceMappingURL=NativeScroller.js.map

package/lib/module/NativeScroller.web.js

@@ -0,0 +1,25 @@
+"use strict";
+
+import * as React from "react";
+import { ScrollView } from "react-native";
+import { jsx as _jsx } from "react/jsx-runtime";
+export const NativeScroller = /*#__PURE__*/React.forwardRef(function NativeScroller(inputProps, ref) {
+  const {
+    dataSet,
+    pagerScrollKey: _pagerScrollKey,
+    ...props
+  } = inputProps;
+  const webDataProps = {
+    dataSet: {
+      ...dataSet,
+      collapsiblePagerScroll: "true"
+    }
+  };
+  return /*#__PURE__*/_jsx(ScrollView, {
+    ...props,
+    ref: ref,
+    ...webDataProps
+  });
+});
+NativeScroller.displayName = "NativeScroller";
+//# sourceMappingURL=NativeScroller.web.js.map

package/lib/module/index.js

@@ -4,4 +4,5 @@ import { PagerView } from './PagerView';
 export default PagerView;
 export * from "./usePagerView.js";
 export * from './CollapsiblePagerView';
+export * from './NativeScroller';
 //# sourceMappingURL=index.js.map

package/lib/module/index.web.js

@@ -3,4 +3,5 @@
 export { PagerView as default, PagerView } from "./PagerView.web.js";
 export * from "./usePagerView.js";
 export * from "./CollapsiblePagerView.web.js";
+export * from "./NativeScroller.web.js";
 //# sourceMappingURL=index.web.js.map

package/lib/typescript/src/CollapsiblePagerView.d.ts

@@ -100,6 +100,9 @@ export declare class CollapsiblePagerView extends React.PureComponent<Collapsibl
     private lastMountSignature;
     private nativeTabCommandId;
     private latestNativeTabTarget;
+    private latestNativeSelectedPage;
+    private nativePagerScrollState;
+    private nativeTabCommandQueuedDuringScroll;
     componentDidMount(): void;
     componentDidUpdate(): void;
     setPage: (selectedPage: number) => void;
@@ -112,6 +115,7 @@ export declare class CollapsiblePagerView extends React.PureComponent<Collapsibl
     private mountedPages;
     private notifyMountedPagesChanged;
     private onPageSelected;
+    private onPageScrollStateChanged;
     private onNativeTabPress;
     private onNativeSubHeaderPress;
     render(): import("react/jsx-runtime").JSX.Element;

package/lib/typescript/src/NativeScroller.d.ts

@@ -0,0 +1,12 @@
+import * as React from "react";
+import { type ScrollViewProps } from "react-native";
+export declare const NATIVE_SCROLLER_NATIVE_ID_PREFIX = "rnc-collapsible-pager-native-scroller";
+export interface NativeScrollerProps extends ScrollViewProps {
+    /** Stable identity used when a page replaces or remounts its primary scroller. */
+    pagerScrollKey?: string;
+}
+/**
+ * Primary non-virtualized vertical scroller for a CollapsiblePagerView page.
+ */
+export declare const NativeScroller: React.ForwardRefExoticComponent<NativeScrollerProps & React.RefAttributes<import("react-native/types_generated/Libraries/Components/ScrollView/ScrollView").PublicScrollViewInstance>>;
+//# sourceMappingURL=NativeScroller.d.ts.map

package/lib/typescript/src/NativeScroller.web.d.ts

@@ -0,0 +1,5 @@
+import * as React from "react";
+import type { NativeScrollerProps } from "./NativeScroller";
+export declare const NativeScroller: React.ForwardRefExoticComponent<NativeScrollerProps & React.RefAttributes<import("react-native/types_generated/Libraries/Components/ScrollView/ScrollView").PublicScrollViewInstance>>;
+export type { NativeScrollerProps } from "./NativeScroller";
+//# sourceMappingURL=NativeScroller.web.d.ts.map

package/lib/typescript/src/index.d.ts

@@ -3,6 +3,7 @@ import { PagerView } from './PagerView';
 export default PagerView;
 export * from './usePagerView';
 export * from './CollapsiblePagerView';
+export * from './NativeScroller';
 import type { OnPageScrollEventData as PagerViewOnPageScrollEventData, OnPageSelectedEventData as PagerViewOnPageSelectedEventData, OnPageScrollStateChangedEventData as PageScrollStateChangedNativeEventData, NativeProps } from './PagerViewNativeComponent';
 export type { PagerViewOnPageScrollEventData, PagerViewOnPageSelectedEventData, PageScrollStateChangedNativeEventData, NativeProps as PagerViewProps, };
 export type PagerViewOnPageScrollEvent = ReactNative.NativeSyntheticEvent<PagerViewOnPageScrollEventData>;

package/lib/typescript/src/index.web.d.ts

@@ -2,4 +2,5 @@ export { PagerView as default, PagerView } from "./PagerView.web";
 export type { PagerViewProps, PagerViewOnPageScrollEvent, PagerViewOnPageScrollEventData, PagerViewOnPageSelectedEvent, PagerViewOnPageSelectedEventData, PageScrollStateChangedNativeEvent, PageScrollStateChangedNativeEventData, } from "./PagerView.web";
 export * from "./usePagerView";
 export * from "./CollapsiblePagerView.web";
+export * from "./NativeScroller.web";
 //# sourceMappingURL=index.web.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "3.0.122",
+  "version": "3.0.124",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -67,7 +67,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "3.0.122",
+    "@onekeyfe/react-native-native-logger": "3.0.124",
     "react": "*",
     "react-native": "*"
   },