Merge Candidate into SR9 if it's stable enough

src/BlazorWebView/tests/MauiDeviceTests/WebViewHelpers.Windows.cs

@@ -12,6 +12,17 @@ public static async Task WaitForWebViewReady(WebView2 wv2)
 		{
 			CoreWebView2 coreWebView2 = null;
 
+			// Ensure that the WebView2 runtime is installed and initialized and has a CoreWebView2 instance.
+			if (wv2?.CoreWebView2 == null)
+			{
+				string version = CoreWebView2Environment.GetAvailableBrowserVersionString(null);
+				if (string.IsNullOrEmpty(version))
+				{
+					throw new InvalidOperationException("WebView2 runtime is not installed.");
+				}
+				await wv2.EnsureCoreWebView2Async();
+			}
+
 			await Retry(() =>
 			{
 				coreWebView2 = wv2.CoreWebView2;

src/Controls/src/Core/Element/Element.Windows.cs

@@ -9,6 +9,9 @@ public partial class Element
 	{
 		public static void MapAutomationPropertiesIsInAccessibleTree(IElementHandler handler, Element element)
 		{
+			if (handler.IsConnectingHandler() && element.GetValue(AutomationProperties.IsInAccessibleTreeProperty) is null)
+				return;
+
 			Platform.AccessibilityExtensions.SetAutomationPropertiesAccessibilityView(
 				handler.PlatformView as Microsoft.UI.Xaml.FrameworkElement, element);
 		}

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

@@ -209,12 +209,12 @@ public override void ViewWillLayoutSubviews()
 			}
 
 			base.ViewWillLayoutSubviews();
-			
+
 			if (needsCellLayout || // A cell changed its measure
-			    !_laidOut || // We have never laid out
-			    // With no cells, nothing will trigger a layout when bounds change,
-			    // but we still need to properly lay out supplementary views
-			    ItemsSource.ItemCount == 0)
+				!_laidOut || // We have never laid out
+							 // With no cells, nothing will trigger a layout when bounds change,
+							 // but we still need to properly lay out supplementary views
+				ItemsSource.ItemCount == 0)
 			{
 				// We don't want to mess up with ContentOffset while refreshing, given that's also gonna cause
 				// a change in the content's offset Y.

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

@@ -272,7 +272,6 @@ public static UICollectionViewLayout CreateCarouselLayout(
 		NSCollectionLayoutDimension itemHeight = NSCollectionLayoutDimension.CreateFractionalHeight(1);
 		NSCollectionLayoutDimension groupWidth = NSCollectionLayoutDimension.CreateFractionalWidth(1);
 		NSCollectionLayoutDimension groupHeight = NSCollectionLayoutDimension.CreateFractionalHeight(1);
-		nfloat itemSpacing = 0;
 		NSCollectionLayoutGroup group = null;
 
 		var layout = new UICollectionViewCompositionalLayout((sectionIndex, environment) =>
@@ -325,7 +324,10 @@ public static UICollectionViewLayout CreateCarouselLayout(
 			}
 
 			var section = NSCollectionLayoutSection.Create(group: group);
-			section.InterGroupSpacing = itemSpacing;
+			if (itemsView.ItemsLayout is LinearItemsLayout linearItemsLayout)
+			{
+				section.InterGroupSpacing = (nfloat)linearItemsLayout.ItemSpacing;
+			}
 			section.OrthogonalScrollingBehavior = isHorizontal
 				? UICollectionLayoutSectionOrthogonalScrollingBehavior.GroupPagingCentered
 				: UICollectionLayoutSectionOrthogonalScrollingBehavior.None;

src/Controls/src/Core/Label/Label.Mapper.cs

@@ -21,7 +21,7 @@ public partial class Label
 
 			// these are really a single property
 			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(nameof(Text), MapText);
-			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(nameof(FormattedText), MapText);
+			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(nameof(FormattedText), MapFormattedText);
 
 			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(nameof(LineBreakMode), MapLineBreakMode);
 			LabelHandler.Mapper.ReplaceMapping<Label, ILabelHandler>(nameof(MaxLines), MapMaxLines);
@@ -54,8 +54,17 @@ public static void MapTextType(ILabelHandler handler, Label label) =>
 			MapTextOrFormattedText(handler, label);
 		static void MapTextTransform(ILabelHandler handler, Label label) =>
 			MapTextOrFormattedText(handler, label);
+		static void MapFormattedText(ILabelHandler handler, Label label)
+		{
+			if (label.IsConnectingHandler()) return;
+
+			MapText(handler, label);
+		}
+
 		static void MapTextOrFormattedText(ILabelHandler handler, Label label)
 		{
+			if (label.IsConnectingHandler()) return;
+
 			if (label.HasFormattedTextSpans)
 				handler.UpdateValue(nameof(FormattedText));
 			else

src/Controls/src/Core/NavigationProxy.cs

@@ -244,6 +244,7 @@ protected virtual void OnRemovePage(Page page)
 			{
 				currentInner.RemovePage(page);
 			}
+			page?.DisconnectHandlers();
 		}
 
 		Page Pop()

src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs

@@ -232,9 +232,22 @@ public static void UpdateMenuItems(this AToolbar toolbar,
 			if (sortedToolbarItems == null || previousMenuItems == null)
 				return;
 
-			var context = mauiContext.Context;
 			var menu = toolbar.Menu;
 
+			// menu items can be deleted by Android after switching activities, removing outdated menu items first
+			if (menu != null)
+			{
+				for (var j = previousMenuItems.Count - 1; j >= 0; j--)
+				{
+					var previousMenuItem = previousMenuItems[j];
+					if (menu.FindItem(previousMenuItem.ItemId) == null)
+					{
+						previousMenuItem.Dispose();
+						previousMenuItems.RemoveAt(j);
+					}
+				}
+			}
+
 			foreach (var toolbarItem in previousToolBarItems)
 				toolbarItem.PropertyChanged -= toolbarItemChanged;
 

src/Controls/tests/DeviceTests/ControlsHandlerTestBase.Android.cs

@@ -219,6 +219,17 @@ protected bool IsBackButtonVisible(IElementHandler handler)
 			return false;
 		}
 
+		protected void AssertTranslationMatches(Android.Views.View nativeView, double expectedTranslationX, double expectedTranslationY)
+		{
+			var context = nativeView?.Context ?? throw new InvalidOperationException("Context cannot be null.");
+
+			var expectedXInPixels = context.ToPixels(expectedTranslationX);
+			Assert.Equal(expectedXInPixels, nativeView.TranslationX, precision: 1);
+
+			var expectedYInPixels = context.ToPixels(expectedTranslationY);
+			Assert.Equal(expectedYInPixels, nativeView.TranslationY, precision: 1);
+		}
+
 		class WindowTestFragment : Fragment
 		{
 			TaskCompletionSource<bool> _taskCompletionSource = new TaskCompletionSource<bool>();

src/Controls/tests/DeviceTests/Elements/BoxView/BoxViewTests.Android.cs

@@ -126,5 +126,26 @@ Task<bool> GetPlatformIsVisible(ShapeViewHandler boxViewViewHandler)
 				return nativeView.Visibility == Android.Views.ViewStates.Visible;
 			});
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a BoxView should match with native Translation")]
+		public async Task BoxViewTranslationConsistent()
+		{
+			var boxView = new BoxView()
+			{
+				HeightRequest = 100,
+				WidthRequest = 200,
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<ShapeViewHandler>(boxView);
+			var nativeView = GetNativeBoxView(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, boxView.TranslationX, boxView.TranslationY);
+			});
+		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/Button/ButtonTests.Android.cs

@@ -190,5 +190,25 @@ public async Task RotationConsistent()
 			var platformRotation = await InvokeOnMainThreadAsync(() => platformButton.Rotation);
 			Assert.Equal(expected, platformRotation);
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a Button should match with native Translation")]
+		public async Task ButtonTranslationConsistent()
+		{
+			var button = new Button()
+			{
+				Text = "Button Test",
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<ButtonHandler>(button);
+			var nativeView = GetPlatformButton(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, button.TranslationX, button.TranslationY);
+			});
+		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/CheckBox/CheckBoxTests.Android.cs

@@ -122,5 +122,24 @@ Task<bool> GetPlatformIsVisible(CheckBoxHandler checkBoxHandler)
 				return nativeView.Visibility == Android.Views.ViewStates.Visible;
 			});
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a CheckBox should match with native Translation")]
+		public async Task CheckBoxTranslationConsistent()
+		{
+			var checkBox = new CheckBox()
+			{
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<CheckBoxHandler>(checkBox);
+			var nativeView = GetNativeCheckBox(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, checkBox.TranslationX, checkBox.TranslationY);
+			});
+		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/Editor/EditorTests.Android.cs

@@ -170,5 +170,25 @@ await InvokeOnMainThreadAsync(() =>
 				Assert.Equal(expectedValue, isEnabled);
 			});
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a Editor should match with native Translation")]
+		public async Task EditorTranslationConsistent()
+		{
+			var editor = new Editor()
+			{
+				Text = "Editor Test",
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<EditorHandler>(editor);
+			var nativeView = GetPlatformControl(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, editor.TranslationX, editor.TranslationY);
+			});
+		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/Entry/EntryTests.Android.cs

@@ -164,5 +164,25 @@ public async Task RotationConsistent()
 			var platformRotation = await InvokeOnMainThreadAsync(() => platformEntry.Rotation);
 			Assert.Equal(expected, platformRotation);
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a Entry should match with native Translation")]
+		public async Task EntryTranslationConsistent()
+		{
+			var entry = new Entry()
+			{
+				Text = "Entry Test",
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<EntryHandler>(entry);
+			var nativeView = GetPlatformControl(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, entry.TranslationX, entry.TranslationY);
+			});
+		}
 	}
 }

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

@@ -182,6 +182,26 @@ await InvokeOnMainThreadAsync(() =>
 			});
 		}
 
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a Label should match with native Translation")]
+		public async Task LabelTranslationConsistent()
+		{
+			var label = new Label()
+			{
+				Text = "Label Test",
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<LabelHandler>(label);
+			var nativeView = GetPlatformLabel(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, label.TranslationX, label.TranslationY);
+			});
+		}
+
 		TextView GetPlatformLabel(LabelHandler labelHandler) =>
 			labelHandler.PlatformView;
 

src/Controls/tests/DeviceTests/Elements/SearchBar/SearchBarTests.Android.cs

@@ -145,5 +145,25 @@ Task<bool> GetPlatformIsVisible(SearchBarHandler searchBarHandler)
 				return nativeView.Visibility == Android.Views.ViewStates.Visible;
 			});
 		}
+
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a SearchBar should match with native Translation")]
+		public async Task SearchBarTranslationConsistent()
+		{
+			var searchBar = new SearchBar()
+			{
+				Text = "SearchBar Test",
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<SearchBarHandler>(searchBar);
+			var nativeView = GetPlatformControl(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, searchBar.TranslationX, searchBar.TranslationY);
+			});
+		}
 	}
 }

src/Controls/tests/DeviceTests/Elements/SwipeView/SwipeViewTests.Android.cs

@@ -190,6 +190,25 @@ await InvokeOnMainThreadAsync(() =>
 			   });
 		}
 
+		//src/Compatibility/Core/tests/Android/TranslationTests.cs
+		[Fact]
+		[Description("The Translation property of a SwipeView should match with native Translation")]
+		public async Task SwipeViewTranslationConsistent()
+		{
+			var swipeView = new SwipeView()
+			{
+				TranslationX = 50,
+				TranslationY = -20
+			};
+
+			var handler = await CreateHandlerAsync<SwipeViewHandler>(swipeView);
+			var nativeView = GetPlatformControl(handler);
+			await InvokeOnMainThreadAsync(() =>
+			{
+				AssertTranslationMatches(nativeView, swipeView.TranslationX, swipeView.TranslationY);
+			});
+		}
+
 		[Fact]
 		[Description("The IsEnabled of a SwipeView should match with native IsEnabled")]
 		public async Task VerifySwipeViewIsEnabledProperty()

src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs

@@ -63,11 +63,12 @@ public override string ToString()
 			new GalleryPageFactory(() => new KeyboardScrollingGridGallery(), "Keyboard Scrolling Gallery - Grid with Star Row"),
 			new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Large Titles"),
 			new GalleryPageFactory(() => new KeyboardScrollingNonScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - NonScrolling Page / Small Titles"),
-		  	new GalleryPageFactory(() => new KeyboardScrollingScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"),
+		  new GalleryPageFactory(() => new KeyboardScrollingScrollingPageLargeTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Large Titles"),
 			new GalleryPageFactory(() => new KeyboardScrollingScrollingPageSmallTitlesGallery(), "Keyboard Scrolling Gallery - Scrolling Page / Small Titles"),
 			new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
 			new GalleryPageFactory(() => new ListViewCoreGalleryPage(), "ListView Gallery"),
 			new GalleryPageFactory(() => new PickerCoreGalleryPage(), "Picker Gallery"),
+			new GalleryPageFactory(() => new ProgressBarControlPage(), "ProgressBar Feature Matrix"),
 			new GalleryPageFactory(() => new ProgressBarCoreGalleryPage(), "Progress Bar Gallery"),
 			new GalleryPageFactory(() => new RadioButtonControlPage(), "RadioButton Feature Matrix"),
 			new GalleryPageFactory(() => new RadioButtonCoreGalleryPage(), "RadioButton Gallery"),
@@ -77,6 +78,7 @@ public override string ToString()
 			new GalleryPageFactory(() => new SliderCoreGalleryPage(), "Slider Gallery"),
 			new GalleryPageFactory(() => new StepperControlPage(), "Stepper Feature Matrix"),
 			new GalleryPageFactory(() => new StepperCoreGalleryPage(), "Stepper Gallery"),
+			new GalleryPageFactory(() => new SwitchControlPage(), "Switch Feature Matrix"),
 			new GalleryPageFactory(() => new SwitchCoreGalleryPage(), "Switch Gallery"),
 			new GalleryPageFactory(() => new SwipeViewCoreGalleryPage(), "SwipeView Gallery"),
 			new GalleryPageFactory(() => new TimePickerCoreGalleryPage(), "Time Picker Gallery"),
@@ -86,6 +88,9 @@ public override string ToString()
 			new GalleryPageFactory(() => new CollectionViewFeaturePage(), "CollectionView Feature Matrix"),
 			new GalleryPageFactory(() => new LabelControlPage(), "Label Feature Matrix"),
 			new GalleryPageFactory(() => new CarouselViewFeaturePage(), "CarouselView Feature Matrix"),
+			new GalleryPageFactory(() => new EntryControlPage(), "Entry Feature Matrix"),
+			new GalleryPageFactory(() => new ImageControlPage(), "Image Feature Matrix"),
+			new GalleryPageFactory(() => new ImageButtonControlPage(), "ImageButton Feature Matrix"),
 			new GalleryPageFactory(() => new BoxViewControlPage(), "BoxView Feature Matrix"),
 		};