mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-28 20:25:33 +08:00
Summary: Fixes #23076 , the reason is `blur()` is managed by `UIManager`, `UIManager` maintains all operations and execute them each `batchDidComplete`, which means every time `JS` finish callback native , but `Alert` module would call directly, this mess up the order of method call, for example like below, even `this.$input.blur()` is called before `Alert.alert()`, but in native side, `Alert.alert()` is called before `this.$input.blur()`. ``` <TextInput style={{ borderWidth: 1 }} ref={$input => this.$input = $input} /> <Button title="Show Alert" onPress={() => { // // `blur` works if using without `Alert` this.$input && this.$input.blur() // // `blur` is not working Alert.alert('show alert', 'desc', [ { text: 'cancel', style: 'cancel' }, { text: 'show', onPress: () => { }}, ]) }} /> ``` [iOS] [Fixed] - Fixes alert view block first responder After fix, example like below, `blur` can works. ``` import * as React from 'react'; import { TextInput, View, Alert, Button } from 'react-native'; export default class App extends React.Component { render() { return ( <View style={{ flex: 1, justifyContent: 'center' }}> <TextInput style={{ borderWidth: 1 }} ref={$input => this.$input = $input} /> <Button title="Show Alert" onPress={() => { this.$input && this.$input.blur() Alert.alert('show alert', 'desc', [ { text: 'cancel', style: 'cancel' }, { text: 'show', onPress: () => { }}, ]) }} /> </View> ); } } ``` Pull Request resolved: https://github.com/facebook/react-native/pull/23240 Differential Revision: D13915920 Pulled By: cpojer fbshipit-source-id: fe1916fcb5913e2b8128d045a6364c5e3d39c516
186 lines
6.1 KiB
Objective-C
186 lines
6.1 KiB
Objective-C
/**
|
|
* 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 "RCTAssert.h"
|
|
#import "RCTConvert.h"
|
|
#import "RCTLog.h"
|
|
#import "RCTUtils.h"
|
|
|
|
@implementation RCTConvert (UIAlertViewStyle)
|
|
|
|
RCT_ENUM_CONVERTER(RCTAlertViewStyle, (@{
|
|
@"default": @(RCTAlertViewStyleDefault),
|
|
@"secure-text": @(RCTAlertViewStyleSecureTextInput),
|
|
@"plain-text": @(RCTAlertViewStylePlainTextInput),
|
|
@"login-password": @(RCTAlertViewStyleLoginAndPasswordInput),
|
|
}), RCTAlertViewStyleDefault, integerValue)
|
|
|
|
@end
|
|
|
|
@interface RCTAlertManager()
|
|
|
|
@end
|
|
|
|
@implementation RCTAlertManager
|
|
{
|
|
NSHashTable *_alertControllers;
|
|
}
|
|
|
|
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:(NSDictionary *)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:args[@"buttons"]];
|
|
NSString *defaultValue = [RCTConvert NSString:args[@"defaultValue"]];
|
|
NSString *cancelButtonKey = [RCTConvert NSString:args[@"cancelButtonKey"]];
|
|
NSString *destructiveButtonKey = [RCTConvert NSString:args[@"destructiveButtonKey"]];
|
|
UIKeyboardType keyboardType = [RCTConvert UIKeyboardType:args[@"keyboardType"]];
|
|
|
|
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";
|
|
}
|
|
}
|
|
|
|
UIViewController *presentingController = RCTPresentedViewController();
|
|
if (presentingController == nil) {
|
|
RCTLogError(@"Tried to display alert view but there is no application window. args: %@", args);
|
|
return;
|
|
}
|
|
|
|
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(), ^{
|
|
[presentingController presentViewController:alertController animated:YES completion:nil];
|
|
});
|
|
}
|
|
|
|
@end
|