Skip to content

Cleanup Popup Resources When Closed #2971

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 11 commits into from
Nov 28, 2025
Merged

Cleanup Popup Resources When Closed #2971

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
612dd2a
Fixing Conditional Cleanup on Popup Closing
AlejoTorresLeon Nov 28, 2025
69396d4
Clean Popup Resources in `PopupPage.CloseAsync()`
TheCodeTraveler Nov 28, 2025
bdb5dc5
Uupdate Popup Unit Tests
TheCodeTraveler Nov 28, 2025
4b2cfd0
Increase Timeout
TheCodeTraveler Nov 28, 2025
3eb17c6
Increase Timeout
TheCodeTraveler Nov 28, 2025
1a135ed
Implement IDisposable
TheCodeTraveler Nov 28, 2025
74e1256
`dotnet format`
TheCodeTraveler Nov 28, 2025
178ba62
Use `sealed` class and `protected` constructor
TheCodeTraveler Nov 28, 2025
b82180d
Remove `Cleanup Popup Tests`
TheCodeTraveler Nov 28, 2025
2cada0a
Remove `WaitForPopupToCloseAsync`
TheCodeTraveler Nov 28, 2025
128015d
Update PopupServiceTests.cs
TheCodeTraveler Nov 28, 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
4 changes: 2 additions & 2 deletions src/CommunityToolkit.Maui/Views/Popup/Popup.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ private protected PopupPage GetPopupPage()

while (parent is not null)
{
if (parent.Parent is PopupPage popuppage)
if (parent.Parent is PopupPage popupPage)
{
return popuppage;
return popupPage;
}

parent = parent.Parent;
Expand Down
13 changes: 5 additions & 8 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 @@ -115,6 +115,11 @@ public async Task CloseAsync(PopupResult result, CancellationToken token = defau
await Navigation.PopModalAsync(false).WaitAsync(token);

PopupClosed?.Invoke(this, result);
popup.NotifyPopupIsClosed();

// Clean up Popup resources
base.Content.GestureRecognizers.Clear();
popup.PropertyChanged -= HandlePopupPropertyChanged;
}

protected override bool OnBackButtonPressed()
Expand All @@ -125,14 +130,6 @@ protected override bool OnBackButtonPressed()
return true;
}

protected override void OnNavigatedFrom(NavigatedFromEventArgs args)
{
popup.NotifyPopupIsClosed();
base.Content.GestureRecognizers.Clear();
popup.PropertyChanged -= HandlePopupPropertyChanged;
base.OnNavigatedFrom(args);
}

protected override void OnNavigatedTo(NavigatedToEventArgs args)
{
base.OnNavigatedTo(args);
Expand Down
Loading