Remove Navigation workaround (#13170)

dotnet · Feb 7, 2023 · f822230 · f822230
1 parent 8e53a53
commit f822230
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs b/src/Controls/tests/DeviceTests/ControlsHandlerTestBase.cs
@@ -342,14 +342,6 @@ protected async Task OnNavigatedToAsync(Page page, TimeSpan? timeOut = null)
 		{
 			await OnLoadedAsync(page, timeOut);
 
-			// Navigation Events currently aren't wired up
-			// correctly on iOS
-			if (OperatingSystem.IsIOS() && page.Parent is NavigationPage)
-			{
-				await Task.Delay(100);
-				return;
-			}
-
 			if (page.HasNavigatedTo)
 			{
 				// TabbedPage fires OnNavigated earlier than it should

diff --git a/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs b/src/Controls/tests/DeviceTests/Elements/TabbedPage/TabbedPageTests.cs
@@ -44,7 +44,7 @@ void SetupBuilder()
 			});
 		}
 
-#if !IOS
+#if !IOS && !MACCATALYST
 		// iOS currently can't handle recreating a handler if it's disconnecting
 		// This is left over behavior from Forms and will be fixed by a different PR
 		[Theory]