Skip to content

Support defining multiple CxxReactPackages from a single lambda #47897

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
tomscallon wants to merge 1 commit into from
Closed

Support defining multiple CxxReactPackages from a single lambda #47897

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
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2062,6 +2062,7 @@ public final class com/facebook/react/defaults/DefaultTurboModuleManagerDelegate
public fun <init> ()V
public final fun addCxxReactPackage (Lkotlin/jvm/functions/Function0;)Lcom/facebook/react/defaults/DefaultTurboModuleManagerDelegate$Builder;
public final fun addCxxReactPackage (Lkotlin/jvm/functions/Function1;)Lcom/facebook/react/defaults/DefaultTurboModuleManagerDelegate$Builder;
public final fun addCxxReactPackages (Lkotlin/jvm/functions/Function1;)Lcom/facebook/react/defaults/DefaultTurboModuleManagerDelegate$Builder;
public synthetic fun build (Lcom/facebook/react/bridge/ReactApplicationContext;Ljava/util/List;)Lcom/facebook/react/ReactPackageTurboModuleManagerDelegate;
}

Expand Down
30 changes: 12 additions & 18 deletions ...actAndroid/src/main/java/com/facebook/react/defaults/DefaultTurboModuleManagerDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,27 @@ private constructor(
}

public class Builder : ReactPackageTurboModuleManagerDelegate.Builder() {
private var cxxReactPackageProviders:
MutableList<((context: ReactApplicationContext) -> CxxReactPackage)> =
mutableListOf()
private val cxxReactPackageProviders =
mutableListOf<(context: ReactApplicationContext) -> List<CxxReactPackage>>()

public fun addCxxReactPackage(provider: () -> CxxReactPackage): Builder {
cxxReactPackageProviders.add { _ -> provider() }
return this
public fun addCxxReactPackage(provider: () -> CxxReactPackage): Builder = apply {
cxxReactPackageProviders.add { _ -> listOf(provider()) }
}

public fun addCxxReactPackage(
provider: (context: ReactApplicationContext) -> CxxReactPackage
): Builder {
cxxReactPackageProviders.add(provider)
return this
}
): Builder = apply { cxxReactPackageProviders.add { context -> listOf(provider(context)) } }

public fun addCxxReactPackages(
provider: (context: ReactApplicationContext) -> List<CxxReactPackage>
): Builder = apply { cxxReactPackageProviders.add(provider) }

override fun build(
context: ReactApplicationContext,
packages: List<ReactPackage>
): DefaultTurboModuleManagerDelegate {
val cxxReactPackages = mutableListOf<CxxReactPackage>()
for (cxxReactPackageProvider in cxxReactPackageProviders) {
cxxReactPackages.add(cxxReactPackageProvider(context))
}

return DefaultTurboModuleManagerDelegate(context, packages, cxxReactPackages)
}
): DefaultTurboModuleManagerDelegate =
DefaultTurboModuleManagerDelegate(
context, packages, cxxReactPackageProviders.flatMap { provider -> provider(context) })
}

private companion object {
Expand Down