Skip to content

dismiss the modal when IsAnimated is set to false #23879

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
rmarinho merged 2 commits into from
Jul 29, 2024
Merged

dismiss the modal when IsAnimated is set to false #23879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b5a5b
dismiss the modal when IsAnimated is set to false
pictos Jul 28, 2024
b2b1336
add test to validate the change
pictos Jul 28, 2024
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
1 change: 1 addition & 0 deletions src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ Task<Page> PopModalPlatformAsync(bool animated)
}
else
{
dialogFragment.Dismiss();
source.TrySetResult(modal);
}

Expand Down
23 changes: 23 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 @@ -532,6 +532,29 @@ await CreateHandlerAndAddToWindow<IWindowHandler>(rootPage,
Assert.Empty(rootPage.GetCurrentPage().Navigation.ModalStack);
}

[Fact]
public async Task DismissModalIfNotAnimated()
{
SetupBuilder();
var page = new ContentPage();

var modalPage = new ContentPage()
{
Content = new Label() { Text = "Page with no animation" }
};

var window = new Window(page);

await CreateHandlerAndAddToWindow(window, async () =>
{
await page.Navigation.PushModalAsync(modalPage, false);
await OnLoadedAsync(modalPage);
await modalPage.Navigation.PopModalAsync(false);
await OnUnloadedAsync(modalPage);

});
}

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