Skip to content

fix for fading modal dismissal #8192

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 1 commit into from
Jan 1, 2026
Merged

fix for fading modal dismissal #8192

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
50 changes: 37 additions & 13 deletions ios/ScreenAnimationController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,29 @@ - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionCo
}

- (void)prepareTransitionContext:(id<UIViewControllerContextTransitioning>)transitionContext {
UINavigationController *toViewController =
[transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
toViewController.view.alpha = 0;
UIView *fromView = [transitionContext viewForKey:UITransitionContextFromViewKey];

[transitionContext.containerView addSubview:fromView];
[transitionContext.containerView addSubview:toViewController.view];
[toViewController prepareForTransition];
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 {
toViewController.view.alpha = 0;
if (fromView) {
[transitionContext.containerView addSubview:fromView];
}
[transitionContext.containerView addSubview:toViewController.view];
}

[toViewController prepareForTransition];
}

- (NSArray *)createTransitionsFromVC:(UIViewController *)fromVC
Expand Down Expand Up @@ -121,13 +136,18 @@ - (void)performAnimationOnce {

- (void)animateTransitions:(NSArray<id<DisplayLinkAnimatorDelegate>> *)animators
andTransitioningContext:(id<UIViewControllerContextTransitioning>)transitionContext {
UIView *toView = [transitionContext viewForKey:UITransitionContextToViewKey];
BOOL isDismiss = (toView == nil);

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

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

[displayLinkAnimator setCompletion:^{
Expand Down Expand Up @@ -170,9 +190,13 @@ - (void)animationEnded:(BOOL)transitionCompleted {
UIView *toView = [_transitionContext viewForKey:UITransitionContextToViewKey];
UIView *fromView = [_transitionContext viewForKey:UITransitionContextFromViewKey];
[_sharedElementAnimator animationEnded];
toView.layer.transform = CATransform3DIdentity;
fromView.layer.transform = CATransform3DIdentity;
toView.alpha = 1.f;
if (toView) {
toView.layer.transform = CATransform3DIdentity;
toView.alpha = 1.f;
}
if (fromView) {
fromView.layer.transform = CATransform3DIdentity;
}
_transitionContext = nil;
_sharedElementAnimator = nil;
}
Expand Down