Skip to content

Fix dismissAllModal API #2255

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

Merged
gran33 merged 1 commit into from
Nov 30, 2017
Merged

Fix dismissAllModal API #2255

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
8 changes: 7 additions & 1 deletion ios/RCCManagerModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ -(void)animateSnapshot:(UIView*)snapshot animationType:(NSString*)animationType

-(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers resolver:(RCTPromiseResolveBlock)resolve
{
UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;

if (allPresentedViewControllers.count > 0)
{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),^
Expand All @@ -151,7 +153,7 @@ -(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers re
{
counter++;

[[RCCManager sharedIntance] unregisterController:viewController];

if (viewController.presentedViewController != nil)
{
dispatch_semaphore_t dismiss_sema = dispatch_semaphore_create(0);
Expand All @@ -160,6 +162,10 @@ -(void)dismissAllModalPresenters:(NSMutableArray*)allPresentedViewControllers re
{
[viewController dismissViewControllerAnimated:NO completion:^()
{
if (rootViewController != viewController) {
[[RCCManager sharedIntance] unregisterController:viewController];
}

if (counter == allPresentedViewControllers.count && allPresentedViewControllers.count > 0)
{
[allPresentedViewControllers removeAllObjects];
Expand Down