From 8ed66599079110b8b968b2138301e240ce52aea2 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Thu, 14 Jan 2021 19:11:29 -0800 Subject: [PATCH] Stop forwarding TurboModule schema to TurboModule HostObjects Summary: Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D25915170 fbshipit-source-id: 2b390428c1f582e55cf3ffe8e691f069bf2fd295 --- .../core/jni/ReactCommon/TurboModuleManager.cpp | 14 ++------------ .../nativemodule/core/ReactCommon/TurboModule.h | 4 ++-- .../core/ReactCommon/TurboModuleBinding.cpp | 10 +++------- .../core/ReactCommon/TurboModuleBinding.h | 4 +--- .../core/platform/ios/RCTTurboModuleManager.mm | 3 +-- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp index 7a69cc6dc4a..dd9dd987330 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "TurboModuleManager.h" @@ -75,10 +74,8 @@ void TurboModuleManager::installJSIBindings() { jsCallInvoker_ = std::weak_ptr(jsCallInvoker_), nativeCallInvoker_ = std::weak_ptr(nativeCallInvoker_), delegate_ = jni::make_weak(delegate_), - javaPart_ = jni::make_weak(javaPart_), - &runtime]( - const std::string &name, - const jsi::Value *schema) -> std::shared_ptr { + javaPart_ = jni::make_weak(javaPart_)]( + const std::string &name) -> std::shared_ptr { auto turboModuleCache = turboModuleCache_.lock(); auto jsCallInvoker = jsCallInvoker_.lock(); auto nativeCallInvoker = nativeCallInvoker_.lock(); @@ -140,13 +137,6 @@ void TurboModuleManager::installJSIBindings() { .jsInvoker = jsCallInvoker, .nativeInvoker = nativeCallInvoker}; - if (schema->isObject() && !schema->isNull()) { - auto turboModule = std::make_shared( - params, TurboModuleSchema::parse(runtime, name, *schema)); - TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName); - return turboModule; - } - auto turboModule = delegate->cthis()->getTurboModule(name, params); turboModuleCache->insert({name, turboModule}); TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName); diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h index 8bc8362730c..0772986a76a 100644 --- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h +++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h @@ -64,8 +64,8 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { * An app/platform-specific provider function to get an instance of a module * given a name. */ -using TurboModuleProviderFunctionType = std::function(const std::string &name, const jsi::Value *schema)>; +using TurboModuleProviderFunctionType = + std::function(const std::string &name)>; } // namespace react } // namespace facebook diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp index d35ad88dfd7..d9cfae717e4 100644 --- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp +++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp @@ -56,12 +56,11 @@ TurboModuleBinding::~TurboModuleBinding() { } std::shared_ptr TurboModuleBinding::getModule( - const std::string &name, - const jsi::Value *schema) { + const std::string &name) { std::shared_ptr module = nullptr; { SystraceSection s("TurboModuleBinding::getModule", "module", name); - module = moduleProvider_(name, schema); + module = moduleProvider_(name); } return module; } @@ -78,10 +77,7 @@ jsi::Value TurboModuleBinding::jsProxy( std::string moduleName = args[0].getString(runtime).utf8(runtime); jsi::Value nullSchema = jsi::Value::undefined(); - std::shared_ptr module = - (count >= 2 ? getModule(moduleName, &args[1]) - : getModule(moduleName, &nullSchema)); - + std::shared_ptr module = getModule(moduleName); if (module == nullptr) { return jsi::Value::null(); } diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h index d1c9abcdec0..934f7a2ac26 100644 --- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h @@ -37,9 +37,7 @@ class TurboModuleBinding { /** * Get an TurboModule instance for the given module name. */ - std::shared_ptr getModule( - const std::string &name, - const jsi::Value *schema); + std::shared_ptr getModule(const std::string &name); private: /** diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm index e1795bc213b..380420119c7 100644 --- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm @@ -745,8 +745,7 @@ static Class getFallbackClassFromName(const char *name) * aren't any strong references to it in ObjC. Hence, we give * __turboModuleProxy a strong reference to TurboModuleManager. */ - auto turboModuleProvider = - [self](const std::string &name, const jsi::Value *schema) -> std::shared_ptr { + auto turboModuleProvider = [self](const std::string &name) -> std::shared_ptr { auto moduleName = name.c_str(); TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName);