Skip to content

Commit 5f69ff7

Browse files
javachemeta-codesync[bot]
authored andcommitted
Rename TurboModuleManagerDelegate to TurboModuleProvider (#54390)
Summary: Pull Request resolved: #54390 Simplify the concepts used. These are provider methods for TurboModules, nothing more. Changelog: [Internal] Reviewed By: shwanton Differential Revision: D85052393 fbshipit-source-id: 7f972b211196d12156dfd9aa8890d8f7251cdd57
1 parent 57bed9a commit 5f69ff7

7 files changed

Lines changed: 29 additions & 33 deletions

File tree

packages/react-native/ReactCxxPlatform/react/nativemodule/TurboModuleManager.h renamed to packages/react-native/ReactCxxPlatform/react/nativemodule/TurboModuleProvider.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99

1010
#include <ReactCommon/CallInvoker.h>
1111
#include <ReactCommon/TurboModule.h>
12+
1213
#include <functional>
1314
#include <string>
1415
#include <vector>
1516

1617
namespace facebook::react {
1718

18-
using TurboModuleManagerDelegate =
19+
using TurboModuleProvider =
1920
std::function<std::shared_ptr<TurboModule>(const std::string &name, const std::shared_ptr<CallInvoker> &jsInvoker)>;
2021

21-
using TurboModuleManagerDelegates = std::vector<TurboModuleManagerDelegate>;
22+
using TurboModuleProviders = std::vector<TurboModuleProvider>;
2223

2324
} // namespace facebook::react

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct ReactInstanceData {
6060
JsErrorHandler::OnJsError onJsError;
6161
Logger logger;
6262
std::shared_ptr<IDevUIDelegate> devUIDelegate;
63-
TurboModuleManagerDelegates turboModuleManagerDelegates;
63+
TurboModuleProviders turboModuleProviders;
6464
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate;
6565
std::shared_ptr<NativeAnimatedNodesManagerProvider>
6666
animatedNodesManagerProvider;
@@ -75,7 +75,7 @@ ReactHost::ReactHost(
7575
JsErrorHandler::OnJsError onJsError,
7676
Logger logger,
7777
std::shared_ptr<IDevUIDelegate> devUIDelegate,
78-
TurboModuleManagerDelegates turboModuleManagerDelegates,
78+
TurboModuleProviders turboModuleProviders,
7979
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate,
8080
std::shared_ptr<NativeAnimatedNodesManagerProvider>
8181
animatedNodesManagerProvider,
@@ -92,7 +92,7 @@ ReactHost::ReactHost(
9292
.onJsError = std::move(onJsError),
9393
.logger = std::move(logger),
9494
.devUIDelegate = devUIDelegate,
95-
.turboModuleManagerDelegates = std::move(turboModuleManagerDelegates),
95+
.turboModuleProviders = std::move(turboModuleProviders),
9696
.logBoxSurfaceDelegate = logBoxSurfaceDelegate,
9797
.animatedNodesManagerProvider = animatedNodesManagerProvider,
9898
.bindingsInstallFunc = std::move(bindingsInstallFunc)});
@@ -259,18 +259,16 @@ void ReactHost::createReactInstance() {
259259
reactInstance_->initializeRuntime(
260260
{
261261
#if defined(WITH_PERFETTO) || defined(RNCXX_WITH_PROFILING_PROVIDER)
262-
.isProfiling = true
262+
.isProfiling = true,
263263
#else
264-
.isProfiling = false
264+
.isProfiling = false,
265265
#endif
266-
,
267266
.runtimeDiagnosticFlags = ""},
268267
[weakMountingManager =
269268
std::weak_ptr<IMountingManager>(reactInstanceData_->mountingManager),
270269
logger = reactInstanceData_->logger,
271270
devUIDelegate = reactInstanceData_->devUIDelegate,
272-
turboModuleManagerDelegates =
273-
reactInstanceData_->turboModuleManagerDelegates,
271+
turboModuleProviders = reactInstanceData_->turboModuleProviders,
274272
jsInvoker = std::move(jsInvoker),
275273
logBoxSurfaceDelegate = reactInstanceData_->logBoxSurfaceDelegate,
276274
devServerHelper =
@@ -297,7 +295,7 @@ void ReactHost::createReactInstance() {
297295
});
298296

299297
auto turboModuleProvider =
300-
[turboModuleManagerDelegates,
298+
[turboModuleProviders,
301299
jsInvoker,
302300
logBoxSurfaceDelegate,
303301
devServerHelper,
@@ -311,11 +309,9 @@ void ReactHost::createReactInstance() {
311309
react_native_assert(
312310
!name.empty() && "TurboModule name must not be empty");
313311

314-
for (const auto& turboModuleManagerDelegate :
315-
turboModuleManagerDelegates) {
316-
if (turboModuleManagerDelegate) {
317-
if (auto turboModule =
318-
turboModuleManagerDelegate(name, jsInvoker)) {
312+
for (const auto& turboModuleProvider : turboModuleProviders) {
313+
if (turboModuleProvider) {
314+
if (auto turboModule = turboModuleProvider(name, jsInvoker)) {
319315
return turboModule;
320316
}
321317
}

packages/react-native/ReactCxxPlatform/react/runtime/ReactHost.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <cxxreact/MessageQueueThread.h>
1515
#include <react/logging/DefaultLogger.h>
1616
#include <react/nativemodule/JavaScriptModule.h>
17-
#include <react/nativemodule/TurboModuleManager.h>
17+
#include <react/nativemodule/TurboModuleProvider.h>
1818
#include <react/renderer/scheduler/Scheduler.h>
1919
#include <react/runtime/ReactInstance.h>
2020
#include <react/utils/RunLoopObserverManager.h>
@@ -48,7 +48,7 @@ class ReactHost {
4848
JsErrorHandler::OnJsError onJsError,
4949
Logger logger,
5050
std::shared_ptr<IDevUIDelegate> devUIDelegate = nullptr,
51-
TurboModuleManagerDelegates turboModuleManagerDelegates = {},
51+
TurboModuleProviders turboModuleProviders = {},
5252
std::shared_ptr<SurfaceDelegate> logBoxSurfaceDelegate = nullptr,
5353
std::shared_ptr<NativeAnimatedNodesManagerProvider> animatedNodesManagerProvider = nullptr,
5454
ReactInstance::BindingsInstallFunc bindingsInstallFunc = nullptr);

private/react-native-fantom/tester/src/TesterAppDelegate.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "TesterAppDelegate.h"
99

1010
#include "NativeFantom.h"
11-
#include "platform/TesterTurboModuleManagerDelegate.h"
11+
#include "platform/TesterTurboModuleProvider.h"
1212
#include "stubs/StubClock.h"
1313
#include "stubs/StubHttpClient.h"
1414
#include "stubs/StubQueue.h"
@@ -88,7 +88,7 @@ TesterAppDelegate::TesterAppDelegate(
8888

8989
runLoopObserverManager_ = std::make_shared<RunLoopObserverManager>();
9090

91-
TurboModuleManagerDelegates turboModuleProviders{
91+
TurboModuleProviders turboModuleProviders{
9292
[&](const std::string& name,
9393
const std::shared_ptr<CallInvoker>& jsInvoker)
9494
-> std::shared_ptr<TurboModule> {
@@ -105,7 +105,7 @@ TesterAppDelegate::TesterAppDelegate(
105105
return nullptr;
106106
}
107107
},
108-
TesterTurboModuleManagerDelegate::getTurboModuleManagerDelegate()};
108+
TesterTurboModuleProvider::getTurboModuleProvider()};
109109

110110
g_setNativeAnimatedNowTimestampFunction(StubClock::now);
111111

private/react-native-fantom/tester/src/platform/TesterTurboModuleManagerDelegate.h renamed to private/react-native-fantom/tester/src/platform/TesterTurboModuleProvider.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
#pragma once
99

10-
#include <react/nativemodule/TurboModuleManager.h>
10+
#include <react/nativemodule/TurboModuleProvider.h>
1111

1212
namespace facebook::react {
13-
class TesterTurboModuleManagerDelegate {
13+
class TesterTurboModuleProvider {
1414
public:
15-
static TurboModuleManagerDelegate getTurboModuleManagerDelegate();
15+
static TurboModuleProvider getTurboModuleProvider();
1616
};
1717
} // namespace facebook::react

private/react-native-fantom/tester/src/platform/meta/TesterTurboModuleManagerDelegate.cpp renamed to private/react-native-fantom/tester/src/platform/meta/TesterTurboModuleProvider.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
* This source code is licensed under the MIT license found in the
55
* LICENSE file in the root directory of this source tree.
66
*/
7-
8-
#include "../TesterTurboModuleManagerDelegate.h"
7+
#include "../TesterTurboModuleProvider.h"
98
#include <NativeCxxModuleExample/NativeCxxModuleExample.h>
109

1110
namespace facebook::react {
12-
/* static */ TurboModuleManagerDelegate
13-
TesterTurboModuleManagerDelegate::getTurboModuleManagerDelegate() {
14-
return TurboModuleManagerDelegate{
11+
/* static */ TurboModuleProvider
12+
TesterTurboModuleProvider::getTurboModuleProvider() {
13+
return TurboModuleProvider{
1514
[](const std::string& name, const std::shared_ptr<CallInvoker>& jsInvoker)
1615
-> std::shared_ptr<TurboModule> {
1716
if (name == NativeCxxModuleExample::kModuleName) {

private/react-native-fantom/tester/src/platform/oss/TesterTurboModuleManagerDelegate.cpp renamed to private/react-native-fantom/tester/src/platform/oss/TesterTurboModuleProvider.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
#include "../TesterTurboModuleManagerDelegate.h"
8+
#include "../TesterTurboModuleProvider.h"
99

1010
namespace facebook::react {
11-
/* static */ TurboModuleManagerDelegate
12-
TesterTurboModuleManagerDelegate::getTurboModuleManagerDelegate() {
13-
return TurboModuleManagerDelegate{
11+
/* static */ TurboModuleProvider
12+
TesterTurboModuleProvider::getTurboModuleProvider() {
13+
return TurboModuleProvider{
1414
[](const std::string& name, const std::shared_ptr<CallInvoker>& jsInvoker)
1515
-> std::shared_ptr<TurboModule> { return nullptr; }};
1616
}

0 commit comments

Comments
 (0)