From e1b760fb15655de38cb69f049bfc2cc0210b7cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Wed, 16 Nov 2022 14:47:36 +0100
Subject: [PATCH] Fix issue using ToolbarItems with TitleView on iOS 16
 (#15604)

Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com>
---
 .../Issue15565.cs                             | 103 ++++++++++++++++++
 ...rin.Forms.Controls.Issues.Shared.projitems |   1 +
 2 files changed, 104 insertions(+)
 create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15565.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15565.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15565.cs
new file mode 100644
index 00000000000..d67616711fe
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue15565.cs
@@ -0,0 +1,103 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+#if UITEST
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 15565, "[Bug] Shell TitleView and ToolBarItems rendering strange display on iOS 16",
+		PlatformAffected.iOS)]
+#if UITEST
+	[NUnit.Framework.Category(UITestCategories.Shell)]
+	[NUnit.Framework.Category(UITestCategories.TitleView)]
+#endif
+	public class Issue15565 : TestShell
+	{
+		protected override void Init()
+		{
+			AddTopTab(createContentPage("title 1"), "page 1");
+			AddTopTab(createContentPage("title 2"), "page 2");
+			AddTopTab(createContentPage("title 3"), "page 3");
+
+			static ContentPage createContentPage(string titleView)
+			{
+				Label safeArea = new Label();
+				ContentPage page = new ContentPage()
+				{
+					Content = new StackLayout()
+					{
+						Children =
+						{
+							new Label()
+							{
+								Text = "If the TitleView is not visible at the same time as the ToolbarItems, the test has failed.",
+								AutomationId = "Instructions"
+							},
+							safeArea
+						}
+					}
+				};
+
+				page.ToolbarItems.Add(new ToolbarItem() { Text = "Item 1" });
+				page.ToolbarItems.Add(new ToolbarItem() { Text = "Item 2" });
+
+				if (!string.IsNullOrWhiteSpace(titleView))
+				{
+					SetTitleView(page,
+						new Grid()
+						{
+							BackgroundColor = Color.Red,
+							AutomationId = "TitleViewId",
+							Children = { new Label() { Text = titleView, VerticalTextAlignment = TextAlignment.End } }
+						});
+				}
+
+				return page;
+			}
+		}
+
+
+#if UITEST
+
+		[Test]
+		public void TitleViewHeightIsNotZero()
+		{
+			var titleView = RunningApp.WaitForElement("TitleViewId")[0].Rect;
+			var topTab = RunningApp.WaitForElement("page 1")[0].Rect;
+
+			var titleViewBottom = titleView.Y + titleView.Height;
+			var topTabTop = topTab.Y;
+
+			Assert.GreaterOrEqual(topTabTop, titleViewBottom, "Title View is incorrectly positioned in iOS 16");
+		}
+
+		[Test]
+		public void ToolbarItemsWithTitleViewAreRendering()
+		{
+			RunningApp.WaitForElement("Item 1");
+			RunningApp.WaitForElement("Item 3");
+		}
+
+		[Test]
+		public void NoDuplicateTitleViews()
+		{
+			var titleView = RunningApp.WaitForElement("TitleViewId");
+
+			Assert.AreEqual(1, titleView.Length);
+
+			RunningApp.Tap("page 1");
+			RunningApp.Tap("page 2");
+			RunningApp.Tap("page 3");
+
+			titleView = RunningApp.WaitForElement("TitleViewId");
+
+			Assert.AreEqual(1, titleView.Length);
+		}
+#endif
+
+	}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 52dd536bc09..ae9e1c4915b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -55,6 +55,7 @@
       <DependentUpon>Issue14801.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue15368.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue15565.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue15542.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue8606.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue15066.cs" />