From 7e05480cc3b90b943552491c9022dbf6f94ea426 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Wed, 28 Apr 2021 16:47:32 -0700 Subject: [PATCH] Delete @synthesize turboModuleRegistry API in RCTTurboModule Summary: All NativeModules/TurboModules can use the following Venice-compatible API instead: ``` synthesize moduleRegistry = _moduleRegistry ``` In bridge mode, it'll look up the module via the TurboModule system/bridge. In bridgeless mode, it'll look up the module via the TurboModule system. Therefore, there's no need to support this API. Changelog: [iOS][Removed] - Delete synthesize turboModuleRegistry API in RCTTurboModule Reviewed By: fkgozali Differential Revision: D28070740 fbshipit-source-id: d2c8285fd4c05b67fb03ce82217bf6ddfd1dd685 --- React/CoreModules/RCTDevSplitBundleLoader.mm | 4 ++-- React/CoreModules/RCTDeviceInfo.mm | 1 - .../nativemodule/core/platform/ios/RCTTurboModule.h | 12 ------------ .../core/platform/ios/RCTTurboModuleManager.mm | 4 ---- .../samples/platform/ios/RCTSampleTurboModule.mm | 2 -- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/React/CoreModules/RCTDevSplitBundleLoader.mm b/React/CoreModules/RCTDevSplitBundleLoader.mm index 4a2243e17c..559a6142d5 100644 --- a/React/CoreModules/RCTDevSplitBundleLoader.mm +++ b/React/CoreModules/RCTDevSplitBundleLoader.mm @@ -28,7 +28,7 @@ using namespace facebook::react; @synthesize bridge = _bridge; @synthesize loadScript = _loadScript; -@synthesize turboModuleRegistry = _turboModuleRegistry; +@synthesize moduleRegistry = _moduleRegistry; RCT_EXPORT_MODULE() @@ -69,7 +69,7 @@ RCT_EXPORT_METHOD(loadBundle } __typeof(self) strongSelf = weakSelf; strongSelf->_loadScript(source); - RCTDevSettings *devSettings = [strongSelf->_turboModuleRegistry moduleForName:"RCTDevSettings"]; + RCTDevSettings *devSettings = [strongSelf->_moduleRegistry moduleForName:"RCTDevSettings"]; [devSettings setupHMRClientWithAdditionalBundleURL:source.url]; resolve(@YES); }]; diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm index f470f99572..b4ab579c73 100644 --- a/React/CoreModules/RCTDeviceInfo.mm +++ b/React/CoreModules/RCTDeviceInfo.mm @@ -28,7 +28,6 @@ using namespace facebook::react; } @synthesize moduleRegistry = _moduleRegistry; -@synthesize turboModuleRegistry = _turboModuleRegistry; RCT_EXPORT_MODULE() diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h index fe61116eee..7a76cfc890 100644 --- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h +++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h @@ -101,20 +101,8 @@ class JSI_EXPORT ObjCTurboModule : public TurboModule { } // namespace facebook @protocol RCTTurboModule -@optional -/** - * Used by TurboModules to get access to other TurboModules. - * - * Usage: - * Place `@synthesize turboModuleRegistry = _turboModuleRegistry` - * in the @implementation section of your TurboModule. - */ -@property (nonatomic, weak) id turboModuleRegistry; - -@required - (std::shared_ptr)getTurboModule: (const facebook::react::ObjCTurboModule::InitParams &)params; - @end /** diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm index 804f4012ce..2b0c450b53 100644 --- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm @@ -508,10 +508,6 @@ static Class getFallbackClassFromName(const char *name) TurboModulePerfLogger::moduleCreateSetUpStart(moduleName, moduleId); - if ([module respondsToSelector:@selector(setTurboModuleRegistry:)]) { - [module setTurboModuleRegistry:self]; - } - /** * It is reasonable for NativeModules to not want/need the bridge. * In such cases, they won't have `@synthesize bridge = _bridge` in their diff --git a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm index ac1d236ed7..fc742b492f 100644 --- a/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm +++ b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm @@ -17,8 +17,6 @@ using namespace facebook::react; // Backward-compatible export RCT_EXPORT_MODULE() -@synthesize turboModuleRegistry = _turboModuleRegistry; - // Backward-compatible queue configuration + (BOOL)requiresMainQueueSetup {