From 45502d6b624e96f41b24764b50515fe57a966d92 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 7 May 2024 10:50:27 -0500
Subject: [PATCH 1/6] Trigger remeasure when constraints on CV changes

---
 .../Adapters/StructuredItemsViewAdapter.cs    |  7 ++-
 .../Handlers/Items/Android/ItemContentView.cs | 61 +++++++++++++------
 .../tests/UITests/Tests/Issues/Issue21967.cs  | 29 +++++++++
 3 files changed, 76 insertions(+), 21 deletions(-)
 create mode 100644 src/Controls/tests/UITests/Tests/Issues/Issue21967.cs

diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
index fbf79a88570b..7039497e8d2b 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
@@ -14,9 +14,14 @@ public class StructuredItemsViewAdapter<TItemsView, TItemsViewSource> : ItemsVie
 	{
 		Size? _size;
 
+		// I'm storing this here because in the children I'm using a weakreference and
+		// I don't want this action to get GC'd
+		Action<Size> _reportMeasure;
+
 		protected internal StructuredItemsViewAdapter(TItemsView itemsView,
 			Func<View, Context, ItemContentView> createItemContentView = null) : base(itemsView, createItemContentView)
 		{
+			_reportMeasure = SetStaticSize;
 			UpdateHasHeader();
 			UpdateHasFooter();
 		}
@@ -98,7 +103,7 @@ protected override void BindTemplatedItemViewHolder(TemplatedItemViewHolder temp
 		{
 			if (ItemsView.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem)
 			{
-				templatedItemViewHolder.Bind(context, ItemsView, SetStaticSize, _size);
+				templatedItemViewHolder.Bind(context, ItemsView, _reportMeasure, _size);
 			}
 			else
 			{
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
index af2a7942e70c..f1551faa69fa 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
@@ -9,8 +9,15 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 {
 	public class ItemContentView : ViewGroup
 	{
-		Size? _size;
-		Action<Size> _reportMeasure;
+		Size? _pixelSize;
+		WeakReference _reportMeasure;
+		int _previousPixelWidth;
+		int _previousPixelHeight;
+
+		Action<Size> ReportMeasure
+		{
+			get => _reportMeasure?.Target as Action<Size>;
+		}
 
 		protected IPlatformViewHandler Content;
 		internal IView View => Content?.VirtualView;
@@ -53,13 +60,13 @@ internal void Recycle()
 			}
 
 			Content = null;
-			_size = null;
+			_pixelSize = null;
 		}
 
 		internal void HandleItemSizingStrategy(Action<Size> reportMeasure, Size? size)
 		{
-			_reportMeasure = reportMeasure;
-			_size = size;
+			_reportMeasure = new WeakReference(reportMeasure);
+			_pixelSize = size;
 		}
 
 		protected override void OnLayout(bool changed, int l, int t, int r, int b)
@@ -83,39 +90,54 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 				return;
 			}
 
+			int pixelWidth = MeasureSpec.GetSize(widthMeasureSpec);
+			int pixelHeight = MeasureSpec.GetSize(heightMeasureSpec);
+			var widthMode = MeasureSpec.GetMode(widthMeasureSpec);
+			var heightMode = MeasureSpec.GetMode(heightMeasureSpec);
+
+			// If the measure changes significantly, we need to invalidate the pixel size
+			// This will happen if the user rotates the device or even just changes the height/width
+			// on the CollectionView itself. 
+			if (pixelWidth != 0 && _previousPixelWidth != pixelWidth)
+			{
+				_pixelSize = null;
+				_previousPixelWidth = pixelWidth;
+			}
+
+			if (pixelHeight != 0 && _previousPixelHeight != pixelHeight)
+			{
+				_pixelSize = null;
+				_previousPixelHeight = pixelHeight;
+			}
+
 			// If we're using ItemSizingStrategy.MeasureFirstItem and now we have a set size, use that
 			// Even though we already know the size we still need to pass the measure through to the children.
-			if (_size is not null)
+			if (_pixelSize is not null)
 			{
-				var w = (int)_size.Value.Width;
-				var h = (int)_size.Value.Height;
+				var w = (int)this.FromPixels(_pixelSize.Value.Width);
+				var h = (int)this.FromPixels(_pixelSize.Value.Height);
 
 				// If the platform childs measure has been invalidated, it's going to still want to
 				// participate in the measure lifecycle in order to update its internal
 				// book keeping.
-				_ = View.Measure
-					(
+				_ = (View.Handler as IPlatformViewHandler)?.MeasureVirtualView(
 						MeasureSpec.MakeMeasureSpec(w, MeasureSpecMode.Exactly),
 						MeasureSpec.MakeMeasureSpec(h, MeasureSpecMode.Exactly)
 					);
 
-				SetMeasuredDimension(w, h);
+				SetMeasuredDimension((int)_pixelSize.Value.Width, (int)_pixelSize.Value.Height);
 				return;
 			}
 
-			int pixelWidth = MeasureSpec.GetSize(widthMeasureSpec);
-			int pixelHeight = MeasureSpec.GetSize(heightMeasureSpec);
-
-			var widthSpec = MeasureSpec.GetMode(widthMeasureSpec) == MeasureSpecMode.Unspecified
+			var width = widthMode == MeasureSpecMode.Unspecified
 				? double.PositiveInfinity
 				: this.FromPixels(pixelWidth);
 
-			var heightSpec = MeasureSpec.GetMode(heightMeasureSpec) == MeasureSpecMode.Unspecified
+			var height = heightMode == MeasureSpecMode.Unspecified
 				? double.PositiveInfinity
 				: this.FromPixels(pixelHeight);
 
-
-			var measure = View.Measure(widthSpec, heightSpec);
+			var measure = View.Measure(width, height);
 
 			if (pixelWidth == 0)
 			{
@@ -127,8 +149,7 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 				pixelHeight = (int)this.ToPixels(measure.Height);
 			}
 
-			_reportMeasure?.Invoke(new Size(pixelWidth, pixelHeight));
-			_reportMeasure = null; // Make sure we only report back the measure once
+			ReportMeasure?.Invoke(new Size(pixelWidth, pixelHeight));
 
 			SetMeasuredDimension(pixelWidth, pixelHeight);
 		}
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
new file mode 100644
index 000000000000..209d6ba72b1b
--- /dev/null
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace Microsoft.Maui.AppiumTests.Issues
+{
+	public class Issue21967 : _IssuesUITest
+	{
+		public Issue21967(TestDevice device) : base(device)
+		{
+		}
+
+		public override string Issue => "CollectionView causes invalid measurements on resize";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void CollectionViewItemsResizeWhenContraintsOnCollectionViewChange()
+		{
+			var largestSize = App.WaitForElement("Item1").GetRect();
+			App.Tap("Resize");
+			var mediumSize = App.WaitForElement("Item1").GetRect();
+			App.Tap("Resize");
+			var smallSize = App.WaitForElement("Item1").GetRect();
+
+            Assert.Greater(largestSize.Width, mediumSize.Width);
+            Assert.Greater(mediumSize.Width, smallSize.Width);
+		}
+	}
+}

From 13d7f843d949ea8b63e60290e6112402e97a901d Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 7 May 2024 11:18:44 -0500
Subject: [PATCH 2/6] - add tests

---
 .../Issues/Issue21967.xaml                    | 50 +++++++++++++++++++
 .../Issues/Issue21967.xaml.cs                 | 27 ++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
 create mode 100644 src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
new file mode 100644
index 000000000000..d5f0a241b58a
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
@@ -0,0 +1,50 @@
+<?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.Issue21967"
+             Title="Issue21967">
+     <Grid
+        RowDefinitions="Auto,Auto,*"
+        RowSpacing="8"
+        Margin="8">
+ 
+        <Label Grid.Row="0" Text="Click the resize button and elements in the CV should resize.">
+        </Label>
+ 
+        <Button
+            Grid.Row="1"
+            Text="Resize"
+            AutomationId="Resize"
+            x:Name="button"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"/>
+ 
+        <CollectionView
+            Grid.Row="2"
+            x:Name="cv"
+            ItemSizingStrategy="MeasureFirstItem">
+ 
+            <CollectionView.ItemsLayout>
+                <GridItemsLayout
+                    Orientation="Vertical"
+                    HorizontalItemSpacing="8"
+                    VerticalItemSpacing="8"
+                    Span="2"/>
+            </CollectionView.ItemsLayout>
+ 
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid BackgroundColor="LightGray">
+                        <Label
+                            Text="{Binding .}"
+                            AutomationId="{Binding .}"
+                            HorizontalOptions="Fill"
+                            VerticalOptions="Fill"/>
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+            
+        </CollectionView>
+ 
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
new file mode 100644
index 000000000000..218f4688ccfd
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using Microsoft.Maui;
+using Microsoft.Maui.Controls;
+using System.Collections.Generic;
+ 
+namespace Maui.Controls.Sample.Issues;
+ 
+[Issue(IssueTracker.Github, 21967, "CollectionView causes invalid measurements on resize", PlatformAffected.Android)]
+public partial class Issue21967 : ContentPage
+{
+    public Issue21967()
+    {
+        InitializeComponent();
+        cv.ItemsSource = new List<string> { "Item1", "Item2", "Item3", "Item4", "Item5" };
+        button.Clicked += (_, _) =>
+        {
+            if (cv.WidthRequest == 200)
+            {
+                cv.WidthRequest = 100;
+            }
+            else
+            {
+                cv.WidthRequest = 200;
+            }
+        };
+    }
+}
\ No newline at end of file

From 262601410e6a14c9a6c429238d76d84190bd60b5 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 7 May 2024 11:55:06 -0500
Subject: [PATCH 3/6] - add additional code so we really only measure once

---
 .../Adapters/StructuredItemsViewAdapter.cs    |  8 +++++
 .../Handlers/Items/Android/ItemContentView.cs | 36 +++++++++++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
index 7039497e8d2b..d78135847de9 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/Adapters/StructuredItemsViewAdapter.cs
@@ -17,11 +17,14 @@ public class StructuredItemsViewAdapter<TItemsView, TItemsViewSource> : ItemsVie
 		// I'm storing this here because in the children I'm using a weakreference and
 		// I don't want this action to get GC'd
 		Action<Size> _reportMeasure;
+		Func<Size?> _retrieveStaticSize;
 
 		protected internal StructuredItemsViewAdapter(TItemsView itemsView,
 			Func<View, Context, ItemContentView> createItemContentView = null) : base(itemsView, createItemContentView)
 		{
 			_reportMeasure = SetStaticSize;
+			_retrieveStaticSize = () => _size ?? null;
+
 			UpdateHasHeader();
 			UpdateHasFooter();
 		}
@@ -104,6 +107,11 @@ protected override void BindTemplatedItemViewHolder(TemplatedItemViewHolder temp
 			if (ItemsView.ItemSizingStrategy == ItemSizingStrategy.MeasureFirstItem)
 			{
 				templatedItemViewHolder.Bind(context, ItemsView, _reportMeasure, _size);
+
+				if (templatedItemViewHolder.ItemView is ItemContentView itemContentView)
+				{
+					itemContentView.RetrieveStaticSize = _retrieveStaticSize;
+				}
 			}
 			else
 			{
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
index f1551faa69fa..2aa0a1c31914 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
@@ -11,8 +11,9 @@ public class ItemContentView : ViewGroup
 	{
 		Size? _pixelSize;
 		WeakReference _reportMeasure;
-		int _previousPixelWidth;
-		int _previousPixelHeight;
+		WeakReference _retrieveStaticSize;
+		int _previousPixelWidth = -1;
+		int _previousPixelHeight = -1;
 
 		Action<Size> ReportMeasure
 		{
@@ -30,6 +31,12 @@ public ItemContentView(Context context) : base(context)
 
 		AView PlatformView => Content?.ContainerView ?? Content?.PlatformView;
 
+		internal Func<Size?> RetrieveStaticSize 
+		{ 
+			get => _retrieveStaticSize?.Target as Func<Size?>;
+			set => _retrieveStaticSize = new WeakReference(value);
+		}
+
 		internal void RealizeContent(View view, ItemsView itemsView)
 		{
 			Content = CreateHandler(view, itemsView);
@@ -61,6 +68,9 @@ internal void Recycle()
 
 			Content = null;
 			_pixelSize = null;
+			_reportMeasure = null;
+			_previousPixelWidth = -1;
+			_previousPixelHeight = -1;
 		}
 
 		internal void HandleItemSizingStrategy(Action<Size> reportMeasure, Size? size)
@@ -95,17 +105,37 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 			var widthMode = MeasureSpec.GetMode(widthMeasureSpec);
 			var heightMode = MeasureSpec.GetMode(heightMeasureSpec);
 
+			// This checks to see if a static size has been set already on the adapter
+			// The problem is that HandleItemSizingStrategy(Action<Size> reportMeasure, Size? size) 
+			// is called during "Bind" and then measure is called on all visible cells after that
+			// the result of this is that every single cell does an individual measure opposed to just using
+			// the first cell to set the size.			
+			_pixelSize = _pixelSize ?? RetrieveStaticSize?.Invoke();
+
 			// If the measure changes significantly, we need to invalidate the pixel size
 			// This will happen if the user rotates the device or even just changes the height/width
 			// on the CollectionView itself. 
 			if (pixelWidth != 0 && _previousPixelWidth != pixelWidth)
 			{
-				_pixelSize = null;
+				// We only need to worry about clearing pixel size if we've
+				// already made a first pass
+				if (_previousPixelWidth != -1)
+				{
+					_pixelSize = null;
+				}
+
 				_previousPixelWidth = pixelWidth;
 			}
 
 			if (pixelHeight != 0 && _previousPixelHeight != pixelHeight)
 			{
+				// We only need to worry about clearing pixel size if we've
+				// already made a first pass
+				if (_previousPixelHeight != -1)
+				{
+					_pixelSize = null;
+				}
+
 				_pixelSize = null;
 				_previousPixelHeight = pixelHeight;
 			}

From 9b9b85f8d1bb5da28f2cf2e8721a2a4ac0ca111c Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 7 May 2024 13:04:02 -0500
Subject: [PATCH 4/6] - make sure we only use the measure for the first item

---
 .../Handlers/Items/Android/ItemContentView.cs | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
index 2aa0a1c31914..568c683521b7 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
@@ -109,34 +109,55 @@ protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 			// The problem is that HandleItemSizingStrategy(Action<Size> reportMeasure, Size? size) 
 			// is called during "Bind" and then measure is called on all visible cells after that
 			// the result of this is that every single cell does an individual measure opposed to just using
-			// the first cell to set the size.			
-			_pixelSize = _pixelSize ?? RetrieveStaticSize?.Invoke();
+			// the first cell to set the size.
 
-			// If the measure changes significantly, we need to invalidate the pixel size
-			// This will happen if the user rotates the device or even just changes the height/width
-			// on the CollectionView itself. 
-			if (pixelWidth != 0 && _previousPixelWidth != pixelWidth)
+			var possibleNewSize = RetrieveStaticSize?.Invoke();
+
+			// This means a different cell has already set our new size
+			// so let's just use that instead of perform our own speculative measure
+			if (possibleNewSize is not null && 
+				_pixelSize is not null &&
+				!_pixelSize.Equals(possibleNewSize))
+			{
+				_pixelSize = possibleNewSize;
+			}
+			else
 			{
-				// We only need to worry about clearing pixel size if we've
-				// already made a first pass
-				if (_previousPixelWidth != -1)
+				_pixelSize = _pixelSize ?? possibleNewSize;
+
+				// If the measure changes significantly, we need to invalidate the pixel size
+				// This will happen if the user rotates the device or even just changes the height/width
+				// on the CollectionView itself. 
+				if (pixelWidth != 0 && _previousPixelWidth != pixelWidth)
+				{
+					// We only need to worry about clearing pixel size if we've
+					// already made a first pass
+					if (_previousPixelWidth != -1)
+					{
+						_pixelSize = null;
+					}
+				}
+
+				if (pixelHeight != 0 && _previousPixelHeight != pixelHeight)
 				{
+					// We only need to worry about clearing pixel size if we've
+					// already made a first pass
+					if (_previousPixelHeight != -1)
+					{
+						_pixelSize = null;
+					}
+
 					_pixelSize = null;
 				}
+			}
 
+			if (pixelWidth != 0)
+			{
 				_previousPixelWidth = pixelWidth;
 			}
 
-			if (pixelHeight != 0 && _previousPixelHeight != pixelHeight)
+			if (pixelHeight != 0)
 			{
-				// We only need to worry about clearing pixel size if we've
-				// already made a first pass
-				if (_previousPixelHeight != -1)
-				{
-					_pixelSize = null;
-				}
-
-				_pixelSize = null;
 				_previousPixelHeight = pixelHeight;
 			}
 

From 563706abf192721c42baff45829ca90bda78f024 Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Tue, 7 May 2024 14:12:16 -0500
Subject: [PATCH 5/6] - add test validating first item measured

---
 .../Issues/Issue21967.xaml                    |  4 ++--
 .../Issues/Issue21967.xaml.cs                 | 21 +++++++++++++++++--
 .../Handlers/Items/Android/ItemContentView.cs |  9 ++++++--
 .../tests/UITests/Tests/Issues/Issue21967.cs  | 11 +++++++++-
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
index d5f0a241b58a..34cd7be0d700 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
@@ -36,8 +36,8 @@
                 <DataTemplate>
                     <Grid BackgroundColor="LightGray">
                         <Label
-                            Text="{Binding .}"
-                            AutomationId="{Binding .}"
+                            Text="{Binding Text}"
+                            AutomationId="{Binding AutomationId}"
                             HorizontalOptions="Fill"
                             VerticalOptions="Fill"/>
                     </Grid>
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
index 218f4688ccfd..fcb60b210204 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
@@ -2,16 +2,33 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using System.Collections.Generic;
- 
+using System.Linq;
+
 namespace Maui.Controls.Sample.Issues;
  
 [Issue(IssueTracker.Github, 21967, "CollectionView causes invalid measurements on resize", PlatformAffected.Android)]
 public partial class Issue21967 : ContentPage
 {
+	public readonly record struct Data(string Text, string AutomationId);
     public Issue21967()
     {
         InitializeComponent();
-        cv.ItemsSource = new List<string> { "Item1", "Item2", "Item3", "Item4", "Item5" };
+        cv.ItemsSource = 
+			new List<string> { "Item1", "Item2", "Item3", "Item4", "Item5" }
+			.Select((x, i) => 
+			{
+				string text = x;
+
+				if (i == 1)
+				{
+					// Generate long text that would measure really big to ensure everything stays measured the
+					text = Enumerable.Range(0,1000).Select(x => x.ToString()).Aggregate((x, y) => x + " " + y);
+				}
+				return new Data(text, x);
+			})
+			.ToList();
+
+		
         button.Clicked += (_, _) =>
         {
             if (cv.WidthRequest == 200)
diff --git a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
index 568c683521b7..fbfed96fa581 100644
--- a/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
+++ b/src/Controls/src/Core/Handlers/Items/Android/ItemContentView.cs
@@ -128,7 +128,11 @@ _pixelSize is not null &&
 				// If the measure changes significantly, we need to invalidate the pixel size
 				// This will happen if the user rotates the device or even just changes the height/width
 				// on the CollectionView itself. 
-				if (pixelWidth != 0 && _previousPixelWidth != pixelWidth)
+				// The Abs comparison I think is currently just a workaround for this
+				// https://github.com/dotnet/maui/issues/22271
+				// Once we fix 22271 I don't think we need this
+				// I'm also curious if we would still need this https://github.com/dotnet/maui/pull/21140
+				if (pixelWidth != 0 && Math.Abs(_previousPixelWidth - pixelWidth) > 1)
 				{
 					// We only need to worry about clearing pixel size if we've
 					// already made a first pass
@@ -138,7 +142,8 @@ _pixelSize is not null &&
 					}
 				}
 
-				if (pixelHeight != 0 && _previousPixelHeight != pixelHeight)
+
+				if (pixelHeight != 0 && Math.Abs(_previousPixelHeight - pixelHeight) > 1)
 				{
 					// We only need to worry about clearing pixel size if we've
 					// already made a first pass
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
index 209d6ba72b1b..e69afd15e5f4 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
@@ -25,5 +25,14 @@ public void CollectionViewItemsResizeWhenContraintsOnCollectionViewChange()
             Assert.Greater(largestSize.Width, mediumSize.Width);
             Assert.Greater(mediumSize.Width, smallSize.Width);
 		}
+
+        
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void CollectionViewFirstItemCorrectlySetsTheMeasure()
+		{
+			var itemSize = App.WaitForElement("Item1").GetRect();
+            Assert.Greater(200, itemSize.Height);
+		}
 	}
-}
+}
\ No newline at end of file

From 5cba881b6315652d80222ee333b7b160504e3d4b Mon Sep 17 00:00:00 2001
From: Shane Neuville <shneuvil@microsoft.com>
Date: Wed, 8 May 2024 11:17:41 -0500
Subject: [PATCH 6/6] - add additional tests

---
 .../Issues/Issue21967.xaml                    | 12 ++++++--
 .../Issues/Issue21967.xaml.cs                 |  5 ++++
 .../tests/UITests/Tests/Issues/Issue21967.cs  | 28 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
index 34cd7be0d700..dd113c95fb00 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml
@@ -4,7 +4,7 @@
              x:Class="Maui.Controls.Sample.Issues.Issue21967"
              Title="Issue21967">
      <Grid
-        RowDefinitions="Auto,Auto,*"
+        RowDefinitions="Auto,Auto,Auto,*"
         RowSpacing="8"
         Margin="8">
  
@@ -13,6 +13,14 @@
  
         <Button
             Grid.Row="1"
+            Text="Set to Full Size"
+            AutomationId="FullSize"
+            x:Name="buttonFullSize"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"/>
+ 
+        <Button
+            Grid.Row="2"
             Text="Resize"
             AutomationId="Resize"
             x:Name="button"
@@ -20,7 +28,7 @@
             VerticalOptions="Center"/>
  
         <CollectionView
-            Grid.Row="2"
+            Grid.Row="3"
             x:Name="cv"
             ItemSizingStrategy="MeasureFirstItem">
  
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
index fcb60b210204..dab9573ca5eb 100644
--- a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
+++ b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue21967.xaml.cs
@@ -40,5 +40,10 @@ public Issue21967()
                 cv.WidthRequest = 200;
             }
         };
+
+        buttonFullSize.Clicked += (_, _) =>
+        {
+            cv.WidthRequest = Microsoft.Maui.Primitives.Dimension.Unset;
+        };
     }
 }
\ No newline at end of file
diff --git a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
index e69afd15e5f4..5572789807f2 100644
--- a/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
+++ b/src/Controls/tests/UITests/Tests/Issues/Issue21967.cs
@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using OpenQA.Selenium;
 using UITest.Appium;
 using UITest.Core;
 
@@ -25,7 +26,6 @@ public void CollectionViewItemsResizeWhenContraintsOnCollectionViewChange()
             Assert.Greater(largestSize.Width, mediumSize.Width);
             Assert.Greater(mediumSize.Width, smallSize.Width);
 		}
-
         
 		[Test]
 		[Category(UITestCategories.CollectionView)]
@@ -34,5 +34,31 @@ public void CollectionViewFirstItemCorrectlySetsTheMeasure()
 			var itemSize = App.WaitForElement("Item1").GetRect();
             Assert.Greater(200, itemSize.Height);
 		}
+        
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void CollectionViewWorksWhenRotatingDevice()
+		{
+			this.IgnoreIfPlatforms(new TestDevice[] { TestDevice.Mac, TestDevice.Windows });
+
+			try
+			{
+				App.WaitForElement("FullSize");
+				App.Tap("FullSize");
+				App.SetOrientationPortrait();
+				var itemSizePortrait = App.WaitForElement("Item1").GetRect();
+				App.SetOrientationLandscape();
+				var itemSizeLandscape = App.WaitForElement("Item1").GetRect();
+				App.SetOrientationPortrait();
+				var itemSizePortrait2 = App.WaitForElement("Item1").GetRect();
+
+				Assert.Greater(itemSizeLandscape.Width, itemSizePortrait.Width);
+				Assert.AreEqual(itemSizePortrait2.Width, itemSizePortrait.Width);
+			}
+			finally
+			{
+				App.SetOrientationPortrait();
+			}
+		}
 	}
 }
\ No newline at end of file