Extract scene related logic into function in RCTAlertController

facebook · Dec 31, 2022 · cb78e7e · cb78e7e
1 parent e468621
commit cb78e7e
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/React/CoreModules/RCTAlertController.m b/React/CoreModules/RCTAlertController.m
@@ -20,18 +20,7 @@ @implementation RCTAlertController
 - (UIWindow *)alertWindow
 {
   if (_alertWindow == nil) {
-
-#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_13_0) && \
-    __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_13_0
-    if (@available(iOS 13.0, *)) {
-      for (UIScene *scene in RCTSharedApplication().connectedScenes) {
-        if (scene.activationState == UISceneActivationStateForegroundActive && [scene isKindOfClass:[UIWindowScene class]]) {
-          _alertWindow = [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene];
-          break;
-        }
-      }
-    }
-#endif
+    _alertWindow = [self getUIWindowFromScene];
 
     if (_alertWindow == nil) {
       _alertWindow = [[UIWindow alloc] initWithFrame:RCTSharedApplication().keyWindow.bounds];
@@ -65,4 +54,16 @@ - (void)hide
   _alertWindow = nil;
 }
 
+- (UIWindow *)getUIWindowFromScene
+{
+  if (@available(iOS 13.0, *)) {
+    for (UIScene *scene in RCTSharedApplication().connectedScenes) {
+      if (scene.activationState == UISceneActivationStateForegroundActive && [scene isKindOfClass:[UIWindowScene class]]) {
+        return [[UIWindow alloc] initWithWindowScene:(UIWindowScene *)scene];
+      }
+    }
+  }
+  return nil;
+}
+
 @end