Skip to content

Commit 77b0e3a

Browse files
mdvaccameta-codesync[bot]
authored andcommitted
Remove enableFabricRenderer feature flag (#56909)
Summary: Pull Request resolved: #56909 The `enableFabricRenderer` feature flag has been removed; it was always set to true on the canary release stage and there are no remaining callers (all inlined in earlier diffs of this stack). This diff: - Removes the `enableFabricRenderer` entry from `ReactNativeFeatureFlags.config.js`. - Updates the description of `enableBridgelessArchitecture` (which referenced `enableFabricRenderer`). - Regenerates the codegen output: the 7 Kotlin `generated` files in `ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/`, the C++ headers and implementations under `ReactCommon/react/featureflags/` and `ReactCommon/react/nativemodule/featureflags/`, the JNI bridge under `ReactAndroid/src/main/jni/react/featureflags/`, and the JS modules under `src/private/featureflags/`. The flag is in the `com.facebook.react.internal.featureflags` package and is excluded from `ReactAndroid.api` tracking; no API metadata regeneration is needed. Behavior is unchanged. Changelog: [Android][Removed] - Remove `enableFabricRenderer` feature flag — Fabric is now always enabled Reviewed By: javache Differential Revision: D105232652 fbshipit-source-id: 5a877ff67e49048e238b03c7461e8b01f2dd2d04
1 parent 183e04a commit 77b0e3a

22 files changed

Lines changed: 93 additions & 214 deletions

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

Lines changed: 2 additions & 8 deletions
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<<56c989556810840e2dd2a42b66d431dc>>
7+
* @generated SignedSource<<6fceacd47d09747b6c5868fbb89dc642>>
88
*/
99

1010
/**
@@ -109,7 +109,7 @@ public object ReactNativeFeatureFlags {
109109
public fun enableAndroidTextMeasurementOptimizations(): Boolean = accessor.enableAndroidTextMeasurementOptimizations()
110110

111111
/**
112-
* Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`.
112+
* Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flag: `useTurboModules`.
113113
*/
114114
@JvmStatic
115115
public fun enableBridgelessArchitecture(): Boolean = accessor.enableBridgelessArchitecture()
@@ -174,12 +174,6 @@ public object ReactNativeFeatureFlags {
174174
@JvmStatic
175175
public fun enableFabricLogs(): Boolean = accessor.enableFabricLogs()
176176

177-
/**
178-
* Enables the use of the Fabric renderer in the whole app.
179-
*/
180-
@JvmStatic
181-
public fun enableFabricRenderer(): Boolean = accessor.enableFabricRenderer()
182-
183177
/**
184178
* Enables font scale changes updating layout for measurable nodes.
185179
*/

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

Lines changed: 1 addition & 11 deletions
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<<43aa532756b07f0b754cd74eb4811664>>
7+
* @generated SignedSource<<86466dcd0447728215ffc23ce0c9fd11>>
88
*/
99

1010
/**
@@ -44,7 +44,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
4444
private var enableExclusivePropsUpdateAndroidCache: Boolean? = null
4545
private var enableFabricCommitBranchingCache: Boolean? = null
4646
private var enableFabricLogsCache: Boolean? = null
47-
private var enableFabricRendererCache: Boolean? = null
4847
private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
4948
private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
5049
private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
@@ -329,15 +328,6 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
329328
return cached
330329
}
331330

332-
override fun enableFabricRenderer(): Boolean {
333-
var cached = enableFabricRendererCache
334-
if (cached == null) {
335-
cached = ReactNativeFeatureFlagsCxxInterop.enableFabricRenderer()
336-
enableFabricRendererCache = cached
337-
}
338-
return cached
339-
}
340-
341331
override fun enableFontScaleChangesUpdatingLayout(): Boolean {
342332
var cached = enableFontScaleChangesUpdatingLayoutCache
343333
if (cached == null) {

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

Lines changed: 1 addition & 3 deletions
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<<5cb98793989e603846a2008aa1a6af41>>
7+
* @generated SignedSource<<674ece24434cc2fa93bca21dc806db2f>>
88
*/
99

1010
/**
@@ -76,8 +76,6 @@ public object ReactNativeFeatureFlagsCxxInterop {
7676

7777
@DoNotStrip @JvmStatic public external fun enableFabricLogs(): Boolean
7878

79-
@DoNotStrip @JvmStatic public external fun enableFabricRenderer(): Boolean
80-
8179
@DoNotStrip @JvmStatic public external fun enableFontScaleChangesUpdatingLayout(): Boolean
8280

8381
@DoNotStrip @JvmStatic public external fun enableIOSTextBaselineOffsetPerLine(): Boolean

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

Lines changed: 1 addition & 3 deletions
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<<f4b6d9ed2f6ccff6ab01e53f6048423c>>
7+
* @generated SignedSource<<a2ee2a39f68b48278eaa301fee26af03>>
88
*/
99

1010
/**
@@ -71,8 +71,6 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
7171

7272
override fun enableFabricLogs(): Boolean = false
7373

74-
override fun enableFabricRenderer(): Boolean = false
75-
7674
override fun enableFontScaleChangesUpdatingLayout(): Boolean = true
7775

7876
override fun enableIOSTextBaselineOffsetPerLine(): Boolean = false

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

Lines changed: 1 addition & 12 deletions
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<<6ee1cc911c3ebb12b31151441dd43605>>
7+
* @generated SignedSource<<413b2f3808dacfde7b9b059fba25ce13>>
88
*/
99

1010
/**
@@ -48,7 +48,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
4848
private var enableExclusivePropsUpdateAndroidCache: Boolean? = null
4949
private var enableFabricCommitBranchingCache: Boolean? = null
5050
private var enableFabricLogsCache: Boolean? = null
51-
private var enableFabricRendererCache: Boolean? = null
5251
private var enableFontScaleChangesUpdatingLayoutCache: Boolean? = null
5352
private var enableIOSTextBaselineOffsetPerLineCache: Boolean? = null
5453
private var enableIOSViewClipToPaddingBoxCache: Boolean? = null
@@ -357,16 +356,6 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
357356
return cached
358357
}
359358

360-
override fun enableFabricRenderer(): Boolean {
361-
var cached = enableFabricRendererCache
362-
if (cached == null) {
363-
cached = currentProvider.enableFabricRenderer()
364-
accessedFeatureFlags.add("enableFabricRenderer")
365-
enableFabricRendererCache = cached
366-
}
367-
return cached
368-
}
369-
370359
override fun enableFontScaleChangesUpdatingLayout(): Boolean {
371360
var cached = enableFontScaleChangesUpdatingLayoutCache
372361
if (cached == null) {

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

Lines changed: 1 addition & 3 deletions
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<<2c5d2f88cf7150403cbed87aeadc0239>>
7+
* @generated SignedSource<<e1acac73151ebf19ba401ecf6f40d1ff>>
88
*/
99

1010
/**
@@ -27,8 +27,6 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android : ReactN
2727

2828
override fun enableBridgelessArchitecture(): Boolean = true
2929

30-
override fun enableFabricRenderer(): Boolean = true
31-
3230
override fun enableIntersectionObserverByDefault(): Boolean = true
3331

3432
override fun enableSwiftUIBasedFilters(): Boolean = true

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

Lines changed: 1 addition & 3 deletions
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<<9945400608426bf3aa1163b9f212d07c>>
7+
* @generated SignedSource<<ba7d0cdd9404c120b189ba04b2506496>>
88
*/
99

1010
/**
@@ -71,8 +71,6 @@ public interface ReactNativeFeatureFlagsProvider {
7171

7272
@DoNotStrip public fun enableFabricLogs(): Boolean
7373

74-
@DoNotStrip public fun enableFabricRenderer(): Boolean
75-
7674
@DoNotStrip public fun enableFontScaleChangesUpdatingLayout(): Boolean
7775

7876
@DoNotStrip public fun enableIOSTextBaselineOffsetPerLine(): Boolean

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.cpp

Lines changed: 1 addition & 15 deletions
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<<50f384f98360c4fc9d16d7c25b82aec6>>
7+
* @generated SignedSource<<2eec37a74572edf4fe6a95c277555c98>>
88
*/
99

1010
/**
@@ -183,12 +183,6 @@ class ReactNativeFeatureFlagsJavaProvider
183183
return method(javaProvider_);
184184
}
185185

186-
bool enableFabricRenderer() override {
187-
static const auto method =
188-
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableFabricRenderer");
189-
return method(javaProvider_);
190-
}
191-
192186
bool enableFontScaleChangesUpdatingLayout() override {
193187
static const auto method =
194188
getReactNativeFeatureFlagsProviderJavaClass()->getMethod<jboolean()>("enableFontScaleChangesUpdatingLayout");
@@ -715,11 +709,6 @@ bool JReactNativeFeatureFlagsCxxInterop::enableFabricLogs(
715709
return ReactNativeFeatureFlags::enableFabricLogs();
716710
}
717711

718-
bool JReactNativeFeatureFlagsCxxInterop::enableFabricRenderer(
719-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
720-
return ReactNativeFeatureFlags::enableFabricRenderer();
721-
}
722-
723712
bool JReactNativeFeatureFlagsCxxInterop::enableFontScaleChangesUpdatingLayout(
724713
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop> /*unused*/) {
725714
return ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout();
@@ -1158,9 +1147,6 @@ void JReactNativeFeatureFlagsCxxInterop::registerNatives() {
11581147
makeNativeMethod(
11591148
"enableFabricLogs",
11601149
JReactNativeFeatureFlagsCxxInterop::enableFabricLogs),
1161-
makeNativeMethod(
1162-
"enableFabricRenderer",
1163-
JReactNativeFeatureFlagsCxxInterop::enableFabricRenderer),
11641150
makeNativeMethod(
11651151
"enableFontScaleChangesUpdatingLayout",
11661152
JReactNativeFeatureFlagsCxxInterop::enableFontScaleChangesUpdatingLayout),

packages/react-native/ReactAndroid/src/main/jni/react/featureflags/JReactNativeFeatureFlagsCxxInterop.h

Lines changed: 1 addition & 4 deletions
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<<7a73667c552251d722f6c9800f53d251>>
7+
* @generated SignedSource<<2f2079e166be5c7d3066239ede9bee31>>
88
*/
99

1010
/**
@@ -102,9 +102,6 @@ class JReactNativeFeatureFlagsCxxInterop
102102
static bool enableFabricLogs(
103103
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
104104

105-
static bool enableFabricRenderer(
106-
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
107-
108105
static bool enableFontScaleChangesUpdatingLayout(
109106
facebook::jni::alias_ref<JReactNativeFeatureFlagsCxxInterop>);
110107

packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

Lines changed: 1 addition & 5 deletions
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<<8233ac72d584e038a6c1d94bea37ea40>>
7+
* @generated SignedSource<<86375427ea016f8ce887ed066d1b21ac>>
88
*/
99

1010
/**
@@ -122,10 +122,6 @@ bool ReactNativeFeatureFlags::enableFabricLogs() {
122122
return getAccessor().enableFabricLogs();
123123
}
124124

125-
bool ReactNativeFeatureFlags::enableFabricRenderer() {
126-
return getAccessor().enableFabricRenderer();
127-
}
128-
129125
bool ReactNativeFeatureFlags::enableFontScaleChangesUpdatingLayout() {
130126
return getAccessor().enableFontScaleChangesUpdatingLayout();
131127
}

0 commit comments

Comments
 (0)