Skip to content

[Windows, Mac] Fixed Disappearing event not triggered when closing a window with a modal page #29129

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
merged 4 commits into from
May 13, 2025
Merged

[Windows, Mac] Fixed Disappearing event not triggered when closing a window with a modal page #29129

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb671bb
Fixed-19675 : Disappearing event is not triggered on modal page navig…
Vignesh-SF3580 Apr 22, 2025
550b29c
Added testcase.
Vignesh-SF3580 Apr 22, 2025
b1b7e06
updated Window.cs
Vignesh-SF3580 Apr 23, 2025
2791110
updated Window.cs
Vignesh-SF3580 May 8, 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
6 changes: 6 additions & 0 deletions src/Controls/src/Core/Window/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,13 @@ void SendWindowAppearing()
void SendWindowDisppearing()
{
if (Navigation.ModalStack.Count == 0)
{
Page?.SendDisappearing();
}
else if (Navigation.ModalStack.Count > 0)
{
Navigation.ModalStack[^1]?.SendDisappearing();
Copy link
Contributor

@jsuarezruiz jsuarezruiz May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, will require to update this for net standard 2.0:

/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Window/Window.cs(439,27): error CS0518: Predefined type 'System.Index' is not defined or imported [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.0]
/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Window/Window.cs(439,27): error CS0656: Missing compiler required member 'System.Index..ctor' [/Users/builder/azdo/_work/1/s/src/Controls/src/Core/Controls.Core.csproj::TargetFramework=netstandard2.0]
    2 Error(s)

if (Navigation.ModalStack.Count > 0)
{
    Navigation.ModalStack[Navigation.ModalStack.Count - 1]?.SendDisappearing();
}

Copy link
Contributor Author

@Vignesh-SF3580 Vignesh-SF3580 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsuarezruiz I’ve updated the code based on your suggestion. Please let me know if you have any further concerns.

}

IsActivated = false;
}
Expand Down
22 changes: 22 additions & 0 deletions src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,28 @@ await CreateHandlerAndAddToWindow(window, async () =>
});
}

#if WINDOWS || MACCATALYST
[Fact]
public async Task DisappearingEventFiresWhenWindowClosedWithModal()
{
SetupBuilder();
var rootPage = new ContentPage();
var modalPage = new ContentPage();
bool disappearingTriggered = false;
modalPage.Disappearing += (_, _) => disappearingTriggered = true;
var window = new Window(rootPage);
await rootPage.Navigation.PushModalAsync(modalPage);

await CreateHandlerAndAddToWindow<IWindowHandler>(window, async handler =>
{
await OnLoadedAsync(modalPage);
Application.Current?.CloseWindow(window);
});

Assert.True(disappearingTriggered);
}
#endif

class PageTypes : IEnumerable<object[]>
{
public IEnumerator<object[]> GetEnumerator()
Expand Down
Loading