Skip to content

Fix DefaultReactNativeHost assuming lazyViewManagers are always available#43334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
javache wants to merge 1 commit into from
Closed

Fix DefaultReactNativeHost assuming lazyViewManagers are always available #43334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ages/react-native/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -998,6 +998,11 @@ public Collection<String> getViewManagerNames() {
if (names != null) {
uniqueNames.addAll(names);
}
} else {
FLog.w(
ReactConstants.TAG,
"Package %s is not a ViewManagerOnDemandReactPackage, view managers will not be loaded",
reactPackage.getClass().getSimpleName());
}
Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
}
Expand Down
17 changes: 11 additions & 6 deletions ...t-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactNativeHost.kt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,13 +49,18 @@ protected constructor(
DefaultComponentsRegistry.register(componentFactory)

val viewManagerRegistry =
ViewManagerRegistry(
object : ViewManagerResolver {
override fun getViewManager(viewManagerName: String) =
reactInstanceManager.createViewManager(viewManagerName)
if (lazyViewManagersEnabled) {
ViewManagerRegistry(
object : ViewManagerResolver {
override fun getViewManager(viewManagerName: String) =
reactInstanceManager.createViewManager(viewManagerName)

override fun getViewManagerNames() = reactInstanceManager.viewManagerNames
})
override fun getViewManagerNames() = reactInstanceManager.viewManagerNames
})
} else {
ViewManagerRegistry(
reactInstanceManager.getOrCreateViewManagers(reactApplicationContext))
}

FabricUIManagerProviderImpl(
componentFactory, ReactNativeConfig.DEFAULT_CONFIG, viewManagerRegistry)
Expand Down