@onekeyfe/react-native-text 3.0.110 → 3.0.111

package/lib/module/Text.android.js

@@ -90,43 +90,44 @@ const PressableText = /*#__PURE__*/forwardRef(function PressableText({
     ref: ref
   });
 });
-function TextImpl({
-  accessible,
-  accessibilityLabel,
-  accessibilityRole,
-  accessibilityState,
-  allowFontScaling,
-  'aria-busy': ariaBusy,
-  'aria-checked': ariaChecked,
-  'aria-disabled': ariaDisabled,
-  'aria-expanded': ariaExpanded,
-  'aria-hidden': ariaHidden,
-  'aria-label': ariaLabel,
-  'aria-selected': ariaSelected,
-  children,
-  ellipsizeMode,
-  disabled,
-  id,
-  nativeID,
-  numberOfLines,
-  onLongPress,
-  onPress,
-  onPressIn,
-  onPressOut,
-  onResponderGrant,
-  onResponderMove,
-  onResponderRelease,
-  onResponderTerminate,
-  onResponderTerminationRequest,
-  onStartShouldSetResponder,
-  pressRetentionOffset,
-  role,
-  selectable,
-  selectionColor,
-  suppressHighlighting,
-  style,
-  ...restProps
-}, forwardedRef) {
+function TextImpl(props, forwardedRef) {
+  const {
+    accessible,
+    accessibilityLabel,
+    accessibilityRole,
+    accessibilityState,
+    allowFontScaling,
+    'aria-busy': ariaBusy,
+    'aria-checked': ariaChecked,
+    'aria-disabled': ariaDisabled,
+    'aria-expanded': ariaExpanded,
+    'aria-hidden': ariaHidden,
+    'aria-label': ariaLabel,
+    'aria-selected': ariaSelected,
+    children,
+    ellipsizeMode,
+    disabled,
+    id,
+    nativeID,
+    numberOfLines,
+    onLongPress,
+    onPress,
+    onPressIn,
+    onPressOut,
+    onResponderGrant,
+    onResponderMove,
+    onResponderRelease,
+    onResponderTerminate,
+    onResponderTerminationRequest,
+    onStartShouldSetResponder,
+    pressRetentionOffset,
+    role,
+    selectable,
+    selectionColor,
+    suppressHighlighting,
+    style,
+    ...restProps
+  } = props;
   const hasTextAncestor = useContext(TextAncestorContext);
   if (hasTextAncestor) {
     return /*#__PURE__*/_jsx(ReactNativeText, {
@@ -243,6 +244,12 @@ function TextImpl({
       processedStyle = [processedStyle, overrides];
     }
   }
+  if (processedSelectable === true && ReactNativeFeatureFlags.enablePreparedTextLayout()) {
+    return /*#__PURE__*/_jsx(ReactNativeText, {
+      ...props,
+      ref: forwardedRef
+    });
+  }
   if (ReactNativeFeatureFlags.defaultTextToOverflowHidden()) {
     processedStyle = [styles.default, processedStyle];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-text",
-  "version": "3.0.110",
+  "version": "3.0.111",
   "description": "Opt-in native text rendering for React Native",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",

package/src/Text.android.tsx

@@ -178,8 +178,8 @@ const PressableText = forwardRef<TextForwardRef, PressableTextProps>(
   }
 );
 
-function TextImpl(
-  {
+function TextImpl(props: TextProps, forwardedRef: Ref<TextForwardRef>) {
+  const {
     accessible,
     accessibilityLabel,
     accessibilityRole,
@@ -215,9 +215,7 @@ function TextImpl(
     suppressHighlighting,
     style,
     ...restProps
-  }: TextProps,
-  forwardedRef: Ref<TextForwardRef>
-) {
+  } = props;
   const hasTextAncestor = useContext(TextAncestorContext);
   if (hasTextAncestor) {
     return (
@@ -369,6 +367,13 @@ function TextImpl(
     }
   }
 
+  if (
+    processedSelectable === true &&
+    ReactNativeFeatureFlags.enablePreparedTextLayout()
+  ) {
+    return <ReactNativeText {...props} ref={forwardedRef} />;
+  }
+
   if (ReactNativeFeatureFlags.defaultTextToOverflowHidden()) {
     processedStyle = [styles.default, processedStyle];
   }

package/src/codegen-types.d.ts

@@ -14,6 +14,7 @@ declare module 'react-native/Libraries/Pressability/PressabilityDebug' {
 }
 
 declare module 'react-native/src/private/featureflags/ReactNativeFeatureFlags' {
+  export function enablePreparedTextLayout(): boolean;
   export function defaultTextToOverflowHidden(): boolean;
 }