Skip to content

Commit 401b162

Browse files
authored
[0.85] Correclty promote flags to experimental for 0.85 release (#56373)
1 parent be03587 commit 401b162

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<8531ce29d0e5362517d35559ebda623b>>
7+
* @generated SignedSource<<2452c003ffcba8e20b7cd40c68e05e3d>>
88
*/
99

1010
/**
@@ -23,11 +23,15 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Experimental_Android :
2323
// We could use JNI to get the defaults from C++,
2424
// but that is more expensive than just duplicating the defaults here.
2525

26+
override fun cxxNativeAnimatedEnabled(): Boolean = true
27+
2628
override fun enableAccessibilityOrder(): Boolean = true
2729

2830
override fun enableSwiftUIBasedFilters(): Boolean = true
2931

3032
override fun fixTextClippingAndroid15useBoundsForWidth(): Boolean = true
3133

3234
override fun preventShadowTreeCommitExhaustion(): Boolean = true
35+
36+
override fun useSharedAnimatedBackend(): Boolean = true
3337
}

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSExperimental.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*
7-
* @generated SignedSource<<6a047fa1d33ea17ebd7ba8d0680ee1cc>>
7+
* @generated SignedSource<<6ded821dda8049a32168bf82333dd4c3>>
88
*/
99

1010
/**
@@ -27,6 +27,10 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur
2727
public:
2828
ReactNativeFeatureFlagsOverridesOSSExperimental() = default;
2929

30+
bool cxxNativeAnimatedEnabled() override {
31+
return true;
32+
}
33+
3034
bool enableAccessibilityOrder() override {
3135
return true;
3236
}
@@ -42,6 +46,10 @@ class ReactNativeFeatureFlagsOverridesOSSExperimental : public ReactNativeFeatur
4246
bool preventShadowTreeCommitExhaustion() override {
4347
return true;
4448
}
49+
50+
bool useSharedAnimatedBackend() override {
51+
return true;
52+
}
4553
};
4654

4755
} // namespace facebook::react

packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const definitions: FeatureFlagDefinitions = {
8080
expectedReleaseValue: true,
8181
purpose: 'experimentation',
8282
},
83-
ossReleaseStage: 'none',
83+
ossReleaseStage: 'experimental',
8484
},
8585
defaultTextToOverflowHidden: {
8686
defaultValue: true,
@@ -878,7 +878,7 @@ const definitions: FeatureFlagDefinitions = {
878878
expectedReleaseValue: true,
879879
purpose: 'experimentation',
880880
},
881-
ossReleaseStage: 'none',
881+
ossReleaseStage: 'experimental',
882882
},
883883
useTraitHiddenOnAndroid: {
884884
defaultValue: false,

0 commit comments

Comments
 (0)