Use correct page for PopupBlockedException

TheCodeTraveler · TheCodeTraveler · commit a1cb163ff17d · 2025-11-05T16:40:22.000-08:00
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -103,7 +103,7 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 		else if (Navigation.ModalStack[^1] is ContentPage currentVisibleModalPage
 				 && currentVisibleModalPage.Content != Content)
 		{
-			throw new PopupBlockedException(popupPageToClose);
+			throw new PopupBlockedException(currentVisibleModalPage);
 		}
 
 		// We call `.ThrowIfCancellationRequested()` again to avoid a race condition where a developer cancels the CancellationToken after we check for an InvalidOperationException

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau`
`103`	`103`	`else if (Navigation.ModalStack[^1] is ContentPage currentVisibleModalPage`
`104`	`104`	`&& currentVisibleModalPage.Content != Content)`
`105`	`105`	`{`
`106`		`- throw new PopupBlockedException(popupPageToClose);`
	`106`	`+ throw new PopupBlockedException(currentVisibleModalPage);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	// We call `.ThrowIfCancellationRequested()` again to avoid a race condition where a developer cancels the CancellationToken after we check for an InvalidOperationException