Fix Alert not showing in an app using UIScene (#34562)

Summary: In an app using `UIScene`, `Alert` no longer pops up because the window that gets created are not attached to a scene. ## Changelog [iOS] [Fixed] - Fix `Alert` not showing in an app using `UIScene` Pull Request resolved: #34562 Test Plan: Use the test plan in #29295. This should not regress that fix. Reviewed By: cipolleschi Differential Revision: D39276976 Pulled By: lunaleaps fbshipit-source-id: e48e985ed4abec77d6f01a6c17292d664ed88f13
facebook · Sep 8, 2022 · 153aedc · 153aedc
1 parent b2452ab
commit 153aedc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 33 deletions.
diff --git a/React/CoreModules/RCTAlertController.h b/React/CoreModules/RCTAlertController.h
@@ -10,6 +10,5 @@
 @interface RCTAlertController : UIAlertController
 
 - (void)show:(BOOL)animated completion:(void (^)(void))completion;
-- (void)hide;
 
 @end
diff --git a/React/CoreModules/RCTAlertController.m b/React/CoreModules/RCTAlertController.m
@@ -9,44 +9,16 @@
 
 #import <React/RCTAlertController.h>
 
-@interface RCTAlertController ()
-
-@property (nonatomic, strong) UIWindow *alertWindow;
-
-@end
-
 @implementation RCTAlertController
 
-- (UIWindow *)alertWindow
-{
-  if (_alertWindow == nil) {
-    _alertWindow = [[UIWindow alloc] initWithFrame:RCTSharedApplication().keyWindow.bounds];
-    _alertWindow.rootViewController = [UIViewController new];
-    _alertWindow.windowLevel = UIWindowLevelAlert + 1;
-  }
-  return _alertWindow;
-}
-
 - (void)show:(BOOL)animated completion:(void (^)(void))completion
 {
   if (@available(iOS 13.0, *)) {
     UIUserInterfaceStyle style =
         RCTSharedApplication().delegate.window.overrideUserInterfaceStyle ?: UIUserInterfaceStyleUnspecified;
     self.overrideUserInterfaceStyle = style;
   }
-  [self.alertWindow makeKeyAndVisible];
-  [self.alertWindow.rootViewController presentViewController:self animated:animated completion:completion];
-}
-
-- (void)hide
-{
-  [_alertWindow setHidden:YES];
-
-  if (@available(iOS 13, *)) {
-    _alertWindow.windowScene = nil;
-  }
-
-  _alertWindow = nil;
+  [[RCTKeyWindow() rootViewController] presentViewController:self animated:animated completion:completion];
 }
 
 @end
diff --git a/React/CoreModules/RCTAlertManager.mm b/React/CoreModules/RCTAlertManager.mm
@@ -185,20 +185,17 @@ - (void)invalidate
                                    case RCTAlertViewStylePlainTextInput:
                                    case RCTAlertViewStyleSecureTextInput:
                                      callback(@[ buttonKey, [weakAlertController.textFields.firstObject text] ]);
-                                     [weakAlertController hide];
                                      break;
                                    case RCTAlertViewStyleLoginAndPasswordInput: {
                                      NSDictionary<NSString *, NSString *> *loginCredentials = @{
                                        @"login" : [weakAlertController.textFields.firstObject text],
                                        @"password" : [weakAlertController.textFields.lastObject text]
                                      };
                                      callback(@[ buttonKey, loginCredentials ]);
-                                     [weakAlertController hide];
                                      break;
                                    }
                                    case RCTAlertViewStyleDefault:
                                      callback(@[ buttonKey ]);
-                                     [weakAlertController hide];
                                      break;
                                  }
                                }];