mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
7468a6c903
Summary: On iOS the promised returned by `Share.share(content, options)` isn't resolved if the user dismisses the dialog by either pressing "Cancel" or pressing outside the shared dialog. This PR fixes this issue. This fixes https://github.com/facebook/react-native/issues/26809. ## Changelog [iOS] [Fixed] - Fix promised returned by `Share.share(content, options)` not resolving if share dialog dismissed Pull Request resolved: https://github.com/facebook/react-native/pull/26842 Test Plan: 1. on iOS, open a share dialog with: ```typescript const onShare = async () => { const result = await Share.share({ message: 'example message' }); } ``` 2. Dismiss the opened share dialog and the returned promised should resolve. Differential Revision: D18189755 Pulled By: cpojer fbshipit-source-id: 1269932e9549026afefdaa8478ff7d33bbaeb86f
207 lines
7.7 KiB
Plaintext
207 lines
7.7 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 <React/RCTActionSheetManager.h>
|
|
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTConvert.h>
|
|
#import <React/RCTLog.h>
|
|
#import <React/RCTUIManager.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#import <FBReactNativeSpec/FBReactNativeSpec.h>
|
|
#import <RCTTypeSafety/RCTConvertHelpers.h>
|
|
|
|
#import "CoreModulesPlugins.h"
|
|
|
|
using namespace facebook::react;
|
|
|
|
@interface RCTActionSheetManager () <UIActionSheetDelegate, NativeActionSheetManagerSpec>
|
|
@end
|
|
|
|
@implementation RCTActionSheetManager
|
|
{
|
|
// Use NSMapTable, as UIAlertViews do not implement <NSCopying>
|
|
// which is required for NSDictionary keys
|
|
NSMapTable *_callbacks;
|
|
}
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
@synthesize bridge = _bridge;
|
|
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
return dispatch_get_main_queue();
|
|
}
|
|
|
|
- (void)presentViewController:(UIViewController *)alertController
|
|
onParentViewController:(UIViewController *)parentViewController
|
|
anchorViewTag:(NSNumber *)anchorViewTag
|
|
{
|
|
alertController.modalPresentationStyle = UIModalPresentationPopover;
|
|
UIView *sourceView = parentViewController.view;
|
|
|
|
if (anchorViewTag) {
|
|
sourceView = [self.bridge.uiManager viewForReactTag:anchorViewTag];
|
|
} else {
|
|
alertController.popoverPresentationController.permittedArrowDirections = 0;
|
|
}
|
|
alertController.popoverPresentationController.sourceView = sourceView;
|
|
alertController.popoverPresentationController.sourceRect = sourceView.bounds;
|
|
[parentViewController presentViewController:alertController animated:YES completion:nil];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(showActionSheetWithOptions:(JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions &)options
|
|
callback:(RCTResponseSenderBlock)callback)
|
|
{
|
|
if (RCTRunningInAppExtension()) {
|
|
RCTLogError(@"Unable to show action sheet from app extension");
|
|
return;
|
|
}
|
|
|
|
if (!_callbacks) {
|
|
_callbacks = [NSMapTable strongToStrongObjectsMapTable];
|
|
}
|
|
|
|
NSString *title = options.title();
|
|
NSString *message = options.message();
|
|
NSArray<NSString *> *buttons = RCTConvertOptionalVecToArray(options.options(), ^id(NSString *element) { return element; });
|
|
NSInteger cancelButtonIndex = options.cancelButtonIndex() ? [RCTConvert NSInteger:@(*options.cancelButtonIndex())] : -1;
|
|
NSArray<NSNumber *> *destructiveButtonIndices;
|
|
if (options.destructiveButtonIndices()) {
|
|
destructiveButtonIndices = RCTConvertVecToArray(*options.destructiveButtonIndices(), ^id(double element) { return @(element); });
|
|
} else {
|
|
NSNumber *destructiveButtonIndex = @-1;
|
|
destructiveButtonIndices = @[destructiveButtonIndex];
|
|
}
|
|
|
|
UIViewController *controller = RCTPresentedViewController();
|
|
NSNumber *anchor = [RCTConvert NSNumber:options.anchor() ? @(*options.anchor()) : nil];
|
|
UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
|
|
|
|
if (controller == nil) {
|
|
RCTLogError(@"Tried to display action sheet but there is no application window. options: %@", @{
|
|
@"title": title,
|
|
@"message": message,
|
|
@"options": buttons,
|
|
@"cancelButtonIndex": @(cancelButtonIndex),
|
|
@"destructiveButtonIndices": destructiveButtonIndices,
|
|
@"anchor": anchor,
|
|
@"tintColor": tintColor,
|
|
});
|
|
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 = anchor;
|
|
|
|
UIAlertController *alertController =
|
|
[UIAlertController alertControllerWithTitle:title
|
|
message:message
|
|
preferredStyle:UIAlertControllerStyleActionSheet];
|
|
|
|
NSInteger index = 0;
|
|
for (NSString *option in buttons) {
|
|
UIAlertActionStyle style = UIAlertActionStyleDefault;
|
|
if ([destructiveButtonIndices containsObject:@(index)]) {
|
|
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.view.tintColor = tintColor;
|
|
[self presentViewController:alertController onParentViewController:controller anchorViewTag:anchorViewTag];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(showShareActionSheetWithOptions:(JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions &)options
|
|
failureCallback:(RCTResponseSenderBlock)failureCallback
|
|
successCallback:(RCTResponseSenderBlock)successCallback)
|
|
{
|
|
if (RCTRunningInAppExtension()) {
|
|
RCTLogError(@"Unable to show action sheet from app extension");
|
|
return;
|
|
}
|
|
|
|
NSMutableArray<id> *items = [NSMutableArray array];
|
|
NSString *message = options.message();
|
|
if (message) {
|
|
[items addObject:message];
|
|
}
|
|
NSURL *URL = [RCTConvert NSURL:options.url()];
|
|
if (URL) {
|
|
if ([URL.scheme.lowercaseString isEqualToString:@"data"]) {
|
|
NSError *error;
|
|
NSData *data = [NSData dataWithContentsOfURL:URL
|
|
options:(NSDataReadingOptions)0
|
|
error:&error];
|
|
if (!data) {
|
|
failureCallback(@[RCTJSErrorFromNSError(error)]);
|
|
return;
|
|
}
|
|
[items addObject:data];
|
|
} else {
|
|
[items addObject:URL];
|
|
}
|
|
}
|
|
if (items.count == 0) {
|
|
RCTLogError(@"No `url` or `message` to share");
|
|
return;
|
|
}
|
|
|
|
UIActivityViewController *shareController = [[UIActivityViewController alloc] initWithActivityItems:items applicationActivities:nil];
|
|
|
|
NSString *subject = options.subject();
|
|
if (subject) {
|
|
[shareController setValue:subject forKey:@"subject"];
|
|
}
|
|
|
|
NSArray *excludedActivityTypes = RCTConvertOptionalVecToArray(options.excludedActivityTypes(), ^id(NSString *element) { return element; });
|
|
if (excludedActivityTypes) {
|
|
shareController.excludedActivityTypes = excludedActivityTypes;
|
|
}
|
|
|
|
UIViewController *controller = RCTPresentedViewController();
|
|
shareController.completionWithItemsHandler = ^(NSString *activityType, BOOL completed, __unused NSArray *returnedItems, NSError *activityError) {
|
|
if (activityError) {
|
|
failureCallback(@[RCTJSErrorFromNSError(activityError)]);
|
|
} else if (completed || activityType == nil) {
|
|
successCallback(@[@(completed), RCTNullIfNil(activityType)]);
|
|
}
|
|
};
|
|
|
|
NSNumber *anchorViewTag = [RCTConvert NSNumber:options.anchor() ? @(*options.anchor()) : nil];
|
|
shareController.view.tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
|
|
|
|
[self presentViewController:shareController onParentViewController:controller anchorViewTag:anchorViewTag];
|
|
}
|
|
|
|
- (std::shared_ptr<TurboModule>)getTurboModuleWithJsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
|
|
{
|
|
return std::make_shared<NativeActionSheetManagerSpecJSI>(self, jsInvoker);
|
|
}
|
|
|
|
@end
|
|
|
|
Class RCTActionSheetManagerCls(void) {
|
|
return RCTActionSheetManager.class;
|
|
}
|