Skip to content

Modal completion handler #13

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modal completion handler #13

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions RCTBrowser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ @implementation RCTBrowser

RCT_EXPORT_MODULE()

RCT_EXPORT_METHOD(presentUrl:(NSString *)url withOptions:(NSDictionary *)options) {
RCT_EXPORT_METHOD(presentUrl:(NSString *)url
withOptions:(NSDictionary *)options
modalCompletion:(RCTResponseSenderBlock)modalCompletionHandler) {

TOWebViewController *webVC = [[TOWebViewController alloc] initWithURLString:url];

Expand All @@ -31,8 +33,6 @@ @implementation RCTBrowser
webVC.disableContextualPopupMenu = ([obj isEqual: @(YES)]);
} else if ([key isEqualToString:@"hideWebViewBoundaries"]) {
webVC.hideWebViewBoundaries = ([obj isEqual: @(YES)]);
} else if ([key isEqualToString:@"modalCompletionHandler"]) {
// TODO: turn this into a callback
} else if ([key isEqualToString:@"shouldStartLoadRequestHandler"]) {
// TODO: turn this into a callback
} else if ([key isEqualToString:@"buttonTintColor"]) {
Expand All @@ -42,6 +42,10 @@ @implementation RCTBrowser
}
}];

webVC.modalCompletionHandler = ^(void) {
modalCompletionHandler(@[[NSNull null]]);
};

UIViewController *rootVC = [[UIApplication sharedApplication] keyWindow].rootViewController;
UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:webVC];

Expand Down
6 changes: 5 additions & 1 deletion index.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ var Browser = NativeModules.Browser;

var RCTBrowserExport = {
open: function(url, options={}) {
Browser.presentUrl(url, options);
Browser.presentUrl(url, options, function(err) {
if (options.modalCompletionHandler) {
options.modalCompletionHandler();
}
});
},
};

Expand Down