From ae93381d238ac84289549dd7487abf6058d6a338 Mon Sep 17 00:00:00 2001
From: Alberto Aldegheri <albyrock87@gmail.com>
Date: Wed, 22 May 2024 13:28:30 +0200
Subject: [PATCH] Fix navigation stuck when pushing on hidden tab section in
 TabBar

---
 .../Shell/iOS/ShellSectionRenderer.cs         | 14 +++++---
 .../TestCases.HostApp/Issues/Issue22570.xaml  | 22 ++++++++++++
 .../Issues/Issue22570.xaml.cs                 | 36 +++++++++++++++++++
 .../Tests/Issues/Issue22570.cs                | 24 +++++++++++++
 4 files changed, 92 insertions(+), 4 deletions(-)
 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/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
index 9321069b3b89..aaeb1dec6d18 100644
--- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
+++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs
@@ -621,15 +621,21 @@ void PushPage(Page page, bool animated, TaskCompletionSource<bool> completionSou
 			var renderer = (IPlatformViewHandler)page.ToHandler(_shellSection.FindMauiContext());
 
 			var tracker = _context.CreatePageRendererTracker();
-			tracker.ViewController = renderer.ViewController;
+			var pageViewController = renderer.ViewController!;
+			tracker.ViewController = pageViewController;
 			tracker.Page = page;
 
 			_trackers[page] = tracker;
 
-			if (completionSource != null)
-				_completionTasks[renderer.ViewController] = completionSource;
+			var parentTabBar = ParentViewController as UITabBarController;
+			var showsPresentation = parentTabBar == null || ReferenceEquals(parentTabBar.SelectedViewController, this);
+			if (completionSource != null && showsPresentation)
+				_completionTasks[pageViewController] = completionSource;
 
-			PushViewController(renderer.ViewController, animated);
+			PushViewController(pageViewController, animated);
+			
+			if (completionSource != null && !showsPresentation)
+				completionSource.TrySetResult(true);
 		}
 
 		async void SendPoppedOnCompletion(Task popTask)
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..a40476757211
--- /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..8c8fae41b4b8
--- /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("Bar22570", typeof(Issue22570Page));
+		}
+
+		void Button_Clicked(object sender, System.EventArgs e)
+		{
+			_ = GoToAsync("//main/Foo/Bar22570");
+		}
+
+		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..10b100e48adb
--- /dev/null
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue22570.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+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]
+		[Category(UITestCategories.Shell)]
+		public void Issue22570Test()
+		{
+			App.WaitForElement("button");
+			App.Click("button");
+			App.WaitForElement("label");
+		}
+	}
+}