@onekeyfe/react-native-pager-view 6.7.0-alpha.414 → 6.7.0-alpha.418

package/ios/tests/RNCCollapsiblePagerFirstFrameTests.mm

@@ -583,12 +583,34 @@ using namespace facebook::react;
     XCTAssertEqualObjects([pager valueForKey:@"currentIndex"], @0);
   }
   __block RNCNativeScrollerComponentView *replacement;
+  __block BOOL replacementFixtureActive = YES;
   int64_t replacementDelay = finalRetryPending ? 150 : 50;
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, replacementDelay * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
+  dispatch_block_t insertReplacement = dispatch_block_create((dispatch_block_flags_t)0, ^{
+    if (!replacementFixtureActive) return;
     replacement = [self addScrollerToPager:pager atIndex:0];
     [replacementHost addSubview:replacement];
   });
-  [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.3]];
+  // LIFO teardown invalidates this callback before the pager clears its pages.
+  [self addTeardownBlock:^{
+    replacementFixtureActive = NO;
+    dispatch_block_cancel(insertReplacement);
+  }];
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, replacementDelay * NSEC_PER_MSEC),
+                 dispatch_get_main_queue(), insertReplacement);
+  NSPredicate *hasReplacementOwners = [NSPredicate predicateWithBlock:
+    ^BOOL(__unused id object, __unused NSDictionary *bindings) {
+      return replacement != nil &&
+        [pager valueForKey:@"observedScrollView"] == replacement.scrollView &&
+        [pager valueForKey:@"sharedHeaderScrollView"] == replacement.scrollView;
+    }];
+  XCTNSPredicateExpectation *replacementReady =
+    [[XCTNSPredicateExpectation alloc] initWithPredicate:hasReplacementOwners object:nil];
+  XCTWaiterResult result = [XCTWaiter waitForExpectations:@[replacementReady] timeout:5];
+  replacementFixtureActive = NO;
+  dispatch_block_cancel(insertReplacement);
+  XCTAssertEqual(result, XCTWaiterResultCompleted);
+  XCTAssertNotNil(replacement);
+  if (result != XCTWaiterResultCompleted || replacement == nil) return;
   XCTAssertEqual([pager valueForKey:@"observedScrollView"], replacement.scrollView);
   XCTAssertEqual([pager valueForKey:@"sharedHeaderScrollView"], replacement.scrollView);
   XCTAssertEqualWithAccuracy(replacement.scrollView.contentOffset.y + replacement.scrollView.contentInset.top,

package/lib/module/WebCollapsiblePagerPage.js

@@ -148,7 +148,12 @@ export function WebCollapsiblePagerPage({
     owner.addEventListener("keydown", handleKey);
     owner.addEventListener("ok-collapsible-pager-user-scroll", handleUserInput);
     owner.addEventListener("ok-collapsible-pager-insets-changed", requestMeasure);
-    requestMeasure();
+    // Measure synchronously while still inside the layout phase: the metrics
+    // start at width 0, and deferring this first measurement to the next
+    // animation frame let the page paint once at width 0, which collapsed
+    // shrinkable page content (a fiat hero wrapped one character per line,
+    // OK-66299). Resize and scroll updates stay frame-coalesced.
+    measure();
     return () => {
       observer.disconnect();
       observerRef.current = null;
@@ -162,7 +167,7 @@ export function WebCollapsiblePagerPage({
       if (frameRef.current !== null) cancelAnimationFrame(frameRef.current);
       frameRef.current = null;
     };
-  }, [owner, requestMeasure, syncContentObservation]);
+  }, [owner, measure, requestMeasure, syncContentObservation]);
   React.useLayoutEffect(requestMeasure, [isFocused, isRouteActive, headerHeight, stickyHeaderHeight, requestMeasure]);
   const value = React.useMemo(() => ({
     isFocused,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-pager-view",
-  "version": "6.7.0-alpha.414",
+  "version": "6.7.0-alpha.418",
   "description": "React Native wrapper for Android and iOS ViewPager",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",
@@ -43,7 +43,8 @@
     "prepare": "rm -rf lib && bob build",
     "typecheck": "tsc -b",
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
-    "release": "yarn prepare && npm whoami && npm publish --access public"
+    "release": "yarn prepare && npm whoami && npm publish --access public",
+    "test": "jest"
   },
   "keywords": [
     "react-native",
@@ -73,7 +74,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.414",
+    "@onekeyfe/react-native-native-logger": "6.7.0-alpha.418",
     "react": "*",
     "react-native": "*"
   },
@@ -110,5 +111,16 @@
       }
     }
   },
-  "react-native": "./lib/module/index.native.js"
+  "react-native": "./lib/module/index.native.js",
+  "jest": {
+    "preset": "react-native",
+    "modulePathIgnorePatterns": [
+      "<rootDir>/example/node_modules",
+      "<rootDir>/lib/"
+    ],
+    "watchman": false,
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/*.test.ts?(x)"
+    ]
+  }
 }

package/src/WebCollapsiblePagerPage.tsx

@@ -221,7 +221,12 @@ export function WebCollapsiblePagerPage({
     owner.addEventListener("keydown", handleKey);
     owner.addEventListener("ok-collapsible-pager-user-scroll", handleUserInput);
     owner.addEventListener("ok-collapsible-pager-insets-changed", requestMeasure);
-    requestMeasure();
+    // Measure synchronously while still inside the layout phase: the metrics
+    // start at width 0, and deferring this first measurement to the next
+    // animation frame let the page paint once at width 0, which collapsed
+    // shrinkable page content (a fiat hero wrapped one character per line,
+    // OK-66299). Resize and scroll updates stay frame-coalesced.
+    measure();
     return () => {
       observer.disconnect();
       observerRef.current = null;
@@ -235,7 +240,7 @@ export function WebCollapsiblePagerPage({
       if (frameRef.current !== null) cancelAnimationFrame(frameRef.current);
       frameRef.current = null;
     };
-  }, [owner, requestMeasure, syncContentObservation]);
+  }, [owner, measure, requestMeasure, syncContentObservation]);
 
   React.useLayoutEffect(requestMeasure, [isFocused, isRouteActive, headerHeight, stickyHeaderHeight, requestMeasure]);