Implement HorizontalTextAlignment property in WinUI SearchBar

src/Controls/samples/Controls.Sample/Pages/MainPage.cs

@@ -245,19 +245,10 @@ void SetupMauiLayout()
 			verticalStack.Add(new ProgressBar { Progress = 0.5, BackgroundColor = Colors.LightCoral });
 			verticalStack.Add(new ProgressBar { Progress = 0.5, ProgressColor = Colors.Purple });
 
-			var searchBar = new SearchBar
-			{
-				CharacterSpacing = 4,
-				Text = "A search query"
-			};
-			verticalStack.Add(searchBar);
-
-			var placeholderSearchBar = new SearchBar
-			{
-				Placeholder = "Placeholder"
-			};
-			verticalStack.Add(placeholderSearchBar);
-
+			verticalStack.Add(new SearchBar { CharacterSpacing = 4, Text = "A search query" });
+			verticalStack.Add(new SearchBar { Placeholder = "Placeholder" });
+			verticalStack.Add(new SearchBar { HorizontalTextAlignment = TextAlignment.End, Text = "SearchBar HorizontalTextAlignment" });
+
 			var monkeyList = new List<string>
 			{
 				"Baboon",

src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs

@@ -5,20 +5,25 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class SearchBarHandler : ViewHandler<ISearchBar, AutoSuggestBox>
 	{
+		MauiTextBox? _queryTextBox;
+
 		protected override AutoSuggestBox CreateNativeView() => new AutoSuggestBox
 		{
 			AutoMaximizeSuggestionArea = false,
-			QueryIcon = new SymbolIcon(Symbol.Find)
+			QueryIcon = new SymbolIcon(Symbol.Find),
+			Style = UI.Xaml.Application.Current.Resources["MauiAutoSuggestBoxStyle"] as UI.Xaml.Style
 		};
 
 		protected override void ConnectHandler(AutoSuggestBox nativeView)
 		{
+			nativeView.Loaded += OnLoaded;
 			nativeView.QuerySubmitted += OnQuerySubmitted;
 			nativeView.TextChanged += OnTextChanged;
 		}
 
 		protected override void DisconnectHandler(AutoSuggestBox nativeView)
 		{
+			nativeView.Loaded -= OnLoaded;
 			nativeView.QuerySubmitted -= OnQuerySubmitted;
 			nativeView.TextChanged -= OnTextChanged;
 		}
@@ -32,9 +37,11 @@ public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar
 		{
 			handler.NativeView?.UpdatePlaceholder(searchBar);
 		}
-
-		[MissingMapper]
-		public static void MapHorizontalTextAlignment(IViewHandler handler, ISearchBar searchBar) { }
+
+		public static void MapHorizontalTextAlignment(SearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.NativeView?.UpdateHorizontalTextAlignment(searchBar, handler._queryTextBox);
+		}
 
 		[MissingMapper]
 		public static void MapFont(IViewHandler handler, ISearchBar searchBar) { }
@@ -56,6 +63,14 @@ public static void MapMaxLength(IViewHandler handler, ISearchBar searchBar) { }
 		[MissingMapper]
 		public static void MapIsReadOnly(IViewHandler handler, ISearchBar searchBar) { }
 
+		void OnLoaded(object sender, UI.Xaml.RoutedEventArgs e)
+		{
+			_queryTextBox = NativeView?.GetFirstDescendant<MauiTextBox>();
+
+			if (VirtualView != null)
+				NativeView?.UpdateHorizontalTextAlignment(VirtualView, _queryTextBox);
+		}
+
 		void OnQuerySubmitted(AutoSuggestBox? sender, AutoSuggestBoxQuerySubmittedEventArgs e)
 		{
 			if (VirtualView == null)
@@ -69,7 +84,6 @@ void OnQuerySubmitted(AutoSuggestBox? sender, AutoSuggestBoxQuerySubmittedEventA
 			VirtualView.SearchButtonPressed();
 		}
 
-		[PortHandler]
 		void OnTextChanged(AutoSuggestBox? sender, AutoSuggestBoxTextChangedEventArgs e)
 		{
 			if (e.Reason == AutoSuggestionBoxTextChangeReason.ProgrammaticChange)

src/Core/src/Platform/Windows/MauiCancelButton.cs

@@ -0,0 +1,53 @@
+#nullable disable
+using System;
+using Microsoft.UI.Xaml.Controls;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+
+namespace Microsoft.Maui
+{
+	internal class MauiCancelButton : Button
+	{
+		TextBlock _cancelButtonGlyph;
+		Border _cancelButtonBackground;
+
+		public WBrush ForegroundBrush
+		{
+			get => _cancelButtonGlyph.Foreground;
+			set => _cancelButtonGlyph.Foreground = value;
+		}
+
+		public WBrush BackgroundBrush
+		{
+			get => _cancelButtonBackground.Background;
+			set => _cancelButtonBackground.Background = value;
+		}
+
+		public bool IsReady { get; private set; }
+
+		public event EventHandler ReadyChanged;
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+
+			_cancelButtonGlyph = (TextBlock)GetTemplateChild("GlyphElement");
+			_cancelButtonBackground = (Border)GetTemplateChild("BorderElement");
+
+			if (_cancelButtonGlyph != null && _cancelButtonBackground != null)
+			{
+				// The SearchBarRenderer needs to be able to check whether we're ready to have the colors set
+				// (we won't be until the first time the button actually appears, which requires the search bar
+				// to be focused and have text in it)
+				IsReady = true;
+
+				// And we need to inform the SearchBarHandler of this so it can run the button color update method
+				OnReadyChanged();
+			}
+		}
+
+		protected virtual void OnReadyChanged()
+		{
+			ReadyChanged?.Invoke(this, EventArgs.Empty);
+		}
+	}
+}

src/Core/src/Platform/Windows/SearchBarExtensions.cs

@@ -18,5 +18,13 @@ public static void UpdateText(this AutoSuggestBox nativeControl, ISearchBar sear
 		{
 			nativeControl.Text = searchBar.Text;
 		}
+
+		public static void UpdateHorizontalTextAlignment(this AutoSuggestBox nativeControl, ISearchBar searchBar, MauiTextBox? queryTextBox)
+		{
+			if (queryTextBox == null)
+				return;
+
+			queryTextBox.TextAlignment = searchBar.HorizontalTextAlignment.ToNative();
+		}
 	}
 }