Skip to content

Return only view manager names from bridgeless UIManager.getConstants() #59173

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

Open
brownrice777 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −28
Open

Return only view manager names from bridgeless UIManager.getConstants() #59173

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
33 changes: 5 additions & 28 deletions packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,31 +223,15 @@ internal class ReactInstance(
UIConstantsProviderBinding.install(
// Use unbuffered RuntimeExecutor to install binding
unbufferedRuntimeExecutor,
// Here we are construncting the return value for UManager.getConstants call.
// The old architectre relied on the constatnts struct to contain:
// 1. Eagerly loaded view configs for all native components.
// 2. genericBubblingEventTypes.
// 3. genericDirectEventTypes.
// We want to match this beahavior.
{ Arguments.makeNativeMap(UIManagerModuleConstantsHelper.defaultExportableEventTypes) },
ConstantsForViewManagerProvider { viewManagerName: String ->
val viewManager =
viewManagerResolver.getViewManager(viewManagerName)
?: return@ConstantsForViewManagerProvider null
getConstantsForViewManager(viewManager, customDirectEvents)
},
{
val viewManagers: List<ViewManager<*, *>> =
ArrayList(viewManagerResolver.eagerViewManagerMap.values)
val constants = createConstants(viewManagers, customDirectEvents)

val lazyViewManagers = viewManagerResolver.lazyViewManagerNames
if (!lazyViewManagers.isEmpty()) {
constants["ViewManagerNames"] = ArrayList(lazyViewManagers)
constants["LazyViewManagersEnabled"] = true
}
Arguments.makeNativeMap(constants)
},
// Names only: each view config is built on first use.
{ Arguments.makeNativeMap(createConstants(viewManagerResolver)) },
)
}

Expand Down Expand Up @@ -584,20 +568,13 @@ internal class ReactInstance(
SoLoader.loadLibrary("rninstance")
}

private fun createConstants(
viewManagers: List<ViewManager<in Nothing, in Nothing>>,
customDirectEvents: MutableMap<String, Any>?,
): MutableMap<String, Any> {
private fun createConstants(viewManagerResolver: ViewManagerResolver): Map<String, Any> {
ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_START)
SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT, "CreateUIManagerConstants")
.arg("Lazy", false)
.arg("Lazy", true)
.flush()
try {
return UIManagerModuleConstantsHelper.createConstants(
viewManagers,
null,
customDirectEvents,
)
return UIManagerModuleConstantsHelper.createConstants(viewManagerResolver)
} finally {
Systrace.endSection(Systrace.TRACE_TAG_REACT)
ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_END)
Expand Down
Loading