Skip to content

Commit 69a6c01

Browse files
Altering useFabricInterop definition for handling Twilight + Fb4a
Summary: Making the following changes to definition of `useFabricInterop` feature flag: 1. Changing default value to True for both internal and OSS. 2. Changing expected Release Value to false since aiming at disabling interop finally with new architecture 3. Hence changed the ossReleaseStage from `canary` to `none` 4. Removing all existing over-rides of useFabricInterop to True now that the default is True itself. 5. Adding the over-ride to false for Facebook since that doesn't need the interop Differential Revision: D72266336
1 parent fae1532 commit 69a6c01

File tree

8 files changed

+12
-21
lines changed

8 files changed

+12
-21
lines changed

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

Lines changed: 2 additions & 2 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<<5ad988b3cb0624cb9b46331d54c09f0a>>
7+
* @generated SignedSource<<b8e277be7a521cbc3c4034d127af0a8a>>
88
*/
99

1010
/**
@@ -95,7 +95,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
9595

9696
override fun useEditTextStockAndroidFocusBehavior(): Boolean = true
9797

98-
override fun useFabricInterop(): Boolean = false
98+
override fun useFabricInterop(): Boolean = true
9999

100100
override fun useNativeViewConfigsInBridgelessMode(): Boolean = false
101101

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<<04b05f74eacf566f99d00c630dcb61f4>>
7+
* @generated SignedSource<<f82b5905d822f8009c054a9443f86e39>>
88
*/
99

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

2828
override fun enableFabricRenderer(): Boolean = true
2929

30-
override fun useFabricInterop(): Boolean = true
31-
3230
override fun useNativeViewConfigsInBridgelessMode(): Boolean = true
3331

3432
override fun useTurboModuleInterop(): Boolean = true

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ public open class ReactNativeNewArchitectureFeatureFlagsDefaults(
2727

2828
override fun enableFabricRenderer(): Boolean = newArchitectureEnabled
2929

30-
override fun useFabricInterop(): Boolean = newArchitectureEnabled
31-
3230
override fun useNativeViewConfigsInBridgelessMode(): Boolean =
3331
newArchitectureEnabled || super.useNativeViewConfigsInBridgelessMode()
3432

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

Lines changed: 2 additions & 2 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<<c7344e302f7ece9f41eec0dff5714d6e>>
7+
* @generated SignedSource<<a98f50869ebeb68bd94bca19b7b40123>>
88
*/
99

1010
/**
@@ -172,7 +172,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
172172
}
173173

174174
bool useFabricInterop() override {
175-
return false;
175+
return true;
176176
}
177177

178178
bool useNativeViewConfigsInBridgelessMode() override {

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

Lines changed: 2 additions & 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<<3e23c7633c684049fdcbdd9655bfbe46>>
7+
* @generated SignedSource<<c44a616fd7c941ead315be0b83ae15a7>>
88
*/
99

1010
/**
@@ -103,9 +103,7 @@ class ReactNativeFeatureFlagsOverridesOSSCanary : public ReactNativeFeatureFlags
103103

104104

105105

106-
bool useFabricInterop() override {
107-
return true;
108-
}
106+
109107

110108
bool useNativeViewConfigsInBridgelessMode() override {
111109
return true;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,5 @@ class ReactNativeFeatureFlagsOverridesOSSStable
2626
bool useNativeViewConfigsInBridgelessMode() override {
2727
return true;
2828
}
29-
bool useFabricInterop() override {
30-
return true;
31-
}
3229
};
3330
} // namespace facebook::react

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,14 +427,14 @@ const definitions: FeatureFlagDefinitions = {
427427
ossReleaseStage: 'none',
428428
},
429429
useFabricInterop: {
430-
defaultValue: false,
430+
defaultValue: true,
431431
metadata: {
432432
description:
433433
'Should this application enable the Fabric Interop Layer for Android? If yes, the application will behave so that it can accept non-Fabric components and render them on Fabric. This toggle is controlling extra logic such as custom event dispatching that are needed for the Fabric Interop Layer to work correctly.',
434-
expectedReleaseValue: true,
434+
expectedReleaseValue: false,
435435
purpose: 'release',
436436
},
437-
ossReleaseStage: 'canary',
437+
ossReleaseStage: 'none',
438438
},
439439
useNativeViewConfigsInBridgelessMode: {
440440
defaultValue: false,

packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js

Lines changed: 2 additions & 2 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<<2a2b48a836bfc7c29fddd2a10c4642b9>>
7+
* @generated SignedSource<<5e3d982c0dfc71417fc6a1838758c6f4>>
88
* @flow strict
99
*/
1010

@@ -307,7 +307,7 @@ export const useEditTextStockAndroidFocusBehavior: Getter<boolean> = createNativ
307307
/**
308308
* Should this application enable the Fabric Interop Layer for Android? If yes, the application will behave so that it can accept non-Fabric components and render them on Fabric. This toggle is controlling extra logic such as custom event dispatching that are needed for the Fabric Interop Layer to work correctly.
309309
*/
310-
export const useFabricInterop: Getter<boolean> = createNativeFlagGetter('useFabricInterop', false);
310+
export const useFabricInterop: Getter<boolean> = createNativeFlagGetter('useFabricInterop', true);
311311
/**
312312
* When enabled, the native view configs are used in bridgeless mode.
313313
*/

0 commit comments

Comments
 (0)