Fire Action PopupOptions.OnTappingOutsideOfPopup when Android Back Button Pressed (#2799)

TheCodeTraveler · web-flow · commit 51e122822c60 · 2025-07-08T10:52:07.000-07:00
diff --git a/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs b/src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
@@ -101,10 +101,11 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
 
 	protected override bool OnBackButtonPressed()
 	{
-		// Only close the Popup if CanBeDismissedByTappingOutsideOfPopup is true
-		if (GetCanBeDismissedByTappingOutsideOfPopup(popup, popupOptions))
+		// When the Android Back Button is tapped, we only close the Popup if the tapOutsideOfPopupCommand can execute
+		// In other words, we'll only close the Popup when CanBeDismissedByTappingOutsideOfPopup is true
+		if (tapOutsideOfPopupCommand.CanExecute(null))
 		{
-			CloseAsync(new PopupResult(true), CancellationToken.None).SafeFireAndForget();
+			tapOutsideOfPopupCommand.Execute(null);
 		}
 
 		// Always return true to let the Android Operating System know that we are manually handling the Navigation request from the Android Back Button

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,11 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau`
`101`	`101`
`102`	`102`	`protected override bool OnBackButtonPressed()`
`103`	`103`	`{`
`104`		`- // Only close the Popup if CanBeDismissedByTappingOutsideOfPopup is true`
`105`		`- if (GetCanBeDismissedByTappingOutsideOfPopup(popup, popupOptions))`
	`104`	`+ // When the Android Back Button is tapped, we only close the Popup if the tapOutsideOfPopupCommand can execute`
	`105`	`+ // In other words, we'll only close the Popup when CanBeDismissedByTappingOutsideOfPopup is true`
	`106`	`+ if (tapOutsideOfPopupCommand.CanExecute(null))`
`106`	`107`	`{`
`107`		`- CloseAsync(new PopupResult(true), CancellationToken.None).SafeFireAndForget();`
	`108`	`+ tapOutsideOfPopupCommand.Execute(null);`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`// Always return true to let the Android Operating System know that we are manually handling the Navigation request from the Android Back Button`