From c7d688be9c0c7cd3a69f3fbda966487a281ee887 Mon Sep 17 00:00:00 2001 From: Zeya Peng Date: Mon, 29 Jun 2026 08:52:52 -0700 Subject: [PATCH] Undo featureflag default true & promote to canary instead, enable for Meta overrides Summary: ## Changelog: [Internal] - Undo featureflag default true & promote to canary instead, enable for Meta overrides We need more discussion about testing in canary before release. Since 0.87 cut is coming soon, let's not enable the flag for 0.87 just yet Reviewed By: javache Differential Revision: D110053624 --- .../featureflags/ReactNativeFeatureFlagsDefaults.kt | 4 ++-- ...ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt | 4 +++- ...ativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt | 4 +--- .../react/featureflags/ReactNativeFeatureFlagsDefaults.h | 4 ++-- .../ReactNativeFeatureFlagsOverridesOSSCanary.h | 6 +++++- .../ReactNativeFeatureFlagsOverridesOSSExperimental.h | 6 +----- .../scripts/featureflags/ReactNativeFeatureFlags.config.js | 4 ++-- .../src/private/featureflags/ReactNativeFeatureFlags.js | 4 ++-- 8 files changed, 18 insertions(+), 18 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 3c3615871526..3042b175d7b4 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<<4c0b09eb9df8e4580dc4778a91591236>> + * @generated SignedSource<<4227353cb809dac40fe70d83154ba2bc>> */ /** @@ -27,7 +27,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi override fun cdpInteractionMetricsEnabled(): Boolean = false - override fun cxxNativeAnimatedEnabled(): Boolean = true + override fun cxxNativeAnimatedEnabled(): Boolean = false override fun defaultTextToOverflowHidden(): Boolean = true diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt index 298189739990..793f302d6c72 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.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<<0642a793f11832205a362e6d1ae6e081>> + * @generated SignedSource<> */ /** @@ -23,6 +23,8 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android : ReactN // We could use JNI to get the defaults from C++, // but that is more expensive than just duplicating the defaults here. + override fun cxxNativeAnimatedEnabled(): Boolean = true + override fun enableAccessibilityOrder(): Boolean = true override fun enableBridgelessArchitecture(): Boolean = true diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt index 0e61201288d8..14a604ced140 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.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<<21e8d5e2a4a37e0a51f25609b80f4924>> + * @generated SignedSource<<7103d9c2fa3e2f152ce60b5dff12c0e4>> */ /** @@ -23,8 +23,6 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android : // We could use JNI to get the defaults from C++, // but that is more expensive than just duplicating the defaults here. - override fun cxxNativeAnimatedEnabled(): Boolean = true - override fun enableFlexboxAutoMinSizeInStrictMode(): Boolean = true override fun enableRuntimeSchedulerQueueClearingOnError(): Boolean = true diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h index f42230f27078..94b133a46dca 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<<6451b9c50b78b3b00fc74b137f5ca541>> + * @generated SignedSource<> */ /** @@ -36,7 +36,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider { } bool cxxNativeAnimatedEnabled() override { - return true; + return false; } bool defaultTextToOverflowHidden() override { diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h index c1838909b42e..a307c7a14436 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.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<<72ef3ea85f4833a96fe222950d16278b>> + * @generated SignedSource<<5d286510a4f8642adcc9d38556dd60dd>> */ /** @@ -27,6 +27,10 @@ class ReactNativeFeatureFlagsOverridesOSSCanary : public ReactNativeFeatureFlags public: ReactNativeFeatureFlagsOverridesOSSCanary() = default; + bool cxxNativeAnimatedEnabled() override { + return true; + } + bool enableAccessibilityOrder() override { return true; } diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h index ac8522edf756..20ffb27c3e7a 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.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<> + * @generated SignedSource<<7341b28bb77aeeec670051149faeae04>> */ /** @@ -27,10 +27,6 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur public: ReactNativeFeatureFlagsOverridesOSSExperimental() = default; - bool cxxNativeAnimatedEnabled() override { - return true; - } - bool enableFlexboxAutoMinSizeInStrictMode() override { return true; } diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 7de76c792548..b8e24abd1a00 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -72,7 +72,7 @@ const definitions: FeatureFlagDefinitions = { ossReleaseStage: 'none', }, cxxNativeAnimatedEnabled: { - defaultValue: true, + defaultValue: false, metadata: { dateAdded: '2025-03-14', description: @@ -80,7 +80,7 @@ const definitions: FeatureFlagDefinitions = { expectedReleaseValue: true, purpose: 'experimentation', }, - ossReleaseStage: 'experimental', + ossReleaseStage: 'canary', }, defaultTextToOverflowHidden: { defaultValue: true, diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index a0128c87b1a6..cebd1193a628 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<<1a333a44919efce6bb2070bae79bdf9b>> + * @generated SignedSource<<5e80ae1ef75d1fbf51fd94cd5495157f>> * @flow strict * @noformat */ @@ -220,7 +220,7 @@ export const cdpInteractionMetricsEnabled: Getter = createNativeFlagGet /** * Use a C++ implementation of Native Animated instead of the platform implementation. */ -export const cxxNativeAnimatedEnabled: Getter = createNativeFlagGetter('cxxNativeAnimatedEnabled', true); +export const cxxNativeAnimatedEnabled: Getter = createNativeFlagGetter('cxxNativeAnimatedEnabled', false); /** * When enabled, sets the default overflow style for Text components to hidden instead of visible. */