Skip to content

[ios] handle didPickDocumentsAtURLs on main thread #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[ios] handle didPickDocumentsAtURLs on main thread #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ios/RNDocumentPicker/RNDocumentPicker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@
#import "RCTBridge.h"
#endif

// WEAKIFY & STRONGIFY
// Helper macro.
#define weakify(var) __weak typeof(var) RNDocumentPicker_##var = var;

#define strongify(var) \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wshadow\"") \
__strong typeof(var) var = RNDocumentPicker_##var; \
_Pragma("clang diagnostic pop")

static NSString *const E_DOCUMENT_PICKER_CANCELED = @"DOCUMENT_PICKER_CANCELED";
static NSString *const E_INVALID_DATA_RETURNED = @"INVALID_DATA_RETURNED";

Expand Down Expand Up @@ -146,11 +156,14 @@ - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocum

- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls
{
weakify(self);
dispatch_async(dispatch_get_main_queue(), ^{
strongify(self);
if (controller.documentPickerMode == UIDocumentPickerModeImport) {
RCTPromiseResolveBlock resolve = [composeResolvers lastObject];
RCTPromiseRejectBlock reject = [composeRejecters lastObject];
[composeResolvers removeLastObject];
[composeRejecters removeLastObject];
RCTPromiseResolveBlock resolve = [self->composeResolvers lastObject];
RCTPromiseRejectBlock reject = [self->composeRejecters lastObject];
[self->composeResolvers removeLastObject];
[self->composeRejecters removeLastObject];

NSMutableArray *results = [NSMutableArray array];
for (id url in urls) {
Expand All @@ -166,6 +179,7 @@ - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocum

resolve(results);
}
});
}

- (void)documentPickerWasCancelled:(UIDocumentPickerViewController *)controller
Expand Down