mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
03bd7d799e
Summary:
## Summary
Please check out D21035209.
## Changes
- Codemod all ObjC NativeModule `getTurboModuleWithJsInvoker:nativeInvoker:perfLogger` methods to `getTurboModule:(const ObjCTurboModule::Args)`
## Script
```
var withSpaces = (...args) => args.join('\s*')
var regexString = withSpaces(
'-',
'\(',
'std::shared_ptr',
'<',
'(?<turboModuleClass>(facebook::react::|react::|::|)TurboModule)',
'>',
'\)',
'getTurboModuleWithJsInvoker',
':',
'\(',
'std::shared_ptr',
'<',
'(?<fbNamespace>(facebook::react::|react::|::|))CallInvoker',
'>',
'\)',
'(?<jsInvokerInstance>[A-Za-z0-9]+)',
'nativeInvoker',
':',
'\(',
'std::shared_ptr',
'<',
'(facebook::react::|react::|::|)CallInvoker',
'>',
'\)',
'(?<nativeInvokerInstance>[A-Za-z0-9]+)',
'perfLogger',
':',
'\(',
'id',
'<',
'RCTTurboModulePerformanceLogger',
'>',
'\)',
'(?<perfLoggerInstance>[A-Za-z0-9]+)',
'{',
'return',
'std::make_shared',
'<',
'(?<specName>(facebook::react::|react::|::|)Native[%A-Za-z0-9]+SpecJSI)',
'>',
'\(',
'self',
',',
'\k<jsInvokerInstance>',
',',
'\k<nativeInvokerInstance>',
',',
'\k<perfLoggerInstance>',
'\)',
';',
'}',
)
var replaceString = `- (std::shared_ptr<$<turboModuleClass>>) getTurboModule:(const $<fbNamespace>ObjCTurboModule::InitParams &)params
{
return std::make_shared<$<specName>>(params);
}`
const exec = require('../lib/exec');
const abspath = require('../lib/abspath');
const relpath = require('../lib/relpath');
const readFile = (filename) => require('fs').readFileSync(filename, 'utf8');
const writeFile = (filename, content) => require('fs').writeFileSync(filename, content);
function main() {
const tmFiles = exec('cd ~/fbsource && xbgs -n 10000 -l getTurboModuleWithJsInvoker:').split('\n').filter(Boolean);
tmFiles
.filter((filename) => !filename.includes('microsoft-fork-of-react-native'))
.map(abspath)
.forEach((filename) => {
const source = readFile(filename);
const newSource = source.replace(new RegExp(regexString, 'g'), replaceString);
if (source == newSource) {
console.log(relpath(filename));
}
writeFile(filename, newSource);
});
}
if (!module.parent) {
main();
}
```
## Re-generating diff
```
> hg revert -r .^ --all
> node index.js # run script
```
Changelog: [iOS][Changed] - Make all ObjC NativeModules create TurboModules using ObjCTurboModule::Args
Reviewed By: PeteTheHeat
Differential Revision: D21036265
fbshipit-source-id: 404bcc548d1775ef23d793527606d02fe384a0a2
221 lines
7.8 KiB
Plaintext
221 lines
7.8 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/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;
|
|
}
|
|
|
|
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()];
|
|
|
|
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: %@", @{
|
|
@"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];
|
|
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];
|
|
});
|
|
}
|
|
|
|
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
|
|
(const facebook::react::ObjCTurboModule::InitParams &)params
|
|
{
|
|
return std::make_shared<facebook::react::NativeAlertManagerSpecJSI>(params);
|
|
}
|
|
|
|
@end
|
|
|
|
Class RCTAlertManagerCls(void)
|
|
{
|
|
return RCTAlertManager.class;
|
|
}
|