Skip to content

smoother dismiss of modal with transparent coloring #8217

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
markdevocht merged 5 commits into from
Feb 5, 2026
Merged

smoother dismiss of modal with transparent coloring #8217

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00c0140
smoother dismiss of modal with transparent coloring
markdevocht Jan 26, 2026
9b72f07
Merge branch 'master' into bugfix/#8083-black-screen-after-modal
markdevocht Jan 28, 2026
df5e28e
Merge branch 'master' into bugfix/#8083-black-screen-after-modal
markdevocht Feb 4, 2026
70ce503
Merge branch 'master' into bugfix/#8083-black-screen-after-modal
markdevocht Feb 4, 2026
a39b3aa
Merge branch 'master' into bugfix/#8083-black-screen-after-modal
markdevocht Feb 5, 2026
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
53 changes: 29 additions & 24 deletions ios/ScreenAnimationController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,13 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
}

- (void)prepareTransitionContext:(id<UIViewControllerContextTransitioning>)transitionContext {
UIViewController *fromViewController =
[transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
UIViewController *toViewController =
[transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];

UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];
UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];

BOOL isDismiss = (toView == nil);

if (isDismiss) {
if (fromView) {
[transitionContext.containerView addSubview:fromView];
}
} else {
if (toView) {
toViewController.view.alpha = 0;
if (fromView) {
[transitionContext.containerView addSubview:fromView];
Expand Down Expand Up @@ -137,26 +129,39 @@ - (void)performAnimationOnce {
- (void)animateTransitions:(NSArray<id<DisplayLinkAnimatorDelegate>> *)animators
andTransitioningContext:(id<UIViewControllerContextTransitioning>)transitionContext {
UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
UIViewController *fromVC = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];

BOOL isDismiss = (toView == nil);

DisplayLinkAnimator *displayLinkAnimator = [[DisplayLinkAnimator alloc]
initWithDisplayLinkAnimators:animators
duration:[self transitionDuration:transitionContext]];

[displayLinkAnimator setOnStart:^{
UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
if (isDismiss) {
[UIView animateWithDuration:[self transitionDuration:transitionContext]
animations:^{
fromVC.view.alpha = 0;
} completion:^(BOOL finished) {
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
fromVC.view.alpha = 1;
}];
return;
}

DisplayLinkAnimator *displayLinkAnimator = [[DisplayLinkAnimator alloc]
initWithDisplayLinkAnimators:animators
duration:[self transitionDuration:transitionContext]];

[displayLinkAnimator setOnStart:^{
if (!isDismiss) {
UIViewController *toVC = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
toVC.view.alpha = 1.f;
}
}];

[displayLinkAnimator setCompletion:^{
if (![transitionContext transitionWasCancelled]) {
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
}
}];

[displayLinkAnimator start];
}];
[displayLinkAnimator setCompletion:^{
if (![transitionContext transitionWasCancelled]) {
[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
}
}];
[displayLinkAnimator start];
}

- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext {
Expand Down