From 033db2730e5a9dcb32e43ec8455e46fa7c5c2241 Mon Sep 17 00:00:00 2001 From: Alan Hughes Date: Fri, 27 Sep 2024 15:13:52 +0100 Subject: [PATCH 1/2] Revert performance monitor change --- packages/react-native/React/CoreModules/RCTPerfMonitor.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm index 023a5311db2e..439401394af6 100644 --- a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm +++ b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm @@ -298,7 +298,11 @@ - (void)show [self updateStats]; - [RCTKeyWindow() addSubview:self.container]; + // This change is causing the performance monitor and element inspector to be added to the dev menus UIWindow + // instead of the main app +// [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]; From a3d37e1d268a885fa22d0bfb8bdb50c52ce7f5fd Mon Sep 17 00:00:00 2001 From: Alan Hughes Date: Fri, 27 Sep 2024 15:28:53 +0100 Subject: [PATCH 2/2] fix indent --- packages/react-native/React/CoreModules/RCTPerfMonitor.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm index 439401394af6..ae157b32a24f 100644 --- a/packages/react-native/React/CoreModules/RCTPerfMonitor.mm +++ b/packages/react-native/React/CoreModules/RCTPerfMonitor.mm @@ -300,7 +300,7 @@ - (void)show // This change is causing the performance monitor and element inspector to be added to the dev menus UIWindow // instead of the main app -// [RCTKeyWindow() addSubview:self.container]; + // [RCTKeyWindow() addSubview:self.container]; UIWindow *window = RCTSharedApplication().delegate.window; [window addSubview:self.container];