dismiss the modal when IsAnimated is set to false (#23879)

* dismiss the modal when IsAnimated is set to false * add test to validate the change
dotnet · Jul 29, 2024 · f52f95d · f52f95d
1 parent 4f439b3
commit f52f95d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs b/src/Controls/src/Core/Platform/ModalNavigationManager/ModalNavigationManager.Android.cs
@@ -140,6 +140,7 @@ Task<Page> PopModalPlatformAsync(bool animated)
 			}
 			else
 			{
+				dialogFragment.Dismiss();
 				source.TrySetResult(modal);
 			}
 

diff --git a/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs b/src/Controls/tests/DeviceTests/Elements/Modal/ModalTests.cs
@@ -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()