mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Vojtech Novak
18542b6ef5
Summary: The motivation of this PR is for the Alert to follow the same style override (`overrideUserInterfaceStyle` being light/dark) as the one used by the root window (`UIApplication.sharedApplication.delegate.window`). This is something that has worked previously because `RCTPResentedViewController()` was used to present the Alert (the behavior has changed in https://github.com/vonovak/react-native/commit/f319ff321c4b7c0929b99e3ebe7e1ce1fa50b34c). With the former approach, the alert would "inherit" the `userInterfaceStyle` of the view controller it was presented within (and that one, in turn, would "inherit" from `UIApplication.sharedApplication.delegate.window`). With the current approach, the "style inheritance" does not work with the view controller being created [here](https://github.com/facebook/react-native/blob/f3db6cc52792e3006a16408df4ae40f3aee19a86/React/CoreModules/RCTAlertController.m#L24). Because this viewcontroller instance does not have where to "inherit" the styling from, the styling might be different from the rest of the app. This PR fixes that. ## Changelog [iOS] [Fixed] - fix: RCTAlertController's UserInterfaceStyle to follow root window Pull Request resolved: https://github.com/facebook/react-native/pull/34218 Test Plan: Instead of ``` self.overrideUserInterfaceStyle = UIApplication.sharedApplication.delegate.window.overrideUserInterfaceStyle; ``` you can do ``` self.overrideUserInterfaceStyle = UIUserInterfaceStyleDark; ``` and observe the result. So if the override is set, it'll manifest itself. If it's not set, the value of `UIApplication.sharedApplication.delegate.window.overrideUserInterfaceStyle` will be `UIUserInterfaceStyleUnspecified`, and it'll have no effect. <details> <summary>screenshot</summary>  </details> Reviewed By: dmitryrykun Differential Revision: D38660799 Pulled By: cipolleschi fbshipit-source-id: c979266900e27be7a4732bdb6e9a496906534931
53 lines
1.2 KiB
Objective-C
53 lines
1.2 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
|
|
{
|
|
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;
|
|
}
|
|
|
|
@end
|