@onekeyfe/react-native-pager-view 6.7.0-20 → 6.7.0-22

package/src/PagerViewNativeComponent.ts

@@ -2,24 +2,19 @@ import type * as React from 'react';
 import {
   codegenNativeCommands,
   codegenNativeComponent,
+  type CodegenTypes,
   type HostComponent,
   type ViewProps,
 } from 'react-native';
 
-import type {
-  DirectEventHandler,
-  Double,
-  Int32,
-  WithDefault,
-} from 'react-native/Libraries/Types/CodegenTypes';
 
 export type OnPageScrollEventData = Readonly<{
-  position: Double;
-  offset: Double;
+  position: CodegenTypes.Double;
+  offset: CodegenTypes.Double;
 }>;
 
 export type OnPageSelectedEventData = Readonly<{
-  position: Double;
+  position: CodegenTypes.Double;
 }>;
 
 export type OnPageScrollStateChangedEventData = Readonly<{
@@ -27,32 +22,32 @@ export type OnPageScrollStateChangedEventData = Readonly<{
 }>;
 
 export interface NativeProps extends ViewProps {
-  scrollEnabled?: WithDefault<boolean, true>;
-  layoutDirection?: WithDefault<'ltr' | 'rtl', 'ltr'>;
-  initialPage?: Int32;
-  orientation?: WithDefault<'horizontal' | 'vertical', 'horizontal'>;
-  offscreenPageLimit?: Int32;
-  pageMargin?: Int32;
-  overScrollMode?: WithDefault<'auto' | 'always' | 'never', 'auto'>;
-  overdrag?: WithDefault<boolean, false>;
-  keyboardDismissMode?: WithDefault<'none' | 'on-drag', 'none'>;
+  scrollEnabled?: CodegenTypes.WithDefault<boolean, true>;
+  layoutDirection?: CodegenTypes.WithDefault<'ltr' | 'rtl', 'ltr'>;
+  initialPage?: CodegenTypes.Int32;
+  orientation?: CodegenTypes.WithDefault<'horizontal' | 'vertical', 'horizontal'>;
+  offscreenPageLimit?: CodegenTypes.Int32;
+  pageMargin?: CodegenTypes.Int32;
+  overScrollMode?: CodegenTypes.WithDefault<'auto' | 'always' | 'never', 'auto'>;
+  overdrag?: CodegenTypes.WithDefault<boolean, false>;
+  keyboardDismissMode?: CodegenTypes.WithDefault<'none' | 'on-drag', 'none'>;
   /**
   * Controls the sensitivity of scroll gestures on Android.
   * Higher values make scrolling less sensitive.
   * Valid range: 2 - 8
   * @platform android
   */
-  scrollSensitivity?: Int32;
+  scrollSensitivity?: CodegenTypes.Int32;
   /**
   * When true on an inner PagerView, enables gesture coordination with
   * a parent (outer) PagerView. At sub-tab boundaries the inner pager's
   * gesture recognizer will not begin, allowing the outer pager to take over.
   * @platform ios
   */
-  nestedScrollEnabled?: WithDefault<boolean, false>;
-  onPageScroll?: DirectEventHandler<OnPageScrollEventData>;
-  onPageSelected?: DirectEventHandler<OnPageSelectedEventData>;
-  onPageScrollStateChanged?: DirectEventHandler<OnPageScrollStateChangedEventData>;
+  nestedScrollEnabled?: CodegenTypes.WithDefault<boolean, false>;
+  onPageScroll?: CodegenTypes.DirectEventHandler<OnPageScrollEventData>;
+  onPageSelected?: CodegenTypes.DirectEventHandler<OnPageSelectedEventData>;
+  onPageScrollStateChanged?: CodegenTypes.DirectEventHandler<OnPageScrollStateChangedEventData>;
 }
 
 type PagerViewViewType = HostComponent<NativeProps>;
@@ -60,11 +55,11 @@ type PagerViewViewType = HostComponent<NativeProps>;
 export interface NativeCommands {
   setPage: (
     viewRef: React.ElementRef<PagerViewViewType>,
-    selectedPage: Int32
+    selectedPage: CodegenTypes.Int32
   ) => void;
   setPageWithoutAnimation: (
     viewRef: React.ElementRef<PagerViewViewType>,
-    selectedPage: Int32
+    selectedPage: CodegenTypes.Int32
   ) => void;
   setScrollEnabledImperatively: (
     viewRef: React.ElementRef<PagerViewViewType>,

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]);