From 6b32971f46201b08004736dad9689d71eba0712f Mon Sep 17 00:00:00 2001 From: Zeya Peng Date: Wed, 4 Mar 2026 10:34:53 -0800 Subject: [PATCH] move DefaultTurboModules::get to end of TurboModuleManager (#55852) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55852 ## Changelog: [General] [Changed] - move DefaultTurboModules::get to end of TurboModuleManager To align with android/ios; so that the logic before it can override default behavior Reviewed By: christophpurrer Differential Revision: D94907092 fbshipit-source-id: e189607af8cdd87a03a22dbf75f2c656c053a19b --- .../react/runtime/TurboModuleManager.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp b/packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp index ecb9b0b9d05..d0f137e4274 100644 --- a/packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp +++ b/packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp @@ -67,14 +67,7 @@ std::shared_ptr TurboModuleManager::operator()( // when animatedNodesManagerProvider_ is null, defer to default return std::make_shared( jsInvoker_, animatedNodesManagerProvider_); - } - - if (auto turboModule = - DefaultTurboModules::getTurboModule(name, jsInvoker_)) { - return turboModule; - } - - if (name == AppStateModule::kModuleName) { + } else if (name == AppStateModule::kModuleName) { return std::make_shared(jsInvoker_); } else if (name == DeviceInfoModule::kModuleName) { return std::make_shared(jsInvoker_); @@ -95,8 +88,6 @@ std::shared_ptr TurboModuleManager::operator()( jsInvoker_, webSocketClientFactory_); } else if (name == NativeExceptionsManager::kModuleName) { return std::make_shared(onJsError_, jsInvoker_); - } else if (name == NativePerformance::kModuleName) { - return std::make_shared(jsInvoker_); } else if (name == NativeIntersectionObserver::kModuleName) { return std::make_shared(jsInvoker_); } else if (name == NativeMutationObserver::kModuleName) { @@ -109,6 +100,11 @@ std::shared_ptr TurboModuleManager::operator()( } } + if (auto turboModule = + DefaultTurboModules::getTurboModule(name, jsInvoker_)) { + return turboModule; + } + LOG(WARNING) << "Failed to load TurboModule: " << name; return nullptr; }