From e1fea9d1529559581f984695f933995df8148108 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Sat, 12 Dec 2020 18:58:58 -0800 Subject: [PATCH] Manual: Migrate from bridge.devMenu to RCTModuleRegistry Summary: Ran xbgs `.devMenu`, and found all the NativeModules that used the bridge to access DevMenu. Then, I migrated them to use RCTModuleRegistry. Changelog: [Internal] Reviewed By: PeteTheHeat Differential Revision: D25499960 fbshipit-source-id: 70478616d44808f3788dd0b194da155db0877db9 --- React/CoreModules/RCTDevSettings.mm | 13 +++++++------ React/CoreModules/RCTPerfMonitor.mm | 8 ++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index a165e48b0a..ccce3b2931 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -358,11 +358,11 @@ RCT_EXPORT_METHOD(toggleElementInspector) RCT_EXPORT_METHOD(addMenuItem : (NSString *)title) { __weak __typeof(self) weakSelf = self; - [self.bridge.devMenu addItem:[RCTDevMenuItem buttonItemWithTitle:title - handler:^{ - [weakSelf sendEventWithName:@"didPressMenuItem" - body:@{@"title" : title}]; - }]]; + [(RCTDevMenu *)[self.moduleRegistry moduleForName:"DevMenu"] + addItem:[RCTDevMenuItem buttonItemWithTitle:title + handler:^{ + [weakSelf sendEventWithName:@"didPressMenuItem" body:@{@"title" : title}]; + }]]; } - (BOOL)isElementInspectorShown @@ -463,7 +463,8 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title) if ([self isElementInspectorShown]) { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" - [[self.moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"toggleElementInspector" body:nil]; + [[self.moduleRegistry moduleForName:"EventDispatcher"] sendDeviceEventWithName:@"toggleElementInspector" + body:nil]; #pragma clang diagnostic pop } }); diff --git a/React/CoreModules/RCTPerfMonitor.mm b/React/CoreModules/RCTPerfMonitor.mm index 790591d3af..49219a3e18 100644 --- a/React/CoreModules/RCTPerfMonitor.mm +++ b/React/CoreModules/RCTPerfMonitor.mm @@ -136,6 +136,7 @@ static vm_size_t RCTGetResidentMemorySize(void) } @synthesize bridge = _bridge; +@synthesize moduleRegistry = _moduleRegistry; RCT_EXPORT_MODULE() @@ -149,12 +150,11 @@ RCT_EXPORT_MODULE() return dispatch_get_main_queue(); } -- (void)setBridge:(RCTBridge *)bridge +- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry { - _bridge = bridge; - + _moduleRegistry = moduleRegistry; #if __has_include() - [_bridge.devMenu addItem:self.devMenuItem]; + [(RCTDevMenu *)[_moduleRegistry moduleForName:"DevMenu"] addItem:self.devMenuItem]; #endif }