From b9290f8eff24eb24600727d7d931597746c8dac9 Mon Sep 17 00:00:00 2001 From: Alan Hughes Date: Fri, 27 Sep 2024 14:48:48 +0100 Subject: [PATCH 1/2] Add extraModulesForBridge impl to instance --- packages/react-native/React/CoreModules/RCTPerfMonitor.mm | 3 ++- .../react/runtime/platform/ios/ReactCommon/RCTInstance.mm | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm index 023a5311db2e..776b5e77083a 100644 --- a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm +++ b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm @@ -298,7 +298,8 @@ - (void)show [self updateStats]; - [RCTKeyWindow() addSubview:self.container]; + UIWindow *window = RCTSharedApplication().delegate.window; + [window addSubview:self.container]; _uiDisplayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(threadUpdate:)]; [_uiDisplayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes]; diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm index ddeb1e9eff94..35b5bd848d28 100644 --- a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm +++ b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm @@ -181,6 +181,13 @@ - (void)registerSegmentWithId:(NSNumber *)segmentId path:(NSString *)path #pragma mark - RCTTurboModuleManagerDelegate +- (NSArray> *)extraModulesForBridge:(RCTBridge *)bridge { + if ([_appTMMDelegate respondsToSelector:@selector(extraModulesForBridge:)]) { + return [_appTMMDelegate extraModulesForBridge:bridge]; + } + return @[]; +} + - (Class)getModuleClassFromName:(const char *)name { if ([_appTMMDelegate respondsToSelector:@selector(getModuleClassFromName:)]) { From bd11d20a9962c28b01749bff5caa32c8ee3e00e1 Mon Sep 17 00:00:00 2001 From: Alan Hughes Date: Fri, 27 Sep 2024 15:10:17 +0100 Subject: [PATCH 2/2] revert perfMonitor change --- packages/react-native/React/CoreModules/RCTPerfMonitor.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm index 776b5e77083a..023a5311db2e 100644 --- a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm +++ b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm @@ -298,8 +298,7 @@ - (void)show [self updateStats]; - UIWindow *window = RCTSharedApplication().delegate.window; - [window addSubview:self.container]; + [RCTKeyWindow() addSubview:self.container]; _uiDisplayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(threadUpdate:)]; [_uiDisplayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];