[2025/06/16] Candidate - In Flight Branch (#29886)

For more information about inflight process check
https://github.com/dotnet/maui/wiki/Inflight-Branch-Process

# .NET MAUI Release Notes - inflight/candidate Branch

## MAUI Product Fixes
* [iOS] Fix SwipeView programmatic open when background color is set by
@Shalini-Ashokan in #29765
* [iOS] FormattedText with text color causes stack overflow - fix by
@kubaflo in #29874
* [iOS] Fix AdaptiveTrigger not working as expected by @jsuarezruiz in
#20987
* [iOS] Fix for Flyout title is not broken over multiple lines when you
rotate your screen by @BagavathiPerumal in
#29171
* [Windows] Fix for Assigning null to the SelectedItem of the
CollectionView in the SelectionChanged event does not clear the
selection by @SyedAbdulAzeemSF4852 in
#29288
* Fix TapCoordinates method in Catalyst by @jsuarezruiz in
#29775
* Fixed ItemSpacing on CarouselView resizes items [Android] by
@Dhivya-SF4094 in #29796
* Perf : ButtonContentTypeConverter now using InvariantCulture to parse
double by @antoine-jonathan in #25393
* ToolbarItem behavior with ImageSource iOS - fix by @kubaflo in
#28833
* [Android] Fixed Button Shadow Color Transparency Not Applied Correctly
by @NanthiniMahalingam in #29371
* Don't call NSAttributedString with HTML from a background thread by
@kubaflo in #26153
* [Windows] Implemented the Resize and Downsize functions in the
W2DImage class by @HarishwaranVijayakumar in
#29138
* Templated indicator view - improvements by @kubaflo in
#25642
* Update Issue25946.xaml by @anandhan-rajagopal in
#30025

## Testing
* Fixed Test case failure in PR 26153 - iOS by @kubaflo in
#29906
* Fixed Test case failure in PR 25642 - snapshots by @kubaflo in
#29881
* [Testing] Feature Matrix UITest Cases for RadioButton by
@TamilarasanSF4853 in #29744
* [Testing] Feature Matrix UITest Cases for CollectionView ItemsSource
Feature by @LogishaSelvarajSF4525 in
#29322
* [Testing] Feature Matrix UITest Cases for Stepper by
@nivetha-nagalingam in #29731
* [Testing] Feature Matrix UITest Cases for CheckBox Control by
@anandhan-rajagopal in #29739
* Update the comment for the test properties by @mattleibow in
#27306

## Dependency Updates
* No changes in this category

## Docs
* No changes in this category

## Housekeeping
* [create-pull-request] automated change by @github-actions[bot] in
#29875
* [create-pull-request] automated change by @github-actions[bot] in
#29792
* [create-pull-request] automated change by @github-actions[bot] in
#29760

**Full Changelog**:
origin/main...origin/inflight/candidate

Author: PureWeen

src/Controls/src/Core/Button/Button.cs

@@ -598,7 +598,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
 				int spacingIndex = spacingFirst ? 0 : (parts.Length == 2 ? 1 : -1);
 
 				if (spacingIndex > -1)
-					spacing = double.Parse(parts[spacingIndex]);
+					spacing = double.Parse(parts[spacingIndex], CultureInfo.InvariantCulture);
 
 				if (positionIndex > -1)
 					position = (ButtonContentLayout.ImagePosition)Enum.Parse(typeof(ButtonContentLayout.ImagePosition), parts[positionIndex], true);

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

@@ -31,6 +31,17 @@ internal UIContainerCell(string cellId, View view, Shell shell, object context)
 			var platformView = view.ToPlatform();
 			ContentView.AddSubview(platformView);
 			platformView.AccessibilityTraits |= UIAccessibilityTrait.Button;
+			platformView.TranslatesAutoresizingMaskIntoConstraints = false;
+
+			var margin = view.Margin;
+			var constraints = new NSLayoutConstraint[]
+			{
+				platformView.LeadingAnchor.ConstraintEqualTo(ContentView.LeadingAnchor, (nfloat)margin.Left),
+				platformView.TrailingAnchor.ConstraintEqualTo(ContentView.TrailingAnchor, (nfloat)(-margin.Right)),
+				platformView.TopAnchor.ConstraintEqualTo(ContentView.TopAnchor, (nfloat)margin.Top),
+				platformView.BottomAnchor.ConstraintEqualTo(ContentView.BottomAnchor, (nfloat)(-margin.Bottom))
+			};
+			NSLayoutConstraint.ActivateConstraints(constraints);
 
 			_renderer.PlatformView.ClipsToBounds = true;
 			ContentView.ClipsToBounds = true;

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

@@ -112,7 +112,9 @@ void UpdateIconAndStyle(ToolbarItem item)
 					}
 					item.IconImageSource.LoadImage(mauiContext, result =>
 					{
-						Image = result?.Value;
+						Image = item.IconImageSource is not FontImageSource
+							? result?.Value.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal)
+							: result?.Value;
 						Style = UIBarButtonItemStyle.Plain;
 					});
 				}

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

@@ -95,7 +95,7 @@ double GetItemWidth()
 				if (double.IsInfinity(width))
 					return width;
 
-				itemWidth = (int)(width - Context?.ToPixels(VirtualView.PeekAreaInsets.Left) - Context?.ToPixels(VirtualView.PeekAreaInsets.Right) - Context?.ToPixels(listItemsLayout.ItemSpacing));
+				itemWidth = (int)(width - Context?.ToPixels(VirtualView.PeekAreaInsets.Left) - Context?.ToPixels(VirtualView.PeekAreaInsets.Right));
 			}
 
 			return itemWidth;
@@ -112,7 +112,7 @@ double GetItemHeight()
 				if (double.IsInfinity(height))
 					return height;
 
-				itemHeight = (int)(height - Context?.ToPixels(VirtualView.PeekAreaInsets.Top) - Context?.ToPixels(VirtualView.PeekAreaInsets.Bottom) - Context?.ToPixels(listItemsLayout.ItemSpacing));
+				itemHeight = (int)(height - Context?.ToPixels(VirtualView.PeekAreaInsets.Top) - Context?.ToPixels(VirtualView.PeekAreaInsets.Bottom));
 			}
 
 			return itemHeight;

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

@@ -14,6 +14,7 @@ namespace Microsoft.Maui.Controls.Handlers.Items
 	public partial class SelectableItemsViewHandler<TItemsView> : StructuredItemsViewHandler<TItemsView> where TItemsView : SelectableItemsView
 	{
 		bool _ignorePlatformSelectionChange;
+		bool _ignoreVirtualSelectionChange;
 
 		protected override void ConnectHandler(ListViewBase platformView)
 		{
@@ -132,6 +133,13 @@ void UpdatePlatformSelection()
 
 		void VirtualSelectionChanged(object sender, SelectionChangedEventArgs e)
 		{
+			// When the selection changes within the SelectionChanged event, the new selection isn't immediately reflected in the view.
+			// After the virtual selection is correctly updated, the flag is reset to enable future updates
+			if (_ignoreVirtualSelectionChange)
+			{
+				_ignoreVirtualSelectionChange = false;
+				return;
+			}
 			UpdatePlatformSelection();
 		}
 
@@ -172,10 +180,10 @@ void UpdateVirtualSingleSelection()
 
 			if (ItemsView != null)
 			{
-				ItemsView.SelectionChanged -= VirtualSelectionChanged;
+				_ignoreVirtualSelectionChange = true;
 				ItemsView.SelectedItem = selectedItem;
 
-				ItemsView.SelectionChanged += VirtualSelectionChanged;
+				_ignoreVirtualSelectionChange = false;
 			}
 		}
 

src/Controls/src/Core/IndicatorView/IndicatorStackLayout.cs

@@ -98,19 +98,30 @@ internal void ResetIndicatorCount(int oldCount)
 			}
 		}
 
+		protected override void OnInsert(int index, IView view)
+		{
+			base.OnInsert(index, view);
+			ResetIndicatorStylesNonBatch();
+		}
+
+		protected override void OnRemove(int index, IView view)
+		{
+			base.OnRemove(index, view);
+			ResetIndicatorStylesNonBatch();
+		}
+
 		void ResetIndicatorStylesNonBatch()
 		{
 			var indicatorCount = _indicatorView.Count;
 			var childrenCount = Children.Count;
+			var maxVisible = _indicatorView.MaximumVisible;
+			var position = _indicatorView.Position;
+			var selectedIndex = position >= maxVisible ? maxVisible - 1 : position;
 
 			for (int index = 0; index < childrenCount; index++)
 			{
-				var maxVisible = _indicatorView.MaximumVisible;
-				var position = _indicatorView.Position;
-				var selectedIndex = position >= maxVisible ? maxVisible - 1 : position;
 				bool isSelected = index == selectedIndex;
-				var visualElement = Children[index] as VisualElement;
-				if (visualElement is null)
+				if (Children[index] is not VisualElement visualElement)
 				{
 					return;
 				}

src/Controls/src/Core/Label/Label.iOS.cs

@@ -36,19 +36,17 @@ public static void MapMaxLines(ILabelHandler handler, Label label)
 			handler.PlatformView?.UpdateMaxLines(label);
 		}
 
-		static void MapFormatting(ILabelHandler handler, Label label)
+		internal static void MapFormatting(ILabelHandler handler, Label label)
 		{
-			// we need to re-apply color and font for HTML labels
-			if (!label.HasFormattedTextSpans && label.TextType == TextType.Html)
+			if (IsPlainText(label))
+			{
+				LabelHandler.MapFormatting(handler, label);
+			}
+			else if (!label.HasFormattedTextSpans && label.TextType == TextType.Html) // we need to re-apply color and font for HTML labels
 			{
 				handler.UpdateValue(nameof(ILabel.TextColor));
 				handler.UpdateValue(nameof(ILabel.Font));
 			}
-
-			if (!IsPlainText(label))
-				return;
-
-			LabelHandler.MapFormatting(handler, label);
 		}
 
 		void RecalculateSpanPositions(Size size)

src/Controls/src/Core/Platform/iOS/Extensions/LabelExtensions.cs

@@ -14,7 +14,22 @@ public static void UpdateText(this UILabel platformLabel, Label label)
 			switch (label.TextType)
 			{
 				case TextType.Html:
-					platformLabel.UpdateTextHtml(label);
+					// NOTE: Setting HTML text this will crash with some sort of consistency error.
+					// https://github.com/dotnet/maui/issues/25946
+					// Here we have to dispatch back the the main queue to avoid the crash.
+					// This is observed with CarouselView 1 but not with 2, so hopefully this
+					// will be just disappear once we switch.
+					CoreFoundation.DispatchQueue.MainQueue.DispatchAsync(() =>
+					{
+						platformLabel.UpdateTextHtml(label);
+
+						if (label.Handler is LabelHandler labelHandler)
+							Label.MapFormatting(labelHandler, label);
+
+						// NOTE: Because we are updating text outside the normal layout
+						// pass, we need to invalidate the measure for the next pass.
+						label.InvalidateMeasure();
+					});
 					break;
 
 				default:

src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs

@@ -333,6 +333,10 @@ await AttachAndRun(layout, async (handler) =>
 
 				label.TextType = TextType.Html;
 
+				// We need to delay here because platformLabel.UpdateTextHtml(label) and label.InvalidateMeasure()
+				// are dispatched asynchronously to the main thread and may not complete immediately.
+				// https://github.com/dotnet/maui/pull/26153
+				await Task.Delay(100);
 				await platformView.AssertDoesNotContainColor(Colors.Red, MauiContext);
 			});
 		}
@@ -517,9 +521,13 @@ public async Task FontStuffAppliesEvenInHtmlMode()
 				Text = "<p>Test</p>"
 			};
 
-			await InvokeOnMainThreadAsync(() =>
+			await InvokeOnMainThreadAsync(async () =>
 			{
 				var handler = CreateHandler<LabelHandler>(label);
+				// We need to delay here because platformLabel.UpdateTextHtml(label) and label.InvalidateMeasure()
+				// are dispatched asynchronously to the main thread and may not complete immediately.
+				// https://github.com/dotnet/maui/pull/26153
+				await Task.Delay(100);
 				AssertEquivalentFont(handler, label.ToFont());
 			});
 		}
@@ -715,9 +723,13 @@ public async Task FontStuffAfterTextTypeIsCorrect()
 				Text = "<p>Test</p>"
 			};
 
-			await InvokeOnMainThreadAsync(() =>
+			await InvokeOnMainThreadAsync(async () =>
 			{
 				var handler = CreateHandler<LabelHandler>(label);
+				// We need to delay here because platformLabel.UpdateTextHtml(label) and label.InvalidateMeasure()
+				// are dispatched asynchronously to the main thread and may not complete immediately.
+				// https://github.com/dotnet/maui/pull/26153
+				await Task.Delay(100);
 				label.FontFamily = "Baskerville";
 				label.FontSize = 64;
 				AssertEquivalentFont(handler, label.ToFont());