[iOS] Empty View Overlapping Header in CollectionView with CollectionViewHandler2

src/Controls/src/Core/Handlers/Items2/iOS/ItemsViewController2.cs

@@ -528,11 +528,11 @@ void TearDownEmptyView()
 			_emptyViewFormsElement = null;
 		}
 
-		void LayoutEmptyView()
+		virtual internal CGRect LayoutEmptyView()
 		{
 			if (!_initialized || _emptyUIView == null || _emptyUIView.Superview == null)
 			{
-				return;
+				return CGRect.Empty;
 			}
 
 			var frame = DetermineEmptyViewFrame();
@@ -541,6 +541,8 @@ void LayoutEmptyView()
 
 			if (_emptyViewFormsElement != null && ((IElementController)ItemsView).LogicalChildren.IndexOf(_emptyViewFormsElement) != -1)
 				_emptyViewFormsElement.Layout(frame.ToRectangle());
+
+			return frame;
 		}
 
 		internal protected virtual void UpdateVisibility()

src/Controls/src/Core/Handlers/Items2/iOS/StructuredItemsViewController2.cs

@@ -161,6 +161,22 @@ string DetermineViewReuseId(DataTemplate template, object item)
 				: VerticalSupplementaryView2.ReuseId;
 		}
 
+		internal override CGRect LayoutEmptyView()
+		{
+			var emptyViewFrame = base.LayoutEmptyView();
+			var footerView = CollectionView.ViewWithTag(FooterTag);
+
+			if (footerView is not null)
+			{
+				if (emptyViewFrame.Height > 0)
+					footerView.Frame = new CGRect(footerView.Frame.X, emptyViewFrame.Bottom, footerView.Frame.Width, footerView.Frame.Height);
+				else
+					footerView.Frame = new CGRect(footerView.Frame.X, CollectionView.ContentSize.Height - footerView.Frame.Height, footerView.Frame.Width, footerView.Frame.Height);
+			}
+
+			return emptyViewFrame;
+		}
+
 		protected override CGRect DetermineEmptyViewFrame()
 		{
 			nfloat headerHeight = 0;
@@ -175,7 +191,7 @@ protected override CGRect DetermineEmptyViewFrame()
 			if (footerView != null)
 				footerHeight = footerView.Frame.Height;
 
-			return new CGRect(CollectionView.Frame.X, CollectionView.Frame.Y, CollectionView.Frame.Width,
+			return new CGRect(CollectionView.Frame.X, CollectionView.Frame.Y + headerHeight, CollectionView.Frame.Width,
 				Math.Abs(CollectionView.Frame.Height - (headerHeight + footerHeight)));
 		}
 

src/Controls/tests/TestCases.HostApp/Issues/Issue25606.xaml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.Controls.Sample.Issues.Issue25606">
+    <VerticalStackLayout>
+        <CollectionView VerticalOptions="Fill">
+
+            <CollectionView.Header>
+                <ContentView HeightRequest="200"
+                             BackgroundColor="Red">
+                    <Label AutomationId="Header"
+                           Text="Header"/>
+                </ContentView>
+            </CollectionView.Header>
+
+            <CollectionView.EmptyView>
+                <ContentView
+                    BackgroundColor="Blue">
+                    <Label Text="EmptyView"/>
+                </ContentView>
+            </CollectionView.EmptyView>
+
+            <CollectionView.Footer>
+                <ContentView HeightRequest="200"
+                             BackgroundColor="Green">
+                    <Label Text="Footer"/>
+                </ContentView>
+            </CollectionView.Footer>
+        </CollectionView>
+    </VerticalStackLayout>
+</ContentPage>

src/Controls/tests/TestCases.HostApp/Issues/Issue25606.xaml.cs

@@ -0,0 +1,11 @@
+namespace Maui.Controls.Sample.Issues
+{
+	[Issue(IssueTracker.Github, "25606", "Empty View Overlapping Header in CollectionView with CollectionViewHandler2", PlatformAffected.iOS)]
+	public partial class Issue25606 : ContentPage
+	{
+		public Issue25606()
+		{
+			InitializeComponent();
+		}
+	}
+}

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25606.cs

@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues
+{
+	public class Issue25606 : _IssuesUITest
+	{
+		public Issue25606(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Empty View Overlapping Header in CollectionView with CollectionViewHandler2";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void HeaderShouldNotBeCoveredByEmptyView()
+		{
+			App.WaitForElement("Header");
+		}
+	}
+}