Skip to content
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

Jump to bottom

fix: multiple modal on iOS #31498

Closed
wants to merge 8 commits into from
Closed

fix: multiple modal on iOS #31498

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abdad8f
fix: multiple modal ios
intergalacticspacehighway May 9, 2021
4a939c0
Merge branch 'master' into fix/multiple-modal-ios
intergalacticspacehighway May 10, 2021
bd88272
Merge branch 'master' into fix/multiple-modal-ios
intergalacticspacehighway May 22, 2021
e585331
Merge branch 'master' into fix/multiple-modal-ios
intergalacticspacehighway May 30, 2021
0047c22
fix: multiple modal ios
intergalacticspacehighway Aug 18, 2023
2583d68
trigger ondismiss if nested modal closes
intergalacticspacehighway Aug 18, 2023
e7d6b44
chore: add comments
intergalacticspacehighway Aug 18, 2023
44d42cd
merge conflicts resolved
intergalacticspacehighway Aug 18, 2023
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
20 changes: 16 additions & 4 deletions React/Views/RCTModalHostViewManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,22 @@ - (void)presentModalHostView:(RCTModalHostView *)modalHostView
if (_presentationBlock) {
_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock);
} else {
[[modalHostView reactViewController] presentViewController:viewController
animated:animated
completion:completionBlock];
}

UIViewController *lastPresentedViewController = modalHostView.reactViewController;
UIViewController *presentedViewController = nil;


while (lastPresentedViewController != nil) {
presentedViewController = lastPresentedViewController;
lastPresentedViewController = lastPresentedViewController.presentedViewController;
}


[presentedViewController presentViewController:viewController
animated:animated
completion:completionBlock];
}

}

- (void)dismissModalHostView:(RCTModalHostView *)modalHostView
Expand Down