From c8dac270ba08e104df9362bd8e8cb428d19621a0 Mon Sep 17 00:00:00 2001
From: Jakub Florkowski <kubaflo123@gmail.com>
Date: Sun, 26 May 2024 20:01:38 +0200
Subject: [PATCH] Fix #22570 & UI Test

---
 .../src/Core/Shell/ShellNavigationManager.cs  |  6 +++-
 .../TestCases.HostApp/Issues/Issue22570.xaml  | 22 ++++++++++++
 .../Issues/Issue22570.xaml.cs                 | 36 +++++++++++++++++++
 .../Tests/Issues/Issue22570.cs                | 24 +++++++++++++
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml
 create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml.cs
 create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22570.cs

diff --git a/src/Controls/src/Core/Shell/ShellNavigationManager.cs b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
index 9329bf1a5f11..04028e07603d 100644
--- a/src/Controls/src/Core/Shell/ShellNavigationManager.cs
+++ b/src/Controls/src/Core/Shell/ShellNavigationManager.cs
@@ -115,7 +115,11 @@ internal async Task GoToAsync(
 				modalStackPreBuilt = true;
 
 				bool? isAnimated = (nextActiveSection != currentShellSection) ? false : animate;
-				await nextActiveSection.GoToAsync(navigationRequest, parameters, _shell.FindMauiContext()?.Services, isAnimated, isRelativePopping);
+
+				await _shell.Dispatcher.DispatchAsync(() =>
+				{
+					_ = nextActiveSection.GoToAsync(navigationRequest, parameters, _shell.FindMauiContext()?.Services, isAnimated, isRelativePopping);
+				});
 			}
 
 			if (shellItem != null)
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml
new file mode 100644
index 000000000000..64ae5817720a
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue22570">
+    <TabBar Route="main"
+            Title="Tabs">
+        <ShellContent
+            Title="Home"
+            Route="Home">
+            <ContentPage>
+                <VerticalStackLayout>
+                    <Button Text="Navigate to a subpage"
+                            AutomationId="button"
+                            Clicked="Button_Clicked"/>
+                </VerticalStackLayout>
+            </ContentPage>
+        </ShellContent>
+        <ShellContent Title="Foo" Route="Foo">
+            <ContentPage/>
+        </ShellContent>
+    </TabBar>
+</Shell>
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml.cs
new file mode 100644
index 000000000000..685fb38614cd
--- /dev/null
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue22570.xaml.cs
@@ -0,0 +1,36 @@
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	[Issue(IssueTracker.Github, 22570, "[iOS] Cross TabBar navigation broken", PlatformAffected.iOS)]
+	public partial class Issue22570 : Shell
+	{
+		public Issue22570()
+		{
+			InitializeComponent();
+			Routing.RegisterRoute("Bar", typeof(Issue22570Page));
+		}
+
+		void Button_Clicked(object sender, System.EventArgs e)
+		{
+			_ = GoToAsync("//main/Foo/Bar");
+		}
+
+		public class Issue22570Page : ContentPage
+		{
+			public Issue22570Page()
+			{
+				Content = new VerticalStackLayout()
+				{
+					new Label()
+					{
+						Text = "Hello, World!",
+						AutomationId = "label"
+					}
+				};
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22570.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22570.cs
new file mode 100644
index 000000000000..759dca784130
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22570.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue22570 : _IssuesUITest
+	{
+		public Issue22570(TestDevice device)
+			: base(device)
+		{ }
+
+		public override string Issue => "[iOS] Cross TabBar navigation broken";
+
+		[Test]
+		public void Issue22570Test()
+		{
+			App.WaitForElement("button");
+			App.Click("button");
+			App.WaitForElement("label");
+		}
+	}
+}