Skip to content

Commit 9f77074

Browse files
committed
Simplify TurboModule filter in BaseReactPackage iterator
Summary: The `useTurboModules` flag is being deleted; it always returns true on the canary release stage. The iterator in `BaseReactPackage.getNativeModuleIterator()` filters out TurboModules when the flag is on — drop the flag check and always filter. Also drop the now-unused `ReactNativeNewArchitectureFeatureFlags` import. Behavior is unchanged. Changelog: [Internal] Differential Revision: D105718204
1 parent 485e0c6 commit 9f77074

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.facebook.react.bridge.ModuleHolder
1111
import com.facebook.react.bridge.ModuleSpec
1212
import com.facebook.react.bridge.NativeModule
1313
import com.facebook.react.bridge.ReactApplicationContext
14-
import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
1514
import com.facebook.react.module.model.ReactModuleInfo
1615
import com.facebook.react.module.model.ReactModuleInfoProvider
1716
import com.facebook.react.uimanager.ViewManager
@@ -65,12 +64,9 @@ public abstract class BaseReactPackage : ReactPackage {
6564
val reactModuleInfo = entry.value
6665

6766
// This Iterator is used to create the NativeModule registry. The NativeModule
68-
// registry must not have TurboModules. Therefore, if TurboModules are enabled, and
69-
// the current NativeModule is a TurboModule, we need to skip iterating over it.
70-
if (
71-
ReactNativeNewArchitectureFeatureFlags.useTurboModules() &&
72-
reactModuleInfo.isTurboModule
73-
) {
67+
// registry must not have TurboModules. Therefore, if the current NativeModule is
68+
// a TurboModule, we need to skip iterating over it.
69+
if (reactModuleInfo.isTurboModule) {
7470
continue
7571
}
7672

0 commit comments

Comments
 (0)