mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
b58e176af0
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/28058 I'm taking the first step towards supporting iOS 13 UIScene APIs and modernizing React Native not to assume an app only has a single window. See discussion here: https://github.com/facebook/react-native/issues/25181#issuecomment-505612941 The approach I'm taking is to take advantage of `RootTagContext` and passing it to NativeModules so that they can identify correctly which window they refer to. Here I'm just laying groundwork. - [x] `Alert` and `ActionSheetIOS` take an optional `rootTag` argument that will cause them to appear on the correct window - [x] `StatusBar` methods also have `rootTag` argument added, but it's not fully hooked up on the native side — this turns out to require some more work, see: https://github.com/facebook/react-native/issues/25181#issuecomment-506690818 - [x] `setNetworkActivityIndicatorVisible` is deprecated in iOS 13 - [x] `RCTPerfMonitor`, `RCTProfile` no longer assume `UIApplicationDelegate` has a `window` property (no longer the best practice) — they now just render on the key window Next steps: Add VC-based status bar management (if I get the OK on https://github.com/facebook/react-native/issues/25181#issuecomment-506690818 ), add multiple window demo to RNTester, deprecate Dimensions in favor of a layout context, consider adding hook-based APIs for native modules such as Alert that automatically know which rootTag to pass ## Changelog [Internal] [Changed] - Modernize Modal to use RootTagContext [iOS] [Changed] - `Alert`, `ActionSheetIOS`, `StatusBar` methods now take an optional `surface` argument (for future iPadOS 13 support) [iOS] [Changed] - RCTPresentedViewController now takes a nullable `window` arg [Internal] [Changed] - Do not assume `UIApplicationDelegate` has a `window` property Pull Request resolved: https://github.com/facebook/react-native/pull/25425 Test Plan: - Open RNTester and: - go to Modal and check if it still works - Alert → see if works - ACtionSheetIOS → see if it works - StatusBar → see if it works - Share → see if it works Reviewed By: PeteTheHeat Differential Revision: D16957751 Pulled By: hramos fbshipit-source-id: ae2a4478e2e7f8d2be3022c9c4861561ec244a26
214 lines
7.5 KiB
Plaintext
214 lines
7.5 KiB
Plaintext
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import "RCTAlertManager.h"
|
|
|
|
#import <FBReactNativeSpec/FBReactNativeSpec.h>
|
|
#import <RCTTypeSafety/RCTConvertHelpers.h>
|
|
#import <React/RCTAssert.h>
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTLog.h>
|
|
#import <React/RCTUIManager.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#import "CoreModulesPlugins.h"
|
|
|
|
@implementation RCTConvert (UIAlertViewStyle)
|
|
|
|
RCT_ENUM_CONVERTER(RCTAlertViewStyle, (@{
|
|
@"default": @(RCTAlertViewStyleDefault),
|
|
@"secure-text": @(RCTAlertViewStyleSecureTextInput),
|
|
@"plain-text": @(RCTAlertViewStylePlainTextInput),
|
|
@"login-password": @(RCTAlertViewStyleLoginAndPasswordInput),
|
|
}), RCTAlertViewStyleDefault, integerValue)
|
|
|
|
@end
|
|
|
|
@interface RCTAlertManager() <NativeAlertManagerSpec>
|
|
|
|
@end
|
|
|
|
@implementation RCTAlertManager
|
|
{
|
|
NSHashTable *_alertControllers;
|
|
}
|
|
|
|
@synthesize bridge = _bridge;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
return dispatch_get_main_queue();
|
|
}
|
|
|
|
- (void)invalidate
|
|
{
|
|
for (UIAlertController *alertController in _alertControllers) {
|
|
[alertController.presentingViewController dismissViewControllerAnimated:YES completion:nil];
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @param {NSDictionary} args Dictionary of the form
|
|
*
|
|
* @{
|
|
* @"message": @"<Alert message>",
|
|
* @"buttons": @[
|
|
* @{@"<key1>": @"<title1>"},
|
|
* @{@"<key2>": @"<title2>"},
|
|
* ],
|
|
* @"cancelButtonKey": @"<key2>",
|
|
* }
|
|
* The key from the `buttons` dictionary is passed back in the callback on click.
|
|
* Buttons are displayed in the order they are specified.
|
|
*/
|
|
RCT_EXPORT_METHOD(alertWithArgs:(JS::NativeAlertManager::Args &)args
|
|
callback:(RCTResponseSenderBlock)callback)
|
|
{
|
|
NSString *title = [RCTConvert NSString:args.title()];
|
|
NSString *message = [RCTConvert NSString:args.message()];
|
|
RCTAlertViewStyle type = [RCTConvert RCTAlertViewStyle:args.type()];
|
|
NSArray<NSDictionary *> *buttons = [RCTConvert NSDictionaryArray:RCTConvertOptionalVecToArray(args.buttons(), ^id(id<NSObject> element) { return element; })];
|
|
NSString *defaultValue = [RCTConvert NSString:args.defaultValue()];
|
|
NSString *cancelButtonKey = [RCTConvert NSString:args.cancelButtonKey()];
|
|
NSString *destructiveButtonKey = [RCTConvert NSString:args.destructiveButtonKey()];
|
|
UIKeyboardType keyboardType = [RCTConvert UIKeyboardType:args.keyboardType()];
|
|
NSNumber *reactTag = [RCTConvert NSNumber:args.reactTag() ? @(*args.reactTag()) : @-1];
|
|
|
|
if (!title && !message) {
|
|
RCTLogError(@"Must specify either an alert title, or message, or both");
|
|
return;
|
|
}
|
|
|
|
if (buttons.count == 0) {
|
|
if (type == RCTAlertViewStyleDefault) {
|
|
buttons = @[@{@"0": RCTUIKitLocalizedString(@"OK")}];
|
|
cancelButtonKey = @"0";
|
|
} else {
|
|
buttons = @[
|
|
@{@"0": RCTUIKitLocalizedString(@"OK")},
|
|
@{@"1": RCTUIKitLocalizedString(@"Cancel")},
|
|
];
|
|
cancelButtonKey = @"1";
|
|
}
|
|
}
|
|
|
|
UIAlertController *alertController = [UIAlertController
|
|
alertControllerWithTitle:title
|
|
message:nil
|
|
preferredStyle:UIAlertControllerStyleAlert];
|
|
switch (type) {
|
|
case RCTAlertViewStylePlainTextInput: {
|
|
[alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
|
textField.secureTextEntry = NO;
|
|
textField.text = defaultValue;
|
|
textField.keyboardType = keyboardType;
|
|
}];
|
|
break;
|
|
}
|
|
case RCTAlertViewStyleSecureTextInput: {
|
|
[alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
|
textField.placeholder = RCTUIKitLocalizedString(@"Password");
|
|
textField.secureTextEntry = YES;
|
|
textField.text = defaultValue;
|
|
textField.keyboardType = keyboardType;
|
|
}];
|
|
break;
|
|
}
|
|
case RCTAlertViewStyleLoginAndPasswordInput: {
|
|
[alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
|
textField.placeholder = RCTUIKitLocalizedString(@"Login");
|
|
textField.text = defaultValue;
|
|
textField.keyboardType = keyboardType;
|
|
}];
|
|
[alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
|
textField.placeholder = RCTUIKitLocalizedString(@"Password");
|
|
textField.secureTextEntry = YES;
|
|
}];
|
|
break;
|
|
}
|
|
case RCTAlertViewStyleDefault:
|
|
break;
|
|
}
|
|
|
|
alertController.message = message;
|
|
|
|
for (NSDictionary<NSString *, id> *button in buttons) {
|
|
if (button.count != 1) {
|
|
RCTLogError(@"Button definitions should have exactly one key.");
|
|
}
|
|
NSString *buttonKey = button.allKeys.firstObject;
|
|
NSString *buttonTitle = [RCTConvert NSString:button[buttonKey]];
|
|
UIAlertActionStyle buttonStyle = UIAlertActionStyleDefault;
|
|
if ([buttonKey isEqualToString:cancelButtonKey]) {
|
|
buttonStyle = UIAlertActionStyleCancel;
|
|
} else if ([buttonKey isEqualToString:destructiveButtonKey]) {
|
|
buttonStyle = UIAlertActionStyleDestructive;
|
|
}
|
|
__weak UIAlertController *weakAlertController = alertController;
|
|
[alertController addAction:[UIAlertAction actionWithTitle:buttonTitle
|
|
style:buttonStyle
|
|
handler:^(__unused UIAlertAction *action) {
|
|
switch (type) {
|
|
case RCTAlertViewStylePlainTextInput:
|
|
case RCTAlertViewStyleSecureTextInput:
|
|
callback(@[buttonKey, [weakAlertController.textFields.firstObject text]]);
|
|
break;
|
|
case RCTAlertViewStyleLoginAndPasswordInput: {
|
|
NSDictionary<NSString *, NSString *> *loginCredentials = @{
|
|
@"login": [weakAlertController.textFields.firstObject text],
|
|
@"password": [weakAlertController.textFields.lastObject text]
|
|
};
|
|
callback(@[buttonKey, loginCredentials]);
|
|
break;
|
|
}
|
|
case RCTAlertViewStyleDefault:
|
|
callback(@[buttonKey]);
|
|
break;
|
|
}
|
|
}]];
|
|
}
|
|
|
|
if (!_alertControllers) {
|
|
_alertControllers = [NSHashTable weakObjectsHashTable];
|
|
}
|
|
[_alertControllers addObject:alertController];
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
UIView *view = [self.bridge.uiManager viewForReactTag:reactTag];
|
|
UIViewController *presentingController = RCTPresentedViewController(view.window);
|
|
|
|
if (presentingController == nil) {
|
|
RCTLogError(@"Tried to display alert view but there is no application window. args: %@", @{
|
|
@"title": args.title() ?: [NSNull null],
|
|
@"message": args.message() ?: [NSNull null],
|
|
@"buttons": RCTConvertOptionalVecToArray(args.buttons(), ^id(id<NSObject> element) { return element; }) ?: [NSNull null],
|
|
@"type": args.type() ?: [NSNull null],
|
|
@"defaultValue": args.defaultValue() ?: [NSNull null],
|
|
@"cancelButtonKey": args.cancelButtonKey() ?: [NSNull null],
|
|
@"destructiveButtonKey": args.destructiveButtonKey() ?: [NSNull null],
|
|
@"keyboardType": args.keyboardType() ?: [NSNull null],
|
|
});
|
|
return;
|
|
}
|
|
|
|
[presentingController presentViewController:alertController animated:YES completion:nil];
|
|
});
|
|
}
|
|
|
|
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
|
|
{
|
|
return std::make_shared<facebook::react::NativeAlertManagerSpecJSI>(self, jsInvoker);
|
|
}
|
|
|
|
@end
|
|
|
|
Class RCTAlertManagerCls(void) {
|
|
return RCTAlertManager.class;
|
|
}
|