Skip to content

Commit e450009

Browse files
zeyapmeta-codesync[bot]
authored andcommitted
move DefaultTurboModules::get to end of TurboModuleManager (#55852)
Summary: Pull Request resolved: #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
1 parent 88ca6b9 commit e450009

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

packages/react-native/ReactCxxPlatform/react/runtime/TurboModuleManager.cpp

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,7 @@ std::shared_ptr<TurboModule> TurboModuleManager::operator()(
6767
// when animatedNodesManagerProvider_ is null, defer to default
6868
return std::make_shared<AnimatedModule>(
6969
jsInvoker_, animatedNodesManagerProvider_);
70-
}
71-
72-
if (auto turboModule =
73-
DefaultTurboModules::getTurboModule(name, jsInvoker_)) {
74-
return turboModule;
75-
}
76-
77-
if (name == AppStateModule::kModuleName) {
70+
} else if (name == AppStateModule::kModuleName) {
7871
return std::make_shared<AppStateModule>(jsInvoker_);
7972
} else if (name == DeviceInfoModule::kModuleName) {
8073
return std::make_shared<DeviceInfoModule>(jsInvoker_);
@@ -95,8 +88,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::operator()(
9588
jsInvoker_, webSocketClientFactory_);
9689
} else if (name == NativeExceptionsManager::kModuleName) {
9790
return std::make_shared<NativeExceptionsManager>(onJsError_, jsInvoker_);
98-
} else if (name == NativePerformance::kModuleName) {
99-
return std::make_shared<NativePerformance>(jsInvoker_);
10091
} else if (name == NativeIntersectionObserver::kModuleName) {
10192
return std::make_shared<NativeIntersectionObserver>(jsInvoker_);
10293
} else if (name == NativeMutationObserver::kModuleName) {
@@ -109,6 +100,11 @@ std::shared_ptr<TurboModule> TurboModuleManager::operator()(
109100
}
110101
}
111102

103+
if (auto turboModule =
104+
DefaultTurboModules::getTurboModule(name, jsInvoker_)) {
105+
return turboModule;
106+
}
107+
112108
LOG(WARNING) << "Failed to load TurboModule: " << name;
113109
return nullptr;
114110
}

0 commit comments

Comments
 (0)