Merge branch 'main' of https://github.com/dotnet/maui into pj/editor-…

…font

# Conflicts:
#	src/Core/tests/DeviceTests/Handlers/Editor/EditorHandlerTests.Android.cs

src/Compatibility/Core/src/AppHostBuilderExtensions.cs

@@ -11,15 +11,16 @@ public static IAppHostBuilder RegisterCompatibilityRenderers(this IAppHostBuilde
 			// This won't really be a thing once we have all the handlers built
 			var defaultHandlers = new List<Type>
 			{
-				typeof(Button) ,
+				typeof(Button),
 				typeof(Editor),
-				typeof(Entry) ,
-				typeof(ContentPage) ,
-				typeof(Page) ,
-				typeof(Label) ,
+				typeof(Entry),
+				typeof(ContentPage),
+				typeof(Page),
+				typeof(Label),
 				typeof(Slider),
 				typeof(Stepper),
-				typeof(Switch)
+				typeof(Switch),
+				typeof(SearchBar)
 			};
 
 			Forms.RegisterCompatRenderers(

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

@@ -50,7 +50,7 @@ void SetupMauiLayout()
 			verticalStack.Add(new Label { Text = loremIpsum, MaxLines = 2 });
 			verticalStack.Add(new Label { Text = loremIpsum, LineBreakMode = LineBreakMode.TailTruncation });
 			verticalStack.Add(new Label { Text = loremIpsum, MaxLines = 2, LineBreakMode = LineBreakMode.TailTruncation });
-			verticalStack.Add(new Label { Text = "This should have five times the line height!", LineHeight = 5});
+			verticalStack.Add(new Label { Text = "This should have five times the line height!", LineHeight = 5 });
 
 			var editor = new Editor
 			{

src/Controls/src/Core/EffectiveFlowDirectionExtensions.cs

@@ -68,5 +68,11 @@ public static bool IsExplicit(this EffectiveFlowDirection self)
 		{
 			return (self & EffectiveFlowDirection.Explicit) == EffectiveFlowDirection.Explicit;
 		}
+
+		public static Maui.FlowDirection ToPlatformFlowDirection(this FlowDirection flowDirection) 
+		{
+			return flowDirection.ToEffectiveFlowDirection().IsLeftToRight()
+					? Maui.FlowDirection.LeftToRight : Maui.FlowDirection.RightToLeft;
+		}
 	}
 }

src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs

@@ -0,0 +1,20 @@
+namespace Microsoft.Maui.Controls
+{
+	public partial class SearchBar : ISearchBar
+	{
+		Font? _font;
+
+		Font IText.Font
+		{
+			get
+			{
+				if (_font == null)
+				{
+					_font = Font.OfSize(FontFamily, FontSize).WithAttributes(FontAttributes);
+				}
+
+				return _font.Value;
+			}
+		}
+	}
+}

src/Controls/src/Core/HandlerImpl/VisualElement.Impl.cs

@@ -121,5 +121,7 @@ protected virtual Size MeasureOverride(double widthConstraint, double heightCons
 			IsMeasureValid = true;
 			return DesiredSize;
 		}
+
+		Maui.FlowDirection IFrameworkElement.FlowDirection => FlowDirection.ToPlatformFlowDirection();
 	}
 }

src/Controls/src/Core/SearchBar.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>
+	public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>
 	{
 		public static readonly BindableProperty SearchCommandProperty = BindableProperty.Create("SearchCommand", typeof(ICommand), typeof(SearchBar), null, propertyChanged: OnCommandChanged);
 
@@ -89,23 +89,26 @@ public double FontSize
 			set { SetValue(FontSizeProperty, value); }
 		}
 
-		void IFontElement.OnFontFamilyChanged(string oldValue, string newValue)
-		{
-		}
-
-		void IFontElement.OnFontSizeChanged(double oldValue, double newValue)
-		{
-		}
-
 		double IFontElement.FontSizeDefaultValueCreator() =>
 			Device.GetNamedSize(NamedSize.Default, (SearchBar)this);
 
-		void IFontElement.OnFontAttributesChanged(FontAttributes oldValue, FontAttributes newValue)
-		{
-		}
+		void IFontElement.OnFontAttributesChanged(FontAttributes oldValue, FontAttributes newValue) =>
+			HandleFontChanged();
+
+		void IFontElement.OnFontFamilyChanged(string oldValue, string newValue) =>
+			HandleFontChanged();
+
+		void IFontElement.OnFontSizeChanged(double oldValue, double newValue) =>
+			HandleFontChanged();
+
+		void IFontElement.OnFontChanged(Font oldValue, Font newValue) =>
+			HandleFontChanged();
 
-		void IFontElement.OnFontChanged(Font oldValue, Font newValue)
+		void HandleFontChanged()
 		{
+			// Null out the Maui font value so it will be recreated next time it's accessed
+			_font = null;
+			InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged);
 		}
 
 		public event EventHandler SearchButtonPressed;

src/Controls/src/Core/Stepper.cs

@@ -93,6 +93,6 @@ public double Value
 
 		public IPlatformElementConfiguration<T, Stepper> On<T>() where T : IConfigPlatform => _platformConfigurationRegistry.Value.On<T>();
 
-		double IStepper.Step => Increment;
+		double IStepper.Interval => Increment;
 	}
 }

src/Core/src/Core/IFrameworkElement.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.Maui
+namespace Microsoft.Maui
 {
 	/// <summary>
 	/// Represents a framework-level set of properties, events, and methods for .NET MAUI elements. 
@@ -73,7 +73,7 @@ public interface IFrameworkElement
 		/// Gets a value indicating whether the computed size and position of child elements in this element's layout are valid.
 		/// </summary>
 		void InvalidateMeasure();
-
+				
 		/// <summary>
 		/// Method that is called to invalidate the layout of this FrameworkElement.
 		/// </summary>
@@ -83,5 +83,10 @@ public interface IFrameworkElement
 		/// Id used by automation tools to interact with this FrameworkElement
 		/// </summary>
 		string AutomationId { get; }
+
+		/// <summary>
+		/// Direction in which the UI elements on the page are scanned by the eye
+		/// </summary>
+		FlowDirection FlowDirection { get; }
 	}
 }

src/Core/src/Core/IPlaceholder.cs

@@ -3,7 +3,7 @@
 	/// <summary>
 	/// Provides functionality to be able to use a Placeholder.
 	/// </summary>
-	public interface IPlaceholder 
+	public interface IPlaceholder
 	{
 		/// <summary>
 		/// Gets the placeholder or hint text.

src/Core/src/Core/ISearchBar.cs

@@ -5,6 +5,6 @@
 	/// </summary>
 	public interface ISearchBar : IView, IText, IPlaceholder, ITextAlignment
 	{
-		
+
 	}
 }

src/Core/src/Core/IStepper.cs

@@ -9,6 +9,6 @@ public interface IStepper : IView, IRange
 		/// <summary>
 		/// Gets the amount by which Value is increased or decreased.
 		/// </summary>
-		double Step { get; }
+		double Interval { get; }
 	}
 }

src/Core/src/Handlers/ActivityIndicator/ActivityIndicatorHandler.iOS.cs

@@ -3,9 +3,9 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class ActivityIndicatorHandler : AbstractViewHandler<IActivityIndicator, NativeActivityIndicator>
+	public partial class ActivityIndicatorHandler : AbstractViewHandler<IActivityIndicator, MauiActivityIndicator>
 	{
-		protected override NativeActivityIndicator CreateNativeView() => new NativeActivityIndicator(CGRect.Empty, VirtualView)
+		protected override MauiActivityIndicator CreateNativeView() => new MauiActivityIndicator(CGRect.Empty, VirtualView)
 		{
 			ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray
 		};

src/Core/src/Handlers/CheckBox/CheckBoxHandler.iOS.cs

@@ -2,26 +2,26 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class CheckBoxHandler : AbstractViewHandler<ICheckBox, NativeCheckBox>
+	public partial class CheckBoxHandler : AbstractViewHandler<ICheckBox, MauiCheckBox>
 	{
 		protected virtual float MinimumSize => 44f;
 
-		protected override NativeCheckBox CreateNativeView()
+		protected override MauiCheckBox CreateNativeView()
 		{
-			return new NativeCheckBox
+			return new MauiCheckBox
 			{
 				MinimumViewSize = MinimumSize
 			};
 		}
 
-		protected override void ConnectHandler(NativeCheckBox nativeView)
+		protected override void ConnectHandler(MauiCheckBox nativeView)
 		{
 			base.ConnectHandler(nativeView);
 
 			nativeView.CheckedChanged += OnCheckedChanged;
 		}
 
-		protected override void DisconnectHandler(NativeCheckBox nativeView)
+		protected override void DisconnectHandler(MauiCheckBox nativeView)
 		{
 			base.DisconnectHandler(nativeView);
 
@@ -65,7 +65,7 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 
 		void OnCheckedChanged(object? sender, EventArgs e)
 		{
-			if (sender is NativeCheckBox nativeView && VirtualView != null)
+			if (sender is MauiCheckBox nativeView && VirtualView != null)
 			{
 				VirtualView.IsChecked = nativeView.IsChecked;
 			}

src/Core/src/Handlers/Editor/EditorHandler.Android.cs

@@ -32,7 +32,7 @@ public static void MapCharacterSpacing(EditorHandler handler, IEditor editor)
 		{
 			handler.TypedNativeView?.UpdateCharacterSpacing(editor);
 		}
-			
+
 		public static void MapIsTextPredictionEnabled(EditorHandler handler, IEditor editor)
 		{
 			handler.TypedNativeView?.UpdateIsTextPredictionEnabled(editor);	

src/Core/src/Handlers/Editor/EditorHandler.Standard.cs

@@ -9,7 +9,7 @@ public partial class EditorHandler : AbstractViewHandler<IEditor, object>
 		public static void MapText(IViewHandler handler, IEditor editor) { }
 
 		public static void MapCharacterSpacing(IViewHandler handler, IEditor editor) { }
-		
+
 		public static void MapIsTextPredictionEnabled(EditorHandler handler, IEditor editor) { }
 
 		public static void MapFont(IViewHandler handler, IEditor editor) { }

src/Core/src/Handlers/Editor/EditorHandler.iOS.cs

@@ -26,7 +26,7 @@ public static void MapCharacterSpacing(EditorHandler handler, IEditor editor)
 		{
 			handler.TypedNativeView?.UpdateCharacterSpacing(editor);
 		}
-			
+
 		public static void MapIsTextPredictionEnabled(EditorHandler handler, IEditor editor)
 		{
 			handler.TypedNativeView?.UpdatePredictiveText(editor);

src/Core/src/Handlers/Picker/PickerHandler.Android.cs

@@ -71,7 +71,7 @@ void OnClick(object? sender, EventArgs e)
 				using (var builder = new AlertDialog.Builder(Context))
 				{
 					builder.SetTitle(VirtualView.Title ?? string.Empty);
-					
+
 					string[] items = VirtualView.Items.ToArray();
 
 					builder.SetItems(items, (s, e) =>

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

@@ -29,7 +29,7 @@ public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar
 		{
 			handler.TypedNativeView?.UpdatePlaceholder(searchBar);
 		}
-		
+
 		public static void MapFont(SearchBarHandler handler, ISearchBar searchBar)
 		{
 			var services = App.Current?.Services

src/Core/src/Handlers/Stepper/StepperHandler.Android.cs

@@ -1,6 +1,6 @@
 using System;
-using Android.Widget;
 using Android.Views;
+using Android.Widget;
 using AButton = Android.Widget.Button;
 using AOrientation = Android.Widget.Orientation;
 

src/Core/src/Handlers/Stepper/StepperHandler.cs

@@ -6,7 +6,7 @@ public partial class StepperHandler
 		{
 			[nameof(IStepper.Minimum)] = MapMinimum,
 			[nameof(IStepper.Maximum)] = MapMaximum,
-			[nameof(IStepper.Step)] = MapIncrement,
+			[nameof(IStepper.Interval)] = MapIncrement,
 			[nameof(IStepper.Value)] = MapValue
 		};
 

src/Core/src/Handlers/TimePicker/TimePickerHandler.iOS.cs

@@ -6,7 +6,8 @@ public partial class TimePickerHandler : AbstractViewHandler<ITimePicker, MauiTi
 	{
 		protected override MauiTimePicker CreateNativeView()
 		{
-			return new MauiTimePicker(() => {
+			return new MauiTimePicker(() =>
+			{
 				SetVirtualViewTime();
 				TypedNativeView?.ResignFirstResponder();
 			});

src/Core/src/Hosting/AppHostBuilderExtensions.cs

@@ -36,15 +36,16 @@ public static IAppHostBuilder UseMauiHandlers(this IAppHostBuilder builder)
 		{
 			builder.RegisterHandlers(new Dictionary<Type, Type>
 			{
-				{  typeof(IActivityIndicator), typeof(ActivityIndicatorHandler) },
+				{ typeof(IActivityIndicator), typeof(ActivityIndicatorHandler) },
 				{ typeof(IButton), typeof(ButtonHandler) },
 				{ typeof(ICheckBox), typeof(CheckBoxHandler) },
 				{ typeof(IEditor), typeof(EditorHandler) },
 				{ typeof(IEntry), typeof(EntryHandler) },
 				{ typeof(ILayout), typeof(LayoutHandler) },
 				{ typeof(ILabel), typeof(LabelHandler) },
-				{  typeof(IPicker), typeof(PickerHandler) },
+				{ typeof(IPicker), typeof(PickerHandler) },
 				{ typeof(IProgress), typeof(ProgressBarHandler) },
+				{ typeof(ISearchBar), typeof(SearchBarHandler) },
 				{ typeof(ISlider), typeof(SliderHandler) },
 				{ typeof(IStepper), typeof(StepperHandler) },
 				{ typeof(ISwitch), typeof(SwitchHandler) },