Ignore SafeArea on templates and shell flyout item templates (#20403)

* Ignore SafeArea on templates and shell flyout item templates * - add delay for compat test
dotnet · Feb 7, 2024 · f6d4b94 · f6d4b94
1 parent 67829ee
commit f6d4b94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/HeaderFooterShellFlyout.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/HeaderFooterShellFlyout.cs
@@ -137,17 +137,23 @@ protected override void Init()
 					var headerLabel = (VisualElement)FlyoutHeader;
 					var footerLabel = (VisualElement)FlyoutFooter;
 					headerLabel.BackgroundColor = Colors.LightBlue;
-					footerLabel.BackgroundColor = Colors.LightBlue;
+
+					if (footerLabel is not null)
+						footerLabel.BackgroundColor = Colors.LightBlue;
 
 					if (headerLabel.HeightRequest == 60)
 					{
 						headerLabel.HeightRequest = 200;
-						footerLabel.HeightRequest = 200;
+
+						if (footerLabel is not null)
+							footerLabel.HeightRequest = 200;
 					}
 					else
 					{
 						headerLabel.HeightRequest = 60;
-						footerLabel.HeightRequest = 60;
+
+						if (footerLabel is not null)
+							footerLabel.HeightRequest = 60;
 					}
 				}),
 				AutomationId = "ResizeHeaderFooter"
@@ -167,8 +173,10 @@ protected override void Init()
 								Margin = 0,
 								Children =
 								{
-								new Label() { Text = "Header View" }
-								}
+									new Label() { Text = "Header View" }
+								},
+								BackgroundColor = Colors.Purple,
+								IgnoreSafeArea = true
 							};
 
 						FlyoutHeaderTemplate = null;
@@ -184,10 +192,13 @@ protected override void Init()
 
 #if __IOS__
 		[Test]
-		public void FlyoutHeaderWithZeroMarginShouldHaveNoY()
+		public async Task FlyoutHeaderWithZeroMarginShouldHaveNoY()
 		{
 			RunningApp.WaitForElement("PageLoaded");
 			this.TapInFlyout("ZeroMarginHeader", makeSureFlyoutStaysOpen: true);
+			// Adding this to just really make sure layout is finished
+			// Once we move this to appium we can remove this
+			await Task.Delay(1000);
 			var layout = RunningApp.WaitForElement("ZeroMarginLayout")[0].Rect.Y;
 			Assert.AreEqual(0, layout);
 		}

diff --git a/src/Controls/src/Core/Shell/BaseShellItem.cs b/src/Controls/src/Core/Shell/BaseShellItem.cs
@@ -343,7 +343,10 @@ internal static DataTemplate CreateDefaultFlyoutItemCell(string textBinding, str
 		{
 			return new DataTemplate(() =>
 			{
-				var grid = new Grid();
+				var grid = new Grid()
+				{
+					IgnoreSafeArea = true
+				};
 
 				if (DeviceInfo.Platform == DevicePlatform.WinUI)
 					grid.ColumnSpacing = grid.RowSpacing = 0;