mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Asaf Korem
a46a99e120
Summary: Resolves this issue: https://github.com/facebook/react-native/issues/32304. **NOTE:** This PR is based on a prior PR for this fix: https://github.com/facebook/react-native/pull/32305, I've co-authorized its creator for this change (paddlefish). Without this change, calling to hide an alert, leaves a `UIWindow` that blocks user interactions with the screen. The correct way to remove a `UIWindow` in iOS is to set its hidden property to `YES`. Also, it is required to remove all references to the window (the associated `windowScene` for example) and ARC will automatically free this `UIWindow`. The line after this change, set the `_alertWindow` reference to `nil`, but the window is already associated with a scene (see the screenshots from [this PR](https://github.com/facebook/react-native/pull/32305#discussion_r720521707)). So we also need to remove the `windowScene` from that window, as recommended by Apple: https://developer.apple.com/documentation/uikit/uiwindowscene/3198091-windows. >To remove the window from the current scene, or move it to a different scene, change the value of the window's windowScene property. ## Changelog <!-- Help reviewers and the release process by writing your own changelog entry. For an example, see: https://github.com/facebook/react-native/wiki/Changelog --> [iOS] [Fixed] - remove alert's window when call to `hide`. Pull Request resolved: https://github.com/facebook/react-native/pull/32833 Test Plan: See https://github.com/facebook/react-native/pull/32305 Reviewed By: hramos Differential Revision: D33460430 Pulled By: lunaleaps fbshipit-source-id: b13c2c7ee6404f1e1c787265bc4af8a31005bcf1
48 lines
1.0 KiB
Objective-C
48 lines
1.0 KiB
Objective-C
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTUtils.h>
|
|
|
|
#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
|
|
{
|
|
[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;
|
|
}
|
|
|
|
@end
|