Sync RCTAlertManager from upstream RN fork (#661)
* iOS: Update RCTAlertManager to use new RCTAlertController (#29295) Summary: This should fix https://github.com/facebook/react-native/issues/29082 and https://github.com/facebook/react-native/issues/10471 Currently when an alert is being shown while a modal is being dismissed, it causes the alert not to show and In some cases it causes the UI to become unresponsive. I think this was caused by using RCTPresentedViewController to try and display the Alert the currently presented view. The View the Alert was going to be shown on is dismissed and the modal doesn't show. I implemented a new RCTAlertController to show the alert on top of the view, the modal being dismissed should now not interfere with the alert being shown. [iOS] [Fixed] - Fixed showing Alert while closing a Modal Pull Request resolved: https://github.com/facebook/react-native/pull/29295 Test Plan: To recreate the bug: 1. npx react-native init Test --version 0.63.0-rc.1 2. Paste the following code into App.js ```javascript /** * Sample React Native App * https://github.com/facebook/react-native * * format * flow strict-local */ import React from 'react'; import { SafeAreaView, StyleSheet, View, Text, StatusBar, Modal, Alert } from 'react-native'; const App: () => React$Node = () => { const [visible, setVisible] = React.useState(false) const onShowModal = () => { setVisible(true) } onCloseBroken = () => { setVisible(false) Alert.alert('Alert', 'Alert won\'t show') } onCloseWorking = () => { setVisible(false) setTimeout(() => Alert.alert('Alert', 'Works fine'), 10) } return ( <> <StatusBar barStyle="dark-content" /> <SafeAreaView style={styles.container}> <Text onPress={onShowModal}>Show modal</Text> </SafeAreaView> <Modal animationType="fade" visible={visible} onRequestClose={onCloseWorking} > <View style={styles.container}> <Text onPress={onCloseBroken}>Close modal immediately</Text> <Text onPress={onCloseWorking}>Close modal with delay</Text> </View> </Modal> </> ) } const styles = StyleSheet.create({ container: { flex: 1, alignItems: 'center', justifyContent: 'space-around', }, }) export default App ``` 3. cd Test && npx react-native run-ios 4. Show the modal and click the `Close modal immediately` button The first button doesn't show the alert, the second does because it gets rendered after the modal view is dismissed. After this commit, the alert always shows on top of every view properly. You can test by pointing the react native package to my branch by modifying the package json file like this ``` "react-native": "https://github.com/devon94/react-native.git#fix-ios-modal" ``` I was unable to reproduce the case where it causes the UI to be responsive in the test app but was able to reproduce it in our react native app at work. I can provide a video later if needed but the code is too complex to simplify into a test case. Reviewed By: sammy-SC Differential Revision: D22783371 Pulled By: PeteTheHeat fbshipit-source-id: 3e359645c610074ea855ee5686c59bdb9d6b696b * address feedback; fix iOS build * move UIAlertController define to RCTAlertController.h * define only on macos target * revert podfile.lock * apply feedback of not aliasing UIAlertController * revert podfile.lock Co-authored-by: Devon Deonarine <hello@devondeonarine.ca>
This commit is contained in:
Michał Pierzchała
GitHub
Родитель
06862f1596
Коммит
8c0f9ef070
|
|
@ -0,0 +1,20 @@
|
|||
/*
|
||||
* 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 <React/RCTUIKit.h> // TODO(macOS ISS#2323203)
|
||||
|
||||
#if TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
@interface RCTAlertController : NSViewController
|
||||
#else
|
||||
@interface RCTAlertController : UIAlertController
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
|
||||
#if !TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
- (void)show:(BOOL)animated completion:(void (^)(void))completion;
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
/*
|
||||
* 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 <React/RCTUtils.h>
|
||||
|
||||
#import "RCTAlertController.h"
|
||||
|
||||
@interface RCTAlertController ()
|
||||
|
||||
#if !TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
@property (nonatomic, strong) UIWindow *alertWindow;
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
|
||||
@end
|
||||
|
||||
@implementation RCTAlertController
|
||||
|
||||
#if !TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
- (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];
|
||||
}
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
|
||||
@end
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
#import <React/RCTUtils.h>
|
||||
|
||||
#import "CoreModulesPlugins.h"
|
||||
#import "RCTAlertController.h"
|
||||
|
||||
@implementation RCTConvert (UIAlertViewStyle)
|
||||
|
||||
|
|
@ -115,29 +116,9 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
|
|||
}
|
||||
}
|
||||
|
||||
UIViewController *presentingController = RCTPresentedViewController();
|
||||
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;
|
||||
}
|
||||
|
||||
UIAlertController *alertController = [UIAlertController alertControllerWithTitle:title
|
||||
message:nil
|
||||
preferredStyle:UIAlertControllerStyleAlert];
|
||||
RCTAlertController *alertController = [RCTAlertController alertControllerWithTitle:title
|
||||
message:nil
|
||||
preferredStyle:UIAlertControllerStyleAlert];
|
||||
switch (type) {
|
||||
case RCTAlertViewStylePlainTextInput: {
|
||||
[alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
|
||||
|
|
@ -186,7 +167,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
|
|||
} else if ([buttonKey isEqualToString:destructiveButtonKey]) {
|
||||
buttonStyle = UIAlertActionStyleDestructive;
|
||||
}
|
||||
__weak UIAlertController *weakAlertController = alertController;
|
||||
__weak RCTAlertController *weakAlertController = alertController;
|
||||
[alertController
|
||||
addAction:[UIAlertAction
|
||||
actionWithTitle:buttonTitle
|
||||
|
|
@ -218,7 +199,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
|
|||
[_alertControllers addObject:alertController];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[presentingController presentViewController:alertController animated:YES completion:nil];
|
||||
[alertController show:YES completion:nil];
|
||||
});
|
||||
#else // [TODO(macOS ISS#2323203)
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче