mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Remove enableFabricRenderer() call from InteropModuleRegistry (#56852)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56852 The `ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer()` flag is being deleted; it always returns true on the canary release stage. Production: - `checkReactFeatureFlagsConditions` now returns `useFabricInterop()` only. - Remove the now-unused `enableFabricRenderer` import. Test: - `overrideFeatureFlags` test helper drops the `enableFabricRenderer` parameter. - Existing test cases continue to exercise both true/false branches of `useFabricInterop`. Behavior is unchanged. Changelog: [Internal] Reviewed By: javache Differential Revision: D105229610 fbshipit-source-id: 23366d976231ee973ba0f0ad6921f6c6b0bfb613
This commit is contained in:
1 parent
e32c650958
commit
3b9c5819b4
2 files changed
+5
-9
No files matched your search
+1
-3
@@ -10,7 +10,6 @@ package com.facebook.react.bridge.interop
|
||||
import com.facebook.react.bridge.JavaScriptModule
|
||||
import com.facebook.react.common.annotations.internal.InteropLegacyArchitecture
|
||||
import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
|
||||
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer
|
||||
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags.useFabricInterop
|
||||
|
||||
/**
|
||||
@@ -44,8 +43,7 @@ internal class InteropModuleRegistry {
|
||||
}
|
||||
}
|
||||
|
||||
private fun checkReactFeatureFlagsConditions(): Boolean =
|
||||
enableFabricRenderer() && useFabricInterop()
|
||||
private fun checkReactFeatureFlagsConditions(): Boolean = useFabricInterop()
|
||||
|
||||
private companion object {
|
||||
init {
|
||||
|
||||
+4
-6
@@ -48,7 +48,7 @@ class InteropModuleRegistryTest {
|
||||
|
||||
@Test
|
||||
fun getInteropModule_withRegisteredClassAndInvalidFlags_returnsNull() {
|
||||
overrideFeatureFlags(false, false)
|
||||
overrideFeatureFlags(false)
|
||||
underTest.registerInteropModule(RCTEventEmitter::class.java, FakeRCTEventEmitter())
|
||||
|
||||
val interopModule = underTest.getInteropModule(RCTEventEmitter::class.java)
|
||||
@@ -58,7 +58,7 @@ class InteropModuleRegistryTest {
|
||||
|
||||
@Test
|
||||
fun getInteropModule_withRegisteredClassAndValidFlags_returnsInteropModule() {
|
||||
overrideFeatureFlags(true, true)
|
||||
overrideFeatureFlags(true)
|
||||
underTest.registerInteropModule(RCTEventEmitter::class.java, FakeRCTEventEmitter())
|
||||
|
||||
val interopModule = underTest.getInteropModule(RCTEventEmitter::class.java)
|
||||
@@ -68,18 +68,16 @@ class InteropModuleRegistryTest {
|
||||
|
||||
@Test
|
||||
fun getInteropModule_withUnregisteredClass_returnsNull() {
|
||||
overrideFeatureFlags(true, true)
|
||||
overrideFeatureFlags(true)
|
||||
val missingModule = underTest.getInteropModule(FakeJavaScriptModule::class.java)
|
||||
|
||||
assertThat(missingModule).isNull()
|
||||
}
|
||||
|
||||
private fun overrideFeatureFlags(useFabricInterop: Boolean, enableFabricRenderer: Boolean) {
|
||||
private fun overrideFeatureFlags(useFabricInterop: Boolean) {
|
||||
ReactNativeFeatureFlags.override(
|
||||
object : ReactNativeFeatureFlagsDefaults() {
|
||||
override fun useFabricInterop(): Boolean = useFabricInterop
|
||||
|
||||
override fun enableFabricRenderer(): Boolean = enableFabricRenderer
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user