Skip to content

Commit

Permalink
Revert "remove cxx TM autolinking (facebook#45967)"
Browse files Browse the repository at this point in the history
This reverts commit 184646e.
  • Loading branch information
mrousavy committed Sep 6, 2024
1 parent 5fe7660 commit 337225e
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <jsi/jsi.h>

#include <ReactCommon/BindingsInstallerHolder.h>
#include <ReactCommon/CxxTurboModuleUtils.h>
#include <ReactCommon/JavaInteropTurboModule.h>
#include <ReactCommon/TurboCxxModule.h>
#include <ReactCommon/TurboModuleBinding.h>
Expand Down Expand Up @@ -168,6 +169,14 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
return cxxModule;
}

auto& cxxTurboModuleMapProvider = globalExportedCxxTurboModuleMap();
auto it = cxxTurboModuleMapProvider.find(name);
if (it != cxxTurboModuleMapProvider.end()) {
auto turboModule = it->second(jsCallInvoker_);
turboModuleCache_.insert({name, turboModule});
return turboModule;
}

static auto getTurboJavaModule =
javaPart->getClass()
->getMethod<jni::alias_ref<JTurboModule>(const std::string&)>(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#include "CxxTurboModuleUtils.h"

namespace facebook::react {

std::unordered_map<
std::string,
std::function<
std::shared_ptr<TurboModule>(std::shared_ptr<CallInvoker> jsInvoker)>>&
globalExportedCxxTurboModuleMap() {
static std::unordered_map<
std::string,
std::function<std::shared_ptr<TurboModule>(
std::shared_ptr<CallInvoker> jsInvoker)>>
map;
return map;
}

void registerCxxModuleToGlobalModuleMap(
std::string name,
std::function<std::shared_ptr<TurboModule>(
std::shared_ptr<CallInvoker> jsInvoker)> moduleProviderFunc) {
globalExportedCxxTurboModuleMap()[name] = moduleProviderFunc;
}

} // namespace facebook::react
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

#include <string>
#include <unordered_map>

#include <ReactCommon/CallInvoker.h>
#include <ReactCommon/TurboModule.h>

namespace facebook::react {

std::unordered_map<
std::string,
std::function<
std::shared_ptr<TurboModule>(std::shared_ptr<CallInvoker> jsInvoker)>>&
globalExportedCxxTurboModuleMap();

void registerCxxModuleToGlobalModuleMap(
std::string name,
std::function<std::shared_ptr<TurboModule>(
std::shared_ptr<CallInvoker> jsInvoker)> moduleProviderFunc);

} // namespace facebook::react

/*
* You can use this macro to register your C++ TurboModule in your .cpp
* implementation if you do not have access to getTurboModule:jsInvoker:
* callback. This will register the module before main() is called,
* so it will incur a startup cost.
*
* RCT_EXPORT_CXX_MODULE_EXPERIMENTAL(ModuleExample) becomes:
*
* #pragma clang diagnostic push
* #pragma clang diagnostic ignored "-Wglobal-constructors"
* struct ModuleExampleLoad {
* ModuleExampleLoad() {
* facebook::react::registerCxxModule(name,
* [&](std::shared_ptr<facebook::react::CallInvoker> jsInvoker) {
* return
* std::make_shared<facebook::react::ModuleExample>(jsInvoker);
* });
* }
* };
* static ModuleExampleLoad moduleExampleLoad;
* #pragma clang diagnostic pop
*
*/
#define RCT_EXPORT_CXX_MODULE_EXPERIMENTAL(name) \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") struct \
name##Load { \
name##Load() { \
facebook::react::registerCxxModuleToGlobalModuleMap( \
#name, \
[&](std::shared_ptr<facebook::react::CallInvoker> jsInvoker) { \
return std::make_shared<facebook::react::name>(jsInvoker); \
}); \
} \
}; \
static name##Load _##name##Load; \
_Pragma("clang diagnostic pop")
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#import <React/RCTPerformanceLogger.h>
#import <React/RCTRuntimeExecutorModule.h>
#import <React/RCTUtils.h>
#import <ReactCommon/CxxTurboModuleUtils.h>
#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
#import <ReactCommon/TurboCxxModule.h>
#import <ReactCommon/TurboModulePerfLogger.h>
Expand Down Expand Up @@ -328,6 +329,14 @@ - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
TurboModulePerfLogger::moduleCreateFail(moduleName, moduleId);
}

auto &cxxTurboModuleMapProvider = globalExportedCxxTurboModuleMap();
auto it = cxxTurboModuleMapProvider.find(moduleName);
if (it != cxxTurboModuleMapProvider.end()) {
auto turboModule = it->second(_jsInvoker);
_turboModuleCache.insert({moduleName, turboModule});
return turboModule;
}

/**
* Step 2: Look for platform-specific modules.
*/
Expand Down

0 comments on commit 337225e

Please sign in to comment.