fix(ios): prevent transitionCoordinator usage during modal presentation (#10153)

NathanWalker · web-flow · commit d138ac000df2 · 2023-01-03T15:01:21.000-08:00
closes #10115
diff --git a/packages/core/ui/frame/index.ios.ts b/packages/core/ui/frame/index.ios.ts
@@ -118,7 +118,9 @@ export class Frame extends FrameBase {
 		if (!this._currentEntry) {
 			// Update action-bar with disabled animations before the initial navigation.
 			this._updateActionBar(backstackEntry.resolvedPage, true);
-			this.pushViewControllerAnimated(viewController, animated);
+			// Core defaults modalPresentationStyle to 1 for standard frame navigation
+			// for all others, it's modal presentation
+			this.pushViewControllerAnimated(viewController, animated, this._ios?.controller?.modalPresentationStyle !== 1);
 			if (Trace.isEnabled()) {
 				Trace.write(`${this}.pushViewControllerAnimated(${viewController}, ${animated}); depth = ${navDepth}`, Trace.categories.Navigation);
 			}
@@ -180,13 +182,14 @@ export class Frame extends FrameBase {
 		}
 	}
 
-	private pushViewControllerAnimated(viewController: UIViewController, animated: boolean) {
+	private pushViewControllerAnimated(viewController: UIViewController, animated: boolean, isModal: boolean) {
 		let transitionCoordinator = this._ios.controller.transitionCoordinator;
-		if (transitionCoordinator) {
+		if (!isModal && transitionCoordinator) {
 			transitionCoordinator.animateAlongsideTransitionCompletion(null, () => {
 				this._ios.controller.pushViewControllerAnimated(viewController, animated);
 			});
 		} else {
+			// modal should always push immediately without transition coordinator
 			this._ios.controller.pushViewControllerAnimated(viewController, animated);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,9 @@ export class Frame extends FrameBase {`
`118`	`118`	`if (!this._currentEntry) {`
`119`	`119`	`// Update action-bar with disabled animations before the initial navigation.`
`120`	`120`	`this._updateActionBar(backstackEntry.resolvedPage, true);`
`121`		`- this.pushViewControllerAnimated(viewController, animated);`
	`121`	`+ // Core defaults modalPresentationStyle to 1 for standard frame navigation`
	`122`	`+ // for all others, it's modal presentation`
	`123`	`+ this.pushViewControllerAnimated(viewController, animated, this._ios?.controller?.modalPresentationStyle !== 1);`
`122`	`124`	`if (Trace.isEnabled()) {`
`123`	`125`	Trace.write(`${this}.pushViewControllerAnimated(${viewController}, ${animated}); depth = ${navDepth}`, Trace.categories.Navigation);
`124`	`126`	`}`
`@@ -180,13 +182,14 @@ export class Frame extends FrameBase {`
`180`	`182`	`}`
`181`	`183`	`}`
`182`	`184`
`183`		`- private pushViewControllerAnimated(viewController: UIViewController, animated: boolean) {`
	`185`	`+ private pushViewControllerAnimated(viewController: UIViewController, animated: boolean, isModal: boolean) {`
`184`	`186`	`let transitionCoordinator = this._ios.controller.transitionCoordinator;`
`185`		`- if (transitionCoordinator) {`
	`187`	`+ if (!isModal && transitionCoordinator) {`
`186`	`188`	`transitionCoordinator.animateAlongsideTransitionCompletion(null, () => {`
`187`	`189`	`this._ios.controller.pushViewControllerAnimated(viewController, animated);`
`188`	`190`	`});`
`189`	`191`	`} else {`
	`192`	`+ // modal should always push immediately without transition coordinator`
`190`	`193`	`this._ios.controller.pushViewControllerAnimated(viewController, animated);`
`191`	`194`	`}`
`192`	`195`	`}`