[CherryPick] Fix retrieving current appearance in multi-window apps (#…

…2125) ## Summary: Cherry pick facebook@d00d35e to fix a bug we're seeing internally ## Test Plan: CI should pass
microsoft · May 22, 2024 · 2954e4f · 2954e4f
2 parents bb2770d + 30336ea
commit 2954e4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/react-native/React/CoreModules/RCTAlertController.mm b/packages/react-native/React/CoreModules/RCTAlertController.mm
@@ -38,9 +38,8 @@ - (void)show:(BOOL)animated completion:(void (^)(void))completion
 {
   UIUserInterfaceStyle style = self.overrideUserInterfaceStyle;
   if (style == UIUserInterfaceStyleUnspecified) {
-    style = RCTSharedApplication().delegate.window.overrideUserInterfaceStyle
-        ? RCTSharedApplication().delegate.window.overrideUserInterfaceStyle
-        : UIUserInterfaceStyleUnspecified;
+    UIUserInterfaceStyle overriddenStyle = RCTKeyWindow().overrideUserInterfaceStyle;
+    style = overriddenStyle ? overriddenStyle : UIUserInterfaceStyleUnspecified;
   }
 
   self.overrideUserInterfaceStyle = style;

diff --git a/packages/react-native/React/CoreModules/RCTAppearance.mm b/packages/react-native/React/CoreModules/RCTAppearance.mm
@@ -96,7 +96,7 @@ - (instancetype)init
 {
   if ((self = [super init])) {
 #if !TARGET_OS_OSX // [macOS]
-    UITraitCollection *traitCollection = RCTSharedApplication().delegate.window.traitCollection;
+    UITraitCollection *traitCollection = RCTKeyWindow().traitCollection;
     _currentColorScheme = RCTColorSchemePreference(traitCollection);
 #else // [macOS
 	NSAppearance *appearance = RCTSharedApplication().appearance;