Skip to content

[Popup] Properly handle Android Back Button pressed #2716

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
TheCodeTraveler merged 8 commits into from
Jun 13, 2025
Merged

[Popup] Properly handle Android Back Button pressed #2716

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
279bda2
Called `Closed` in `override OnBackButtonPressed()`
TheCodeTraveler Jun 13, 2025
49472e7
Use `Close()`
TheCodeTraveler Jun 13, 2025
f3484fe
Update PopupPage.shared.cs
TheCodeTraveler Jun 13, 2025
1721ef2
Merge branch 'main' into Close-Popup-When-Android-Back-Button-Pressed
TheCodeTraveler Jun 13, 2025
1fb326b
Merge branch 'main' into Close-Popup-When-Android-Back-Button-Pressed
TheCodeTraveler Jun 13, 2025
e08c634
Merge branch 'main' into Close-Popup-When-Android-Back-Button-Pressed
TheCodeTraveler Jun 13, 2025
c269b0b
Merge branch 'main' into Close-Popup-When-Android-Back-Button-Pressed
TheCodeTraveler Jun 13, 2025
d1eb301
Merge branch 'main' into Close-Popup-When-Android-Back-Button-Pressed
TheCodeTraveler Jun 13, 2025
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
10 changes: 3 additions & 7 deletions src/CommunityToolkit.Maui/Views/Popup/PopupPage.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Globalization;
using CommunityToolkit.Maui.Converters;
using CommunityToolkit.Maui.Core;
using CommunityToolkit.Maui.Extensions;
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
using Microsoft.Maui.Controls.Shapes;
Expand Down Expand Up @@ -43,11 +44,6 @@ public PopupPage(Popup popup, IPopupOptions popupOptions)
// Only set the content if the parent constructor hasn't set the content already; don't override content if it already exists
base.Content ??= new PopupPageLayout(popup, popupOptions);

if (Shell.Current is Shell shell)
{
Shell.SetPresentationMode(shell, PresentationMode.ModalNotAnimated);
}

tapOutsideOfPopupCommand = new Command(async () =>
{
popupOptions.OnTappingOutsideOfPopup?.Invoke();
Expand Down Expand Up @@ -114,9 +110,9 @@ protected override bool OnBackButtonPressed()
{
if (popupOptions.CanBeDismissedByTappingOutsideOfPopup)
{
return base.OnBackButtonPressed();
CloseAsync(new PopupResult(true), CancellationToken.None).SafeFireAndForget();
}

return true;
}

Expand Down
Loading