@onekeyfe/react-native-pager-view 6.7.0-alpha.382 → 6.7.0-alpha.383

package/docs/SPEC.md

@@ -917,6 +917,19 @@ fallback debounce, including replacement-state restoration. Other collection
 fallbacks keep that safety delay. Caller insets and retained logical offsets
 remain governed by the existing restoration policy.
 
+A verified, mounted NativeList with usable vertical bounds is a scroll-owner
+boundary. Its React container slots may contain independent Fabric scroll views,
+NativeScroller views or nested pagers; those descendants MUST NOT replace that
+NativeList as the enclosing page's owner or receive its shared header. Candidate
+priority between sibling page owners remains unchanged, including an explicit
+NativeScroller sibling. Pages without an enclosing NativeList retain nested-pager
+active-owner delegation. This boundary does not change scroll offsets, insets,
+shared-header collapse or per-page body memory.
+
+Status: implemented and verified by production-native UIKit regressions on
+iOS 27.1 for footer insertion, explicit-sibling priority and nested-pager
+delegation. Full App and physical-device visual acceptance are reported separately.
+
 When the active scroll owner is removed before its replacement becomes usable,
 the pager MUST retain bounded recovery (at most 12 retries per recovery round,
 spaced 100 ms apart). Clearing the completed mount's reattachment flag MUST NOT

package/ios/RNCCollapsiblePagerViewComponentView.mm

@@ -3691,6 +3691,8 @@ static void RNCLogNativeTabScrollBoundary(NSString *owner,
           resolution.tier = isMountedNativeList
             ? RNCScrollCandidateTierVerifiedNativeList
             : RNCScrollCandidateTierGenericFallback;
+          // React slots inside a verified list may own independent scroll views.
+          if (isMountedNativeList) return resolution;
         }
       }
     }

package/ios/tests/RNCCollapsiblePagerFirstFrameTests.mm

@@ -1,6 +1,7 @@
 #import <XCTest/XCTest.h>
 #import "RNCCollapsiblePagerViewComponentView.h"
 #import "RNCNativeScrollerComponentView.h"
+#import <React/RCTScrollViewComponentView.h>
 #import <react/renderer/components/pagerview/Props.h>
 #import <react/renderer/mounting/MountingTransaction.h>
 
@@ -13,6 +14,7 @@ using namespace facebook::react;
                withSurfaceTelemetry:(const SurfaceTelemetry &)telemetry;
 - (UIScrollView *)findExplicitNativeScrollerInView:(UIView *)view;
 - (UIScrollView *)findVerticalScrollViewInView:(UIView *)view;
+- (UIScrollView *)verticalScrollViewForPageAtIndex:(NSInteger)pageIndex;
 - (void)attachScrollObserverForCurrentPage;
 - (void)attachScrollObserverForCurrentPageAfterTransition:(BOOL)selectionSettled;
 - (void)detachScrollObserver;
@@ -789,4 +791,85 @@ using namespace facebook::react;
   XCTAssertNil([pager valueForKey:@"releasedPageScrollStates"][@"page-0"]);
 }
 
+- (RCTViewComponentView *)addNativeListToPager:(RNCCollapsiblePagerViewComponentView *)pager
+{
+  Class nativeListClass = NSClassFromString(@"HybridNativeListComponent");
+  XCTAssertNotNil(nativeListClass, @"The real NativeList test dependency must be linked");
+  RCTViewComponentView *component = [[nativeListClass alloc] init];
+  component.tag = 92001;
+  component.frame = CGRectMake(0, 0, 320, 600);
+  component.contentView.frame = component.bounds;
+  UIViewController *page = [pager valueForKey:@"pageControllers"][0];
+  [page.view addSubview:component];
+  [component.contentView layoutIfNeeded];
+  return component;
+}
+
+- (void)testNativeListFooterScrollViewCannotReplacePageOwner
+{
+  RNCCollapsiblePagerViewComponentView *pager = [self pagerWithPageCount:1];
+  RCTViewComponentView *component = [self addNativeListToPager:pager];
+  UICollectionView *list = nil;
+  for (UIView *child in component.contentView.subviews) {
+    if ([child isKindOfClass:UICollectionView.class]) {
+      list = (UICollectionView *)child;
+      break;
+    }
+  }
+  XCTAssertTrue([list isKindOfClass:UICollectionView.class]);
+  XCTAssertGreaterThan(CGRectGetWidth(list.bounds), 0);
+  XCTAssertGreaterThan(CGRectGetHeight(list.bounds), 0);
+  XCTAssertEqual(list.delegate, (id)component.contentView);
+  XCTAssertTrue([list isDescendantOfView:component.contentView]);
+  [pager attachScrollObserverForCurrentPage];
+  UIView *header = [pager valueForKey:@"sharedHeaderHostView"];
+  XCTAssertNotNil(header);
+  XCTAssertEqual([pager valueForKey:@"observedScrollView"], list);
+  XCTAssertEqual(header.superview, list);
+  CGFloat inset = list.contentInset.top;
+  CGFloat offset = list.contentOffset.y;
+
+  RCTScrollViewComponentView *footerList = [RCTScrollViewComponentView new];
+  footerList.tag = 92002;
+  footerList.frame = CGRectMake(0, 0, 320, 400);
+  footerList.scrollView.frame = footerList.bounds;
+  footerList.scrollView.contentSize = CGSizeMake(320, 1000);
+  footerList.scrollView.alwaysBounceHorizontal = NO;
+  for (NSInteger index = 0; index < 6; index++) {
+    UIView *slot = index == 2 ? footerList : [UIView new];
+    [component mountChildComponentView:(id)slot index:index];
+  }
+  XCTAssertTrue([footerList isDescendantOfView:list]);
+  XCTAssertEqual([pager verticalScrollViewForPageAtIndex:0], list);
+  ShadowView inserted;
+  inserted.tag = (Tag)footerList.tag;
+  MountingTransaction transaction(1, 2,
+    {ShadowViewMutation::InsertMutation((Tag)component.tag, inserted, 2)}, {});
+  SurfaceTelemetry telemetry;
+  [pager mountingTransactionDidMount:transaction withSurfaceTelemetry:telemetry];
+  XCTAssertEqual([pager valueForKey:@"observedScrollView"], list);
+  XCTAssertEqual(header.superview, list);
+  XCTAssertEqualWithAccuracy(list.contentInset.top, inset, 0.01);
+  XCTAssertEqualWithAccuracy(list.contentOffset.y, offset, 0.01);
+  XCTAssertEqualWithAccuracy(footerList.scrollView.contentInset.top, 0, 0.01);
+}
+
+- (void)testExplicitScrollerSiblingStillPrecedesNativeList
+{
+  RNCCollapsiblePagerViewComponentView *pager = [self pagerWithPageCount:1];
+  [self addNativeListToPager:pager];
+  RNCNativeScrollerComponentView *scroller = [self addScrollerToPager:pager atIndex:0];
+  XCTAssertEqual([pager verticalScrollViewForPageAtIndex:0], scroller.scrollView);
+}
+
+- (void)testPageWithoutNativeListStillDelegatesToNestedPager
+{
+  RNCCollapsiblePagerViewComponentView *outer = [self pagerWithPageCount:1];
+  RNCCollapsiblePagerViewComponentView *inner = [self pagerWithPageCount:1];
+  RNCNativeScrollerComponentView *scroller = [self addScrollerToPager:inner atIndex:0];
+  UIViewController *page = [outer valueForKey:@"pageControllers"][0];
+  [page.view addSubview:inner];
+  XCTAssertEqual([outer verticalScrollViewForPageAtIndex:0], scroller.scrollView);
+}
+
 @end

package/package.json

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

package/react-native-pager-view.podspec

@@ -19,6 +19,7 @@ Pod::Spec.new do |s|
 
   s.test_spec "Tests" do |test_spec|
     test_spec.source_files = "ios/tests/**/*.{m,mm}"
+    test_spec.dependency "react-native-native-list"
   end
 
   install_modules_dependencies(s)