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

[Vignesh-SF3580]

Issue Detail

When a page is pushed using PushModalAsync and the window is then closed, the Disappearing event for the pushed page is not triggered.

Root Cause

The Disappearing event was only triggered when the ModalStack count was zero during window closure. When pushing the page, stack count was greater than zero, which results in restricting the Disappearing event.

Description of Change

Modified the logic to trigger the Disappearing event for the last page in the stack when closing the window, which resolves the issue.

Reference:

In PopModalAsync, the Disappearing event is triggered for the LastPage in the stack. The same logic is now applied when closing the window.

Issues Fixed

Fixes #19675

Screenshots

Mac:

Before Issue Fix	After Issue Fix
19675Before.mov	19675After.mov

Windows:

Before Issue Fix	After Issue Fix
19675BeforeWindows.mp4	19675AfterWindows.mp4

[dotnet-policy-service]

Hey there @@Vignesh-SF3580! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed.

[Copilot]

Pull Request Overview

This PR fixes the issue where the Disappearing event was not triggered when closing a window that contains a modal page. The changes include adding a new test case for verifying the Disappearing event on Windows and Mac, and modifying the logic in the Window class to trigger the event from the correct page.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs	Added a new test to verify Disappearing event functionality when closing a window with a modal page.
src/Controls/src/Core/Window/Window.cs	Updated the logic to trigger Disappearing on the last modal page if the ModalStack count is greater than zero.

[jsuarezruiz]

/azp run MAUI-UITests-public

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[jsuarezruiz]

Can use Navigation.ModalStack[^1];

[Vignesh-SF3580]

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

[jsuarezruiz]

/azp run MAUI-UITests-public

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[jsuarezruiz]

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();
}

[Vignesh-SF3580]

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

[jsuarezruiz]

/azp run MAUI-UITests-public

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).