Added UiTests (dotnet#12429)

src/Controls/src/Core/Handlers/Items/iOS/StructuredItemsViewController.cs

@@ -46,6 +46,16 @@ protected override void Dispose(bool disposing)
 					_footerViewFormsElement.MeasureInvalidated -= OnFormsElementMeasureInvalidated;
 				}
 
+				if (_headerUIView is MauiView hv)
+				{
+					hv.LayoutChanged -= HeaderViewLayoutChanged;
+				}
+
+				if (_footerUIView is MauiView fv)
+				{
+					fv.LayoutChanged -= FooterViewLayoutChanged;
+				}
+
 				_headerUIView = null;
 				_headerViewFormsElement = null;
 				_footerUIView = null;
@@ -105,15 +115,26 @@ internal void UpdateFooterView()
 			UpdateSubview(ItemsView?.Footer, ItemsView?.FooterTemplate, FooterTag,
 				ref _footerUIView, ref _footerViewFormsElement);
 			UpdateHeaderFooterPosition();
+
+			if (_footerUIView is MauiView mv)
+			{
+				mv.LayoutChanged += FooterViewLayoutChanged;
+			}
 		}
 
 		internal void UpdateHeaderView()
 		{
 			UpdateSubview(ItemsView?.Header, ItemsView?.HeaderTemplate, HeaderTag,
 				ref _headerUIView, ref _headerViewFormsElement);
 			UpdateHeaderFooterPosition();
+
+			if(_headerUIView is MauiView mv)
+			{
+				mv.LayoutChanged += HeaderViewLayoutChanged;
+			}
 		}
 
+
 		internal void UpdateSubview(object view, DataTemplate viewTemplate, nint viewTag, ref UIView uiView, ref VisualElement formsElement)
 		{
 			uiView?.RemoveFromSuperview();
@@ -239,5 +260,15 @@ internal void UpdateLayoutMeasurements()
 			if (_footerViewFormsElement != null)
 				HandleFormsElementMeasureInvalidated(_footerViewFormsElement);
 		}
+
+		void HeaderViewLayoutChanged(object sender, EventArgs e)
+		{
+			HandleFormsElementMeasureInvalidated(_headerViewFormsElement);
+		}
+
+		void FooterViewLayoutChanged(object sender, EventArgs e)
+		{
+			HandleFormsElementMeasureInvalidated(_footerViewFormsElement);
+		}
 	}
 }

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

@@ -0,0 +1,43 @@
+<?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.Issue12429"
+             x:Name="Self"
+             Title="Issue12429">
+    <Grid RowDefinitions="Auto,*">
+        <HorizontalStackLayout Grid.Row="0">
+            <Button
+                Command="{Binding AddCommand}"
+                HorizontalOptions="Center"
+                AutomationId="button"
+                Text="Add" />
+        </HorizontalStackLayout>
+
+        <CollectionView
+            Grid.Row="1"
+            ItemsSource="{Binding ItemList}">
+
+            <CollectionView.Header>
+                <VerticalStackLayout>
+                    <VerticalStackLayout BindableLayout.ItemsSource="{Binding BindingContext.ItemListHeader, Source={x:Reference Self}}">
+                        <BindableLayout.ItemTemplate>
+                            <DataTemplate>
+                                <Label Padding="10" Text="{Binding .}" />
+                            </DataTemplate>
+                        </BindableLayout.ItemTemplate>
+                    </VerticalStackLayout>
+                    <BoxView
+                        Margin="0,5"
+                        HeightRequest="2"
+                        Color="Black" />
+                </VerticalStackLayout>
+            </CollectionView.Header>
+
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Label Padding="10" Text="{Binding .}" />
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+        </CollectionView>
+    </Grid>
+</ContentPage>

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

@@ -0,0 +1,24 @@
+using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Xaml;
+
+namespace Maui.Controls.Sample.Issues;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+[Issue(IssueTracker.Github, 12429, "[iOS] CollectionView Items display issue when Header is resized", PlatformAffected.iOS)]
+
+public partial class Issue12429 : ContentPage
+{
+	public ObservableCollection<string> ItemList { get; }
+	public ObservableCollection<string> ItemListHeader { get; }
+
+	public Command AddCommand => new(() => ItemListHeader.Add($"HeaderItem{ItemListHeader.Count + 1}"));
+
+	public Issue12429()
+	{
+		InitializeComponent();
+		ItemList = new() { "Item1", "Item2", "Itme3" };
+		ItemListHeader = new() { "HeaderItem1" };
+		BindingContext = this;
+	}
+}

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

@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.TestCases.Tests.Issues;
+
+public class Issue12429 : _IssuesUITest
+{
+	public override string Issue => "[iOS] CollectionView Items display issue when Header is resized";
+
+	public Issue12429(TestDevice device) : base(device)
+	{ }
+
+	[Test]
+	[Category(UITestCategories.CollectionView)]
+	public async Task HeaderShouldNotCollapseWithItems()
+	{
+		App.WaitForElement("button");
+		App.Click("button");
+		App.Click("button");
+		App.Click("button");
+
+		await Task.Delay(500);
+
+		//The test passes of header has 4 elements that don't overlap with the collection view's items
+		VerifyScreenshot();
+	}
+}

src/Core/src/Platform/iOS/MauiView.cs

@@ -137,6 +137,7 @@ public override void LayoutSubviews()
 			}
 
 			CrossPlatformArrange(bounds);
+			LayoutChanged?.Invoke(this, EventArgs.Empty);
 		}
 
 		public override void SetNeedsLayout()
@@ -198,5 +199,8 @@ public override void MovedToWindow()
 			_movedToWindow?.Invoke(this, EventArgs.Empty);
 			TryToInvalidateSuperView(true);
 		}
+
+		[UnconditionalSuppressMessage("Memory", "MEM0001", Justification = IUIViewLifeCycleEvents.UnconditionalSuppressMessage)]
+		internal event EventHandler? LayoutChanged;
 	}
 }