Skip to content

Commit cbdbb47

Browse files
RSNarafacebook-github-bot
authored andcommittedMar 15, 2023
Refactor: Move ModuleProvider param to the end in TurboModuleBinding::install()
Summary: For the TurboModule interop layer, we'll pass in a second ModuleProvider. We'll default that second parameter to null, when the interop layer is disabled. This change will make that easier. Changelog: [General][Changed] - Re-organize the parameters of TurboModuleBinding::install() Reviewed By: javache, cortinico Differential Revision: D43993199 fbshipit-source-id: 2d339cab1f9bfe481f4b72401caa203cd7536da1
1 parent aa28ea0 commit cbdbb47

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed
 

‎ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void TurboModuleManager::installJSIBindings() {
152152
TurboModuleBindingMode bindingMode = static_cast<TurboModuleBindingMode>(
153153
getFeatureFlagValue("turboModuleBindingMode"));
154154
TurboModuleBinding::install(
155-
runtime, std::move(turboModuleProvider), bindingMode);
155+
runtime, bindingMode, std::move(turboModuleProvider));
156156
});
157157
}
158158

‎ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ namespace react {
2323
*/
2424

2525
TurboModuleBinding::TurboModuleBinding(
26-
const TurboModuleProviderFunctionType &&moduleProvider,
27-
TurboModuleBindingMode bindingMode)
28-
: moduleProvider_(std::move(moduleProvider)), bindingMode_(bindingMode) {}
26+
TurboModuleBindingMode bindingMode,
27+
TurboModuleProviderFunctionType &&moduleProvider)
28+
: bindingMode_(bindingMode), moduleProvider_(std::move(moduleProvider)) {}
2929

3030
void TurboModuleBinding::install(
3131
jsi::Runtime &runtime,
32-
const TurboModuleProviderFunctionType &&moduleProvider,
33-
TurboModuleBindingMode bindingMode) {
32+
TurboModuleBindingMode bindingMode,
33+
TurboModuleProviderFunctionType &&moduleProvider) {
3434
runtime.global().setProperty(
3535
runtime,
3636
"__turboModuleProxy",
@@ -39,7 +39,7 @@ void TurboModuleBinding::install(
3939
jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"),
4040
1,
4141
[binding =
42-
TurboModuleBinding(std::move(moduleProvider), bindingMode)](
42+
TurboModuleBinding(bindingMode, std::move(moduleProvider))](
4343
jsi::Runtime &rt,
4444
const jsi::Value &thisVal,
4545
const jsi::Value *args,

‎ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ class TurboModuleBinding {
3232
*/
3333
static void install(
3434
jsi::Runtime &runtime,
35-
const TurboModuleProviderFunctionType &&moduleProvider,
36-
TurboModuleBindingMode bindingMode);
35+
TurboModuleBindingMode bindingMode,
36+
TurboModuleProviderFunctionType &&moduleProvider);
3737

3838
private:
3939
TurboModuleBinding(
40-
const TurboModuleProviderFunctionType &&moduleProvider,
41-
TurboModuleBindingMode bindingMode);
40+
TurboModuleBindingMode bindingMode,
41+
TurboModuleProviderFunctionType &&moduleProvider);
4242
virtual ~TurboModuleBinding();
4343

4444
/**
@@ -48,8 +48,8 @@ class TurboModuleBinding {
4848
jsi::Value getModule(jsi::Runtime &runtime, const std::string &moduleName)
4949
const;
5050

51-
TurboModuleProviderFunctionType moduleProvider_;
5251
TurboModuleBindingMode bindingMode_;
52+
TurboModuleProviderFunctionType moduleProvider_;
5353
};
5454

5555
} // namespace react

‎ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ - (void)installJSBindingWithRuntimeExecutor:(facebook::react::RuntimeExecutor &)
741741
};
742742

743743
runtimeExecutor([turboModuleProvider = std::move(turboModuleProvider)](jsi::Runtime &runtime) {
744-
TurboModuleBinding::install(runtime, std::move(turboModuleProvider), sTurboModuleBindingMode);
744+
TurboModuleBinding::install(runtime, sTurboModuleBindingMode, std::move(turboModuleProvider));
745745
});
746746
}
747747

0 commit comments

Comments
 (0)
Please sign in to comment.