Skip to content

Commit ece2f81

Browse files
RSNarafacebook-github-bot
authored andcommitted
Refactor: Rename installJSIBindings
Summary: I think dispatchJSBindingInstall is a more apt name. This will help align ios and android. On ios, installJSBindings is a function that executes on the js thread, with a runtime pointer. Differential Revision: D89709221
1 parent cd5a130 commit ece2f81

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class TurboModuleManager(
5959

6060
init {
6161

62-
installJSIBindings(runtimeExecutor)
62+
dispatchJSBindingInstall(runtimeExecutor)
6363

6464
eagerInitModuleNames = delegate?.getEagerInitModuleNames() ?: emptyList()
6565

@@ -282,7 +282,7 @@ public class TurboModuleManager(
282282
tmmDelegate: TurboModuleManagerDelegate?,
283283
): HybridData
284284

285-
private external fun installJSIBindings(runtimeExecutor: RuntimeExecutor)
285+
private external fun dispatchJSBindingInstall(runtimeExecutor: RuntimeExecutor)
286286

287287
override fun invalidate() {
288288
/*

packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ void TurboModuleManager::registerNatives() {
118118
registerHybrid({
119119
makeNativeMethod("initHybrid", TurboModuleManager::initHybrid),
120120
makeNativeMethod(
121-
"installJSIBindings", TurboModuleManager::installJSIBindings),
121+
"dispatchJSBindingInstall",
122+
TurboModuleManager::dispatchJSBindingInstall),
122123
});
123124
}
124125

@@ -318,7 +319,16 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
318319
return nullptr;
319320
}
320321

321-
void TurboModuleManager::installJSIBindings(
322+
void TurboModuleManager::installJSBindings(
323+
jsi::Runtime& runtime,
324+
jni::alias_ref<jhybridobject> javaPart) {
325+
TurboModuleBinding::install(
326+
runtime,
327+
createTurboModuleProvider(javaPart),
328+
createLegacyModuleProvider(javaPart));
329+
}
330+
331+
void TurboModuleManager::dispatchJSBindingInstall(
322332
jni::alias_ref<jhybridobject> javaPart,
323333
jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor) {
324334
auto cxxPart = javaPart->cthis();

packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class TurboModuleManager : public jni::HybridClass<TurboModuleManager> {
5555
std::shared_ptr<NativeMethodCallInvoker> nativeMethodCallInvoker,
5656
jni::alias_ref<TurboModuleManagerDelegate::javaobject> delegate);
5757

58-
static void installJSIBindings(
58+
static void installJSBindings(jsi::Runtime &runtime, jni::alias_ref<jhybridobject> javaPart);
59+
static void dispatchJSBindingInstall(
5960
jni::alias_ref<jhybridobject> javaPart,
6061
jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor);
6162

0 commit comments

Comments
 (0)