Skip to content

Fixed dismissAllModals for iOS #2093

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
seosgithub wants to merge 4 commits into from
Closed

Fixed dismissAllModals for iOS #2093

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e68e84
Fixed dismissAllModals for iOS - Previously it would unregister thing…
Oct 28, 2017
7b96532
Merge branch 'master' into ios-dismissAllModals-fix
gran33 Nov 8, 2017
19b8a93
Merge branch 'master' into ios-dismissAllModals-fix
seosgithub Nov 17, 2017
682ae85
Merge branch 'master' into ios-dismissAllModals-fix
seosgithub Nov 21, 2017
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
43 changes: 13 additions & 30 deletions ios/RCCManagerModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,8 @@ -(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers re
{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),^
{
__block NSUInteger counter = 0;
for (UIViewController *viewController in allPresentedViewControllers)
{
counter++;

[[RCCManager sharedIntance] unregisterController:viewController];
if (viewController.presentedViewController != nil)
{
dispatch_semaphore_t dismiss_sema = dispatch_semaphore_create(0);
Expand All @@ -160,40 +156,26 @@ -(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers re
{
[viewController dismissViewControllerAnimated:NO completion:^()
{
if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
{
[allPresentedViewControllers removeAllObjects];

if (resolve != nil)
{
resolve(nil);
}
}
dispatch_semaphore_signal(dismiss_sema);
}];
});

dispatch_semaphore_wait(dismiss_sema, DISPATCH_TIME_FOREVER);
}
else if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
{
[allPresentedViewControllers removeAllObjects];

if (resolve != nil)
{
dispatch_async(dispatch_get_main_queue(), ^
{
resolve(nil);
});
}
} else {
[[RCCManager sharedIntance] unregisterController:viewController];
}
}

dispatch_async(dispatch_get_main_queue(), ^{
resolve(nil);
});
});
return;
}
else if (resolve != nil)
{

dispatch_async(dispatch_get_main_queue(), ^{
resolve(nil);
}
});
}

#pragma mark - RCT exported methods
Expand Down Expand Up @@ -329,7 +311,7 @@ -(void)performSetRootController:(NSDictionary*)layout animationType:(NSString*)a
RCT_EXPORT_METHOD(
showController:(NSDictionary*)layout animationType:(NSString*)animationType globalProps:(NSDictionary*)globalProps resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
{

NSMutableDictionary *modifiedGlobalProps = [globalProps mutableCopy];
modifiedGlobalProps[GLOBAL_SCREEN_ACTION_COMMAND_TYPE] = COMMAND_TYPE_SHOW_MODAL;

Expand Down Expand Up @@ -407,7 +389,7 @@ -(BOOL)viewControllerIsModal:(UIViewController*)viewController
}
else
{
resolve(nil);
resolve(nil);
}
}

Expand Down Expand Up @@ -460,3 +442,4 @@ -(BOOL)viewControllerIsModal:(UIViewController*)viewController
}

@end