[2025/03/24] Candidate - In Flight Branch

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs

@@ -610,6 +610,7 @@ public override void PushViewController(UIViewController viewController, bool an
 
 		public override UIViewController PopViewController(bool animated)
 		{
+			_popRequested = true;
 			_pendingViewControllers = null;
 			if (IsInMoreTab && ParentViewController is UITabBarController tabBarController)
 			{

src/Controls/src/Core/Compatibility/iOS/Extensions/ToolbarItemExtensions.cs

@@ -114,10 +114,6 @@ void UpdateIconAndStyle(ToolbarItem item)
 					{
 						Image = result?.Value;
 						Style = UIBarButtonItemStyle.Plain;
-						if (item.IconImageSource is FontImageSource fontImageSource && fontImageSource.Color is not null)
-						{
-							TintColor = fontImageSource.Color.ToPlatform();
-						}
 					});
 				}
 			}

src/Controls/src/Core/Handlers/Items/Android/MauiCarouselRecyclerView.cs

@@ -271,6 +271,24 @@ void CollectionItemsSourceChanged(object sender, System.Collections.Specialized.
 				return;
 			}
 
+			// While Modifying the collection we should consider the ItemsUpdatingScrollMode to update the position
+			if (Carousel.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepLastItemInView)
+			{
+				if (count == 0)
+				{
+					carouselPosition = 0;
+				}
+				else
+				{
+					carouselPosition = count - 1;
+				}
+
+			}
+			else if (Carousel.ItemsUpdatingScrollMode == ItemsUpdatingScrollMode.KeepItemsInView)
+			{
+				carouselPosition = 0;
+			}
+
 			Carousel.
 				Handler.
 				MauiContext.

src/Controls/src/Core/Handlers/Items/ItemsViewHandler.Windows.cs

@@ -58,6 +58,7 @@ protected override void DisconnectHandler(ListViewBase platformView)
 		{
 			VirtualView.ScrollToRequested -= ScrollToRequested;
 			CleanUpCollectionViewSource(platformView);
+			_formsEmptyView?.Handler?.DisconnectHandler();
 			base.DisconnectHandler(platformView);
 		}
 

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

@@ -334,14 +334,17 @@ void CollectionViewUpdating(object sender, NotifyCollectionChangedEventArgs e)
 		[UnconditionalSuppressMessage("Memory", "MEM0003", Justification = "Proven safe in test: MemoryTests.HandlerDoesNotLeak")]
 		void CollectionViewUpdated(object sender, NotifyCollectionChangedEventArgs e)
 		{
+			int targetPosition;
 			if (_positionAfterUpdate == -1)
 			{
 				return;
 			}
 
 			_gotoPosition = -1;
 
-			var targetPosition = _positionAfterUpdate;
+			// We need to update the position while modifying the collection.
+			targetPosition = GetTargetPosition();
+
 			_positionAfterUpdate = -1;
 
 			SetPosition(targetPosition);
@@ -354,6 +357,22 @@ int GetPositionWhenAddingItems(int carouselPosition, int currentItemPosition)
 			return currentItemPosition != -1 ? currentItemPosition : carouselPosition;
 		}
 
+		private int GetTargetPosition()
+		{
+
+			if (ItemsSource.ItemCount == 0)
+			{
+				return 0;
+			}
+
+			return ItemsView.ItemsUpdatingScrollMode switch
+			{
+				ItemsUpdatingScrollMode.KeepItemsInView => 0,
+				ItemsUpdatingScrollMode.KeepLastItemInView => ItemsSource.ItemCount - 1,
+				_ => _positionAfterUpdate
+			};
+		}
+
 		int GetPositionWhenResetItems()
 		{
 			//If we are reseting the collection Position should go to 0

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

@@ -164,14 +164,7 @@ void CollectionChanged(NotifyCollectionChangedEventArgs args)
 
 			// Force UICollectionView to get the internal accounting straight
 			var collectionView = controller.CollectionView;
-			if (!collectionView.Hidden)
-			{
-				var numberOfSections = collectionView.NumberOfSections();
-				for (int section = 0; section < numberOfSections; section++)
-				{
-					collectionView.NumberOfItemsInSection(section);
-				}
-			}
+			UpdateSection(collectionView);
 
 			switch (args.Action)
 			{
@@ -193,8 +186,23 @@ void CollectionChanged(NotifyCollectionChangedEventArgs args)
 				default:
 					throw new ArgumentOutOfRangeException();
 			}
+
+			// Calculate section and item counts after processing changes  
+			// to ensure UICollectionView reflects the updated state 
+			UpdateSection(collectionView);
 		}
 
+		void UpdateSection(UICollectionView collectionView)
+		{
+			if (!collectionView.Hidden)
+			{
+				var numberOfSections = collectionView.NumberOfSections();
+				for (int section = 0; section < numberOfSections; section++)
+				{
+					collectionView.NumberOfItemsInSection(section);
+				}
+			}
+		}
 		void Reload(bool collectionWasReset = false)
 		{
 			ResetGroupTracking();

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

@@ -254,14 +254,17 @@ void CollectionViewUpdating(object sender, NotifyCollectionChangedEventArgs e)
 		[UnconditionalSuppressMessage("Memory", "MEM0003", Justification = "Proven safe in test: MemoryTests.HandlerDoesNotLeak")]
 		void CollectionViewUpdated(object sender, NotifyCollectionChangedEventArgs e)
 		{
+			int targetPosition;
 			if (_positionAfterUpdate == -1)
 			{
 				return;
 			}
 
 			//_gotoPosition = -1;
 
-			var targetPosition = _positionAfterUpdate;
+			// We need to update the position while modifying the collection.
+			targetPosition = GetTargetPosition();
+
 			_positionAfterUpdate = -1;
 
 			SetPosition(targetPosition);
@@ -291,6 +294,21 @@ int GetPositionWhenAddingItems(int carouselPosition, int currentItemPosition)
 			return currentItemPosition != -1 ? currentItemPosition : carouselPosition;
 		}
 
+		private int GetTargetPosition()
+		{
+			if (ItemsSource.ItemCount == 0)
+			{
+				return 0;
+			}
+
+			return ItemsView.ItemsUpdatingScrollMode switch
+			{
+				ItemsUpdatingScrollMode.KeepItemsInView => 0,
+				ItemsUpdatingScrollMode.KeepLastItemInView => ItemsSource.ItemCount - 1,
+				_ => _positionAfterUpdate
+			};
+		}
+
 		int GetPositionWhenResetItems()
 		{
 			//If we are reseting the collection Position should go to 0

src/Controls/src/Core/Internals/PropertyPropagationExtensions.cs

@@ -1,4 +1,5 @@
 #nullable disable
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,6 +9,15 @@ namespace Microsoft.Maui.Controls.Internals
 	/// <include file="../../../docs/Microsoft.Maui.Controls.Internals/PropertyPropagationExtensions.xml" path="Type[@FullName='Microsoft.Maui.Controls.Internals.PropertyPropagationExtensions']/Docs/*" />
 	public static class PropertyPropagationExtensions
 	{
+		[Obsolete]
+		internal static void PropagatePropertyChanged(string propertyName, Element element, IEnumerable children)
+		{
+			if (children == null)
+				return;
+
+			PropagatePropertyChanged(propertyName, element, children.OfType<IVisualTreeElement>().ToList());
+		}
+
 		internal static void PropagatePropertyChanged(string propertyName, Element element, IReadOnlyList<IVisualTreeElement> children)
 		{
 			if (propertyName == null || propertyName == VisualElement.FlowDirectionProperty.PropertyName)