Skip to content

Implement callFunctionOnModule on BridgelessCatalystInstance #56804

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
javache wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement callFunctionOnModule on BridgelessCatalystInstance #56804

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
2 changes: 1 addition & 1 deletion ...ative/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
}

override fun callFunction(module: String, method: String, arguments: NativeArray?) {
throw UnsupportedOperationException("Unimplemented method 'callFunction'")
reactHost.callFunctionOnModule(module, method, arguments)
}

override fun destroy() {
Expand Down
5 changes: 2 additions & 3 deletions ...ct-native/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import com.facebook.react.bridge.CatalystInstance
import com.facebook.react.bridge.JavaScriptContextHolder
import com.facebook.react.bridge.JavaScriptModule
import com.facebook.react.bridge.JavaScriptModuleRegistry
import com.facebook.react.bridge.NativeArray
import com.facebook.react.bridge.NativeModule
import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.ReactSoftExceptionLogger.logSoftException
Expand Down Expand Up @@ -117,8 +116,8 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
private val reactHost: ReactHostImpl,
private val jsModuleInterface: Class<out JavaScriptModule>,
) : InvocationHandler {
override fun invoke(proxy: Any, method: Method, args: Array<Any?>): Any? {
val jsArgs: NativeArray = Arguments.fromJavaArgs(args)
override fun invoke(proxy: Any, method: Method, args: Array<Any?>?): Any? {
val jsArgs = if (args != null) Arguments.fromJavaArgs(args) else null
reactHost.callFunctionOnModule(
JavaScriptModuleRegistry.getJSModuleName(jsModuleInterface),
method.name,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ public class ReactHostImpl(
internal fun callFunctionOnModule(
moduleName: String,
methodName: String,
args: NativeArray,
args: NativeArray?,
): Task<Boolean> {
val method = "callFunctionOnModule(\"$moduleName\", \"$methodName\")"
return callWithExistingReactInstance(method) { reactInstance: ReactInstance ->
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -462,7 +462,7 @@ internal class ReactInstance(

private external fun getJavaScriptContext(): Long

external fun callFunctionOnModule(moduleName: String, methodName: String, args: NativeArray)
external fun callFunctionOnModule(moduleName: String, methodName: String, args: NativeArray?)

private external fun registerSegmentNative(segmentId: Int, segmentPath: String)

Expand Down
5 changes: 4 additions & 1 deletion packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ void JReactInstance::callFunctionOnModule(
const std::string& moduleName,
const std::string& methodName,
NativeArray* args) {
instance_->callFunctionOnModule(moduleName, methodName, args->consume());
instance_->callFunctionOnModule(
moduleName,
methodName,
args != nullptr ? args->consume() : folly::dynamic::array());
}

jni::alias_ref<JRuntimeExecutor::javaobject>
Expand Down
Loading