diff --git a/packages/react-native/Libraries/Text/__tests__/Text-itest.js b/packages/react-native/Libraries/Text/__tests__/Text-itest.js index 0022c4942fe..780b9b3c7a1 100644 --- a/packages/react-native/Libraries/Text/__tests__/Text-itest.js +++ b/packages/react-native/Libraries/Text/__tests__/Text-itest.js @@ -323,7 +323,9 @@ describe('', () => { }); expect(root.getRenderedOutput({props: ['selectable']}).toJSX()).toEqual( - {TEST_TEXT}, + + {TEST_TEXT} + , ); }); diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt index 57fbb2bddcf..380e9ec4c21 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<0151a6981c002284da2c1415de4e968e>> + * @generated SignedSource<> */ /** @@ -55,7 +55,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun enableAndroidAutoOffscreenCompositingForElevation(): Boolean = false - override fun enableAndroidTextMeasurementOptimizations(): Boolean = false + override fun enableAndroidTextMeasurementOptimizations(): Boolean = true override fun enableAsyncDiskCacheCheckInMultiSourceImageAndroid(): Boolean = false @@ -119,7 +119,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun enablePreallocatedPropsDiffOnInsertAndroid(): Boolean = false - override fun enablePreparedTextLayout(): Boolean = false + override fun enablePreparedTextLayout(): Boolean = true override fun enablePropsUpdateReconciliationAndroid(): Boolean = false @@ -167,7 +167,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun perfMonitorV2Enabled(): Boolean = false - override fun preparedTextCacheSize(): Double = 200.0 + override fun preparedTextCacheSize(): Double = 1000.0 override fun preventShadowTreeCommitExhaustion(): Boolean = false diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index f01f6b0cff5..76bb504681e 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<474469c92e08f5eff4efc126bb2b7db9>> + * @generated SignedSource<<46e48274f8b27b9c6136b13048682252>> */ /** @@ -94,7 +94,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } bool enableAndroidTextMeasurementOptimizations() override { - return false; + return true; } bool enableAsyncDiskCacheCheckInMultiSourceImageAndroid() override { @@ -222,7 +222,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } bool enablePreparedTextLayout() override { - return false; + return true; } bool enablePropsUpdateReconciliationAndroid() override { @@ -318,7 +318,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } double preparedTextCacheSize() override { - return 200.0; + return 1000.0; } bool preventShadowTreeCommitExhaustion() override { diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 9645c0df44f..6ac015d3d7e 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -226,7 +226,7 @@ const definitions: FeatureFlagDefinitions = { ossReleaseStage: 'none', }, enableAndroidTextMeasurementOptimizations: { - defaultValue: false, + defaultValue: true, metadata: { dateAdded: '2025-07-01', description: @@ -567,7 +567,7 @@ const definitions: FeatureFlagDefinitions = { ossReleaseStage: 'none', }, enablePreparedTextLayout: { - defaultValue: false, + defaultValue: true, metadata: { dateAdded: '2025-05-01', description: 'Enables caching text layout artifacts for later reuse', @@ -827,10 +827,10 @@ const definitions: FeatureFlagDefinitions = { ossReleaseStage: 'none', }, preparedTextCacheSize: { - defaultValue: 200, + defaultValue: 1000, metadata: { description: 'Number cached PreparedLayouts in TextLayoutManager cache', - expectedReleaseValue: 200, + expectedReleaseValue: 1000, purpose: 'operational', }, ossReleaseStage: 'none', diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 8beeccd1b3c..4ae352c696f 100644 --- a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<721554b73a49d12b6cc4be542c81ec07>> + * @generated SignedSource<<9d10bd1b003d8b0de95141f5676877a2>> * @flow strict * @noformat */ @@ -288,7 +288,7 @@ export const enableAndroidAutoOffscreenCompositingForElevation: Getter /** * Enables various optimizations throughout the path of measuring text on Android. */ -export const enableAndroidTextMeasurementOptimizations: Getter = createNativeFlagGetter('enableAndroidTextMeasurementOptimizations', false); +export const enableAndroidTextMeasurementOptimizations: Getter = createNativeFlagGetter('enableAndroidTextMeasurementOptimizations', true); /** * Runs multi-source image disk-cache checks asynchronously on Android. */ @@ -416,7 +416,7 @@ export const enablePreallocatedPropsDiffOnInsertAndroid: Getter = creat /** * Enables caching text layout artifacts for later reuse */ -export const enablePreparedTextLayout: Getter = createNativeFlagGetter('enablePreparedTextLayout', false); +export const enablePreparedTextLayout: Getter = createNativeFlagGetter('enablePreparedTextLayout', true); /** * When enabled, Android will receive prop updates based on the differences between the last rendered shadow node and the last committed shadow node. */ @@ -512,7 +512,7 @@ export const perfMonitorV2Enabled: Getter = createNativeFlagGetter('per /** * Number cached PreparedLayouts in TextLayoutManager cache */ -export const preparedTextCacheSize: Getter = createNativeFlagGetter('preparedTextCacheSize', 200); +export const preparedTextCacheSize: Getter = createNativeFlagGetter('preparedTextCacheSize', 1000); /** * Enables a new mechanism in ShadowTree to prevent problems caused by multiple threads trying to commit concurrently. If a thread tries to commit a few times unsuccessfully, it will acquire a lock and try again. */