fix(ios): prevent usage of viewControllers that are being dismissed (#10291)

mukaschultze · web-flow · commit 963d0243de8b · 2023-05-15T20:18:29.000-07:00
diff --git a/packages/core/ui/dialogs/index.ios.ts b/packages/core/ui/dialogs/index.ios.ts
@@ -45,9 +45,9 @@ function raiseCallback(callback, result) {
 }
 
 function showUIAlertController(alertController: UIAlertController) {
-	let viewController = ios.rootController;
+	let viewController = ios.rootController as UIViewController;
 
-	while (viewController && viewController.presentedViewController) {
+	while (viewController && viewController.presentedViewController && !viewController.presentedViewController.beingDismissed) {
 		viewController = viewController.presentedViewController;
 	}
 
@@ -60,7 +60,7 @@ function showUIAlertController(alertController: UIAlertController) {
 	if (alertController.popoverPresentationController) {
 		alertController.popoverPresentationController.sourceView = viewController.view;
 		alertController.popoverPresentationController.sourceRect = CGRectMake(viewController.view.bounds.size.width / 2.0, viewController.view.bounds.size.height / 2.0, 1.0, 1.0);
-		alertController.popoverPresentationController.permittedArrowDirections = 0;
+		alertController.popoverPresentationController.permittedArrowDirections = 0 as UIPopoverArrowDirection;
 	}
 
 	const color = getButtonColors().color;

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ function raiseCallback(callback, result) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`function showUIAlertController(alertController: UIAlertController) {`
`48`		`- let viewController = ios.rootController;`
	`48`	`+ let viewController = ios.rootController as UIViewController;`
`49`	`49`
`50`		`- while (viewController && viewController.presentedViewController) {`
	`50`	`+ while (viewController && viewController.presentedViewController && !viewController.presentedViewController.beingDismissed) {`
`51`	`51`	`viewController = viewController.presentedViewController;`
`52`	`52`	`}`
`53`	`53`
`@@ -60,7 +60,7 @@ function showUIAlertController(alertController: UIAlertController) {`
`60`	`60`	`if (alertController.popoverPresentationController) {`
`61`	`61`	`alertController.popoverPresentationController.sourceView = viewController.view;`
`62`	`62`	`alertController.popoverPresentationController.sourceRect = CGRectMake(viewController.view.bounds.size.width / 2.0, viewController.view.bounds.size.height / 2.0, 1.0, 1.0);`
`63`		`- alertController.popoverPresentationController.permittedArrowDirections = 0;`
	`63`	`+ alertController.popoverPresentationController.permittedArrowDirections = 0 as UIPopoverArrowDirection;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`const color = getButtonColors().color;`