From a859d9e9315c2ff79432ffbf4b636ef78c990567 Mon Sep 17 00:00:00 2001 From: Nick Lockwood Date: Wed, 21 Oct 2015 12:19:33 -0700 Subject: [PATCH] Fixed ActionSheetIOS on iOS 9 SDK Summary: public UIActionSheet no longer works on iPad when building with the iOS 9 SDK, as reported here: https://github.com/facebook/react-native/issues/3498 This diff implements an alernative code path that uses UIAlertController instead when its available. Also added `anchor` support for action sheets (previously only supported for share sheet). Reviewed By: javache Differential Revision: D2560068 fb-gh-sync-id: feda20f6f1fee5e2ba624761fbeb812e23d96fff --- Examples/UIExplorer/ActionSheetIOSExample.js | 8 +- .../UIExplorer.xcodeproj/project.pbxproj | 2 + Libraries/ActionSheetIOS/ActionSheetIOS.js | 1 - .../ActionSheetIOS/RCTActionSheetManager.m | 204 +++++++++++------- 4 files changed, 133 insertions(+), 82 deletions(-) diff --git a/Examples/UIExplorer/ActionSheetIOSExample.js b/Examples/UIExplorer/ActionSheetIOSExample.js index c8527657f..31aedca62 100644 --- a/Examples/UIExplorer/ActionSheetIOSExample.js +++ b/Examples/UIExplorer/ActionSheetIOSExample.js @@ -24,9 +24,9 @@ var { } = React; var BUTTONS = [ - 'Button Index: 0', - 'Button Index: 1', - 'Button Index: 2', + 'Option 0', + 'Option 1', + 'Option 2', 'Destruct', 'Cancel', ]; @@ -47,7 +47,7 @@ var ActionSheetExample = React.createClass({ Click to show the ActionSheet - Clicked button at index: "{this.state.clicked}" + Clicked button: {this.state.clicked} ); diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj index 4c0bf2b19..002ca274c 100644 --- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj +++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj @@ -966,6 +966,7 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.facebook.internal.uiexplorer.local; PRODUCT_NAME = UIExplorer; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -985,6 +986,7 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = com.facebook.internal.uiexplorer.local; PRODUCT_NAME = UIExplorer; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js index 20150d6f6..155b7d74e 100644 --- a/Libraries/ActionSheetIOS/ActionSheetIOS.js +++ b/Libraries/ActionSheetIOS/ActionSheetIOS.js @@ -27,7 +27,6 @@ var ActionSheetIOS = { ); RCTActionSheetManager.showActionSheetWithOptions( options, - () => {}, // RKActionSheet compatibility hack callback ); }, diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m index dbaa9affd..dbc10a46e 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheetManager.m +++ b/Libraries/ActionSheetIOS/RCTActionSheetManager.m @@ -21,64 +21,136 @@ @implementation RCTActionSheetManager { - NSMutableDictionary *_callbacks; + // Use NSMapTable, as UIAlertViews do not implement + // which is required for NSDictionary keys + NSMapTable *_callbacks; } RCT_EXPORT_MODULE() -- (instancetype)init -{ - if ((self = [super init])) { - _callbacks = [NSMutableDictionary new]; - } - return self; -} - - (dispatch_queue_t)methodQueue { return dispatch_get_main_queue(); } +/* + * The `anchor` option takes a view to set as the anchor for the share + * popup to point to, on iPads running iOS 8. If it is not passed, it + * defaults to centering the share popup on screen without any arrows. + */ +- (CGRect)sourceRectInView:(UIView *)sourceView + anchorViewTag:(NSNumber *)anchorViewTag +{ + if (anchorViewTag) { + UIView *anchorView = [self.bridge.uiManager viewForReactTag:anchorViewTag]; + return [anchorView convertRect:anchorView.bounds toView:sourceView]; + } else { + return (CGRect){sourceView.center, {1, 1}}; + } +} + RCT_EXPORT_METHOD(showActionSheetWithOptions:(NSDictionary *)options - failureCallback:(__unused RCTResponseSenderBlock)failureCallback + callback:(RCTResponseSenderBlock)callback) +{ + if (RCTRunningInAppExtension()) { + RCTLogError(@"Unable to show action sheet from app extension"); + return; + } + + if (!_callbacks) { + _callbacks = [NSMapTable strongToStrongObjectsMapTable]; + } + + NSString *title = [RCTConvert NSString:options[@"title"]]; + NSArray *buttons = [RCTConvert NSStringArray:options[@"options"]]; + NSInteger destructiveButtonIndex = options[@"destructiveButtonIndex"] ? [RCTConvert NSInteger:options[@"destructiveButtonIndex"]] : -1; + NSInteger cancelButtonIndex = options[@"cancelButtonIndex"] ? [RCTConvert NSInteger:options[@"cancelButtonIndex"]] : -1; + + UIViewController *controller = RCTSharedApplication().delegate.window.rootViewController; + if (controller == nil) { + RCTLogError(@"Tried to display action sheet but there is no application window. options: %@", options); + return; + } + + /* + * The `anchor` option takes a view to set as the anchor for the share + * popup to point to, on iPads running iOS 8. If it is not passed, it + * defaults to centering the share popup on screen without any arrows. + */ + NSNumber *anchorViewTag = [RCTConvert NSNumber:options[@"anchor"]]; + UIView *sourceView = controller.view; + CGRect sourceRect = [self sourceRectInView:sourceView anchorViewTag:anchorViewTag]; + +#if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0 + + if ([UIAlertController class] == nil) { + + UIActionSheet *actionSheet = [UIActionSheet new]; + + actionSheet.title = title; + for (NSString *option in buttons) { + [actionSheet addButtonWithTitle:option]; + } + actionSheet.destructiveButtonIndex = destructiveButtonIndex; + actionSheet.cancelButtonIndex = cancelButtonIndex; + actionSheet.delegate = self; + + [_callbacks setObject:callback forKey:actionSheet]; + + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + [actionSheet showFromRect:sourceRect inView:sourceView animated:YES]; + } else { + [actionSheet showInView:sourceView]; + } + + } else + +#endif + + { + UIAlertController *alertController = + [UIAlertController alertControllerWithTitle:title + message:nil + preferredStyle:UIAlertControllerStyleActionSheet]; + + NSInteger index = 0; + for (NSString *option in buttons) { + UIAlertActionStyle style = UIAlertActionStyleDefault; + if (index == destructiveButtonIndex) { + style = UIAlertActionStyleDestructive; + } else if (index == cancelButtonIndex) { + style = UIAlertActionStyleCancel; + } + + NSInteger localIndex = index; + [alertController addAction:[UIAlertAction actionWithTitle:option + style:style + handler:^(__unused UIAlertAction *action){ + callback(@[@(localIndex)]); + }]]; + + index++; + } + + alertController.modalPresentationStyle = UIModalPresentationPopover; + alertController.popoverPresentationController.sourceView = sourceView; + alertController.popoverPresentationController.sourceRect = sourceRect; + if (!anchorViewTag) { + alertController.popoverPresentationController.permittedArrowDirections = 0; + } + [controller presentViewController:alertController animated:YES completion:nil]; + } +} + +RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options + failureCallback:(RCTResponseErrorBlock)failureCallback successCallback:(RCTResponseSenderBlock)successCallback) { if (RCTRunningInAppExtension()) { RCTLogError(@"Unable to show action sheet from app extension"); return; } - - UIActionSheet *actionSheet = [UIActionSheet new]; - actionSheet.title = options[@"title"]; - - for (NSString *option in options[@"options"]) { - [actionSheet addButtonWithTitle:option]; - } - - if (options[@"destructiveButtonIndex"]) { - actionSheet.destructiveButtonIndex = [options[@"destructiveButtonIndex"] integerValue]; - } - if (options[@"cancelButtonIndex"]) { - actionSheet.cancelButtonIndex = [options[@"cancelButtonIndex"] integerValue]; - } - - actionSheet.delegate = self; - - _callbacks[RCTKeyForInstance(actionSheet)] = successCallback; - - UIWindow *appWindow = RCTSharedApplication().delegate.window; - if (appWindow == nil) { - RCTLogError(@"Tried to display action sheet but there is no application window. options: %@", options); - return; - } - [actionSheet showInView:appWindow]; -} - -RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options - failureCallback:(RCTResponseSenderBlock)failureCallback - successCallback:(RCTResponseSenderBlock)successCallback) -{ NSMutableArray *items = [NSMutableArray array]; NSString *message = [RCTConvert NSString:options[@"message"]]; if (message) { @@ -89,22 +161,18 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options [items addObject:URL]; } if (items.count == 0) { - failureCallback(@[@"No `url` or `message` to share"]); - return; - } - if (RCTRunningInAppExtension()) { - failureCallback(@[@"Unable to show action sheet from app extension"]); + RCTLogError(@"No `url` or `message` to share"); return; } - UIActivityViewController *share = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil]; - UIViewController *ctrl = RCTSharedApplication().delegate.window.rootViewController; + UIActivityViewController *shareController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil]; + UIViewController *controller = RCTSharedApplication().delegate.window.rootViewController; #if __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0 if (![UIActivityViewController instancesRespondToSelector:@selector(setCompletionWithItemsHandler:)]) { // Legacy iOS 7 implementation - share.completionHandler = ^(NSString *activityType, BOOL completed) { + shareController.completionHandler = ^(NSString *activityType, BOOL completed) { successCallback(@[@(completed), RCTNullIfNil(activityType)]); }; } else @@ -113,45 +181,34 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options { // iOS 8 version - share.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, __unused NSArray *returnedItems, NSError *activityError) { + shareController.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, __unused NSArray *returnedItems, NSError *activityError) { if (activityError) { - failureCallback(@[RCTNullIfNil(activityError.localizedDescription)]); + failureCallback(activityError); } else { successCallback(@[@(completed), RCTNullIfNil(activityType)]); } }; - } - /* - * The `anchor` option takes a view to set as the anchor for the share - * popup to point to, on iPads running iOS 8. If it is not passed, it - * defaults to centering the share popup on screen without any arrows. - */ - if ([share respondsToSelector:@selector(popoverPresentationController)]) { - share.popoverPresentationController.sourceView = ctrl.view; + shareController.modalPresentationStyle = UIModalPresentationPopover; NSNumber *anchorViewTag = [RCTConvert NSNumber:options[@"anchor"]]; - if (anchorViewTag) { - UIView *anchorView = [self.bridge.uiManager viewForReactTag:anchorViewTag]; - share.popoverPresentationController.sourceRect = [anchorView convertRect:anchorView.bounds toView:ctrl.view]; - } else { - CGRect sourceRect = CGRectMake(ctrl.view.center.x, ctrl.view.center.y, 1, 1); - share.popoverPresentationController.sourceRect = sourceRect; - share.popoverPresentationController.permittedArrowDirections = 0; + if (!anchorViewTag) { + shareController.popoverPresentationController.permittedArrowDirections = 0; } + shareController.popoverPresentationController.sourceView = controller.view; + shareController.popoverPresentationController.sourceRect = [self sourceRectInView:controller.view anchorViewTag:anchorViewTag]; } - [ctrl presentViewController:share animated:YES completion:nil]; + [controller presentViewController:shareController animated:YES completion:nil]; } #pragma mark UIActionSheetDelegate Methods - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex { - NSString *key = RCTKeyForInstance(actionSheet); - RCTResponseSenderBlock callback = _callbacks[key]; + RCTResponseSenderBlock callback = [_callbacks objectForKey:actionSheet]; if (callback) { callback(@[@(buttonIndex)]); - [_callbacks removeObjectForKey:key]; + [_callbacks removeObjectForKey:actionSheet]; } else { RCTLogWarn(@"No callback registered for action sheet: %@", actionSheet.title); } @@ -159,11 +216,4 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(NSDictionary *)options [RCTSharedApplication().delegate.window makeKeyWindow]; } -#pragma mark Private - -static NSString *RCTKeyForInstance(id instance) -{ - return [NSString stringWithFormat:@"%p", instance]; -} - @end