From 33b064bb9cdaac6a67a1d76da652d90288e69830 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Thu, 23 May 2024 10:58:01 -0700 Subject: [PATCH] enable preventDoubleTextMeasure optimisation by default (#44659) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/44659 changelog: [internal] Reviewed By: javache Differential Revision: D57678341 fbshipit-source-id: cc6fbcfedccc0fd4610d52feee60b0fc35cc83b9 --- .../internal/featureflags/ReactNativeFeatureFlagsDefaults.kt | 4 ++-- .../react/featureflags/ReactNativeFeatureFlagsDefaults.h | 4 ++-- .../scripts/featureflags/ReactNativeFeatureFlags.config.js | 2 +- .../src/private/featureflags/ReactNativeFeatureFlags.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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 149ecce3378..980ba43a704 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<<4f50dab251c41380a14506975355e49d>> + * @generated SignedSource<<64ab913d2c940a7abfcd2aac32be1b72>> */ /** @@ -55,7 +55,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun lazyAnimationCallbacks(): Boolean = false - override fun preventDoubleTextMeasure(): Boolean = false + override fun preventDoubleTextMeasure(): Boolean = true override fun setAndroidLayoutDirection(): Boolean = false diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index c50025ebf06..8bde1e420dc 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<<2bfa4670757aa340c88ae8ff57270308>> + * @generated SignedSource<<54a1827a45d7dd15b5e8a26d49ad6d30>> */ /** @@ -92,7 +92,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } bool preventDoubleTextMeasure() override { - return false; + return true; } bool setAndroidLayoutDirection() override { diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index fbc772c54fe..5d1b145c398 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -114,7 +114,7 @@ const definitions: FeatureFlagDefinitions = { 'Only enqueue Choreographer calls if there is an ongoing animation, instead of enqueueing every frame.', }, preventDoubleTextMeasure: { - defaultValue: false, + defaultValue: true, description: 'When enabled, ParagraphShadowNode will no longer call measure twice.', }, diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 0378f10607e..15c717c96d8 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<<20c3c50d2124fbfc7bbe434c940ce3bf>> + * @generated SignedSource<<63e7a8952026600cb58367e9c70fb68d>> * @flow strict-local */ @@ -170,7 +170,7 @@ export const lazyAnimationCallbacks: Getter = createNativeFlagGetter('l /** * When enabled, ParagraphShadowNode will no longer call measure twice. */ -export const preventDoubleTextMeasure: Getter = createNativeFlagGetter('preventDoubleTextMeasure', false); +export const preventDoubleTextMeasure: Getter = createNativeFlagGetter('preventDoubleTextMeasure', true); /** * Propagate layout direction to Android views. */