[Net11] Revert Improve label mapping performance and ensure complete coverage including ToPlatform and subsequent property changes

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

@@ -28,7 +28,7 @@ public partial class Button
 #endif
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Text), MapText);
 
-			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(TextTransform), MapTextTransform);
+			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(TextTransform), MapText);
 			ButtonHandler.Mapper.ReplaceMapping<Button, IButtonHandler>(nameof(Button.LineBreakMode), MapLineBreakMode);
 		}
 
@@ -44,16 +44,5 @@ public static void MapContentLayout(IButtonHandler handler, Button button)
 
 		public static void MapContentLayout(ButtonHandler handler, Button button) =>
 			MapContentLayout((IButtonHandler)handler, button);
-
-		static void MapTextTransform(IButtonHandler handler, Button button)
-		{
-			if (button.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, button);
-		}
 	}
 }

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

@@ -449,12 +449,6 @@ private static void MapPadding(IButtonHandler handler, Button button)
 		public static void MapText(IButtonHandler handler, Button button)
 		{
 			handler.PlatformView?.UpdateText(button);
-
-			if (!handler.IsConnectingHandler())
-			{
-				// Any text update requires that we update any attributed string formatting
-				ButtonHandler.MapFormatting(handler, button);
-			}
 		}
 
 		internal static void MapBorderWidth(IButtonHandler handler, Button button)

src/Controls/src/Core/Editor/Editor.Android.cs

@@ -34,17 +34,5 @@ public static void MapText(EditorHandler2 handler, Editor editor)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
 		}
-
-		// Material3 specific overload for EditorHandler2
-		internal static void MapTextTransform(EditorHandler2 handler, Editor editor)
-		{
-			if (editor.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, editor);
-		}
 	}
 }

src/Controls/src/Core/Editor/Editor.Mapper.cs

@@ -13,13 +13,13 @@ public partial class Editor
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(PlatformConfiguration.WindowsSpecific.InputView.DetectReadingOrderFromContentProperty.PropertyName, MapDetectReadingOrderFromContent);
 #endif
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(Text), MapText);
-			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapTextTransform);
+			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapText);
 
 #if ANDROID
 			if (RuntimeFeature.IsMaterial3Enabled)
 			{
 				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(Text), MapText);
-				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapTextTransform);
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapText);
 				EditorHandler2.Mapper.AppendToMapping<Editor, EditorHandler2>(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 				EditorHandler2.CommandMapper.PrependToMapping<Editor, EditorHandler2>(nameof(IEditor.Focus), InputView.MapFocus);
 			}
@@ -38,16 +38,5 @@ public partial class Editor
 			EditorHandler.CommandMapper.PrependToMapping(nameof(IEditor.Focus), InputView.MapFocus);
 #endif
 		}
-
-		static void MapTextTransform(IEditorHandler handler, Editor editor)
-		{
-			if (editor.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, editor);
-		}
 	}
-}
+}

src/Controls/src/Core/Editor/Editor.iOS.cs

@@ -19,11 +19,8 @@ public static void MapText(IEditorHandler handler, Editor editor)
 		{
 			Platform.TextExtensions.UpdateText(handler.PlatformView, editor);
 
-			if (!handler.IsConnectingHandler())
-			{
-				// Any text changes in the editor field require recalculating the CharacterSpacing by regenerating the attributed string to properly apply the spacing and override the current text formatting.
-				handler?.UpdateValue(nameof(CharacterSpacing));
-			}
+			// Any text changes in the editor field require recalculating the CharacterSpacing by regenerating the attributed string to properly apply the spacing and override the current text formatting.
+			handler?.UpdateValue(nameof(CharacterSpacing));
 		}
 	}
 }

src/Controls/src/Core/Entry/Entry.Android.cs

@@ -56,17 +56,5 @@ public static void MapText(EntryHandler2 handler, Entry entry)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, entry);
 		}
-
-		// Material3 specific overload for EntryHandler2
-		internal static void MapTextTransform(EntryHandler2 handler, Entry entry)
-		{
-			if (entry.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, entry);
-		}
 	}
 }

src/Controls/src/Core/Entry/Entry.Mapper.cs

@@ -18,15 +18,15 @@ public partial class Entry
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(PlatformConfiguration.iOSSpecific.Entry.AdjustsFontSizeToFitWidthProperty.PropertyName, MapAdjustsFontSizeToFitWidth);
 #endif
 			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(Text), MapText);
-			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapTextTransform);
+			EntryHandler.Mapper.ReplaceMapping<Entry, IEntryHandler>(nameof(TextTransform), MapText);
 
 			// Material3 Entry Handler mappings
 #if ANDROID
 			if (RuntimeFeature.IsMaterial3Enabled)
 			{
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(PlatformConfiguration.AndroidSpecific.Entry.ImeOptionsProperty.PropertyName, MapImeOptions);
 				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(Text), MapText);
-				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapTextTransform);
+				EntryHandler2.Mapper.ReplaceMapping<Entry, EntryHandler2>(nameof(TextTransform), MapText);
 				EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 				EntryHandler2.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);
 				EntryHandler2.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
@@ -42,16 +42,5 @@ public partial class Entry
 			EntryHandler.CommandMapper.PrependToMapping(nameof(IEntry.Focus), InputView.MapFocus);
 #endif
 		}
-
-		static void MapTextTransform(IEntryHandler handler, Entry entry)
-		{
-			if (entry.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, entry);
-		}
 	}
 }

src/Controls/src/Core/Entry/Entry.iOS.cs

@@ -16,14 +16,7 @@ public static void MapAdjustsFontSizeToFitWidth(IEntryHandler handler, Entry ent
 		public static void MapText(IEntryHandler handler, Entry entry)
 		{
 			Platform.TextExtensions.UpdateText(handler.PlatformView, entry);
-
-			if (!handler.IsConnectingHandler())
-			{
-				// If we're not connecting the handler, we need to update the text formatting
-				// This is because the text may have changed, and we need to ensure that
-				// any attributed string formatting is applied correctly.
-				EntryHandler.MapFormatting(handler, entry);
-			}
+			EntryHandler.MapFormatting(handler, entry);
 		}
 
 		public static void MapCursorColor(EntryHandler handler, Entry entry) =>

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

@@ -61,10 +61,7 @@ static void MapTextTransform(ILabelHandler handler, Label label) =>
 		static void MapFormattedText(ILabelHandler handler, Label label)
 		{
 			if (label.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
 				return;
-			}
 
 			MapText(handler, label);
 		}
@@ -170,10 +167,7 @@ static void MapTextColor(ILabelHandler handler, Label label, Action<IElementHand
 			{
 				// if there is formatted text,
 				// then we re-apply the whole formatted text
-				if (!handler.IsConnectingHandler())
-				{
-					handler.UpdateValue(nameof(FormattedText));
-				}
+				handler.UpdateValue(nameof(FormattedText));
 			}
 			else if (label.TextType == TextType.Text || !label.TextColor.IsDefault())
 			{

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

@@ -1,4 +1,5 @@
 #nullable disable
+using System;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using UIKit;
@@ -22,11 +23,7 @@ public static void MapText(ILabelHandler handler, Label label)
 		{
 			Platform.LabelExtensions.UpdateText(handler.PlatformView, label);
 
-			if (!handler.IsConnectingHandler())
-			{
-				// Any text update requires that we update any attributed string formatting
-				MapFormatting(handler, label);
-			}
+			MapFormatting(handler, label);
 		}
 
 		public static void MapLineBreakMode(ILabelHandler handler, Label label)

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

@@ -40,18 +40,7 @@ public static NSAttributedString ToNSAttributedString(
 			Font? defaultFont = null,
 			Color? defaultColor = null,
 			TextTransform defaultTextTransform = TextTransform.Default)
-			=> formattedString.ToNSAttributedString(fontManager, LineBreakMode.WordWrap, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform);
-
-		internal static NSAttributedString ToNSAttributedString(
-			this FormattedString formattedString,
-			IFontManager fontManager,
-			LineBreakMode defaultLineBreakMode,
-			double defaultLineHeight = -1,
-			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
-			Font? defaultFont = null,
-			Color? defaultColor = null,
-			TextTransform defaultTextTransform = TextTransform.Default)
-			=> formattedString.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode, defaultCharacterSpacing: 0d);
+			=> formattedString.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, LineBreakMode.WordWrap, defaultCharacterSpacing: 0d);
 
 		internal static NSAttributedString ToNSAttributedString(
 			this FormattedString formattedString,
@@ -93,18 +82,7 @@ public static NSAttributedString ToNSAttributedString(
 			Font? defaultFont = null,
 			Color? defaultColor = null,
 			TextTransform defaultTextTransform = TextTransform.Default)
-			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode: LineBreakMode.WordWrap);
-
-		internal static NSAttributedString ToNSAttributedString(
-			this Span span,
-			IFontManager fontManager,
-			LineBreakMode defaultLineBreakMode,
-			double defaultLineHeight = -1,
-			TextAlignment defaultHorizontalAlignment = TextAlignment.Start,
-			Font? defaultFont = null,
-			Color? defaultColor = null,
-			TextTransform defaultTextTransform = TextTransform.Default)
-			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, defaultLineBreakMode, defaultCharacterSpacing: 0d);
+			=> span.ToNSAttributedString(fontManager, defaultLineHeight, defaultHorizontalAlignment, defaultFont, defaultColor, defaultTextTransform, LineBreakMode.WordWrap, defaultCharacterSpacing: 0d);
 
 		internal static NSAttributedString ToNSAttributedString(
 			this Span span,
@@ -114,7 +92,7 @@ internal static NSAttributedString ToNSAttributedString(
 			Font? defaultFont,
 			Color? defaultColor,
 			TextTransform defaultTextTransform,
-			LineBreakMode defaultLineBreakMode,
+			LineBreakMode lineBreakMode,
 			double defaultCharacterSpacing = 0d)
 		{
 			var defaultFontSize = defaultFont?.Size ?? fontManager.DefaultFontSize;
@@ -145,13 +123,14 @@ internal static NSAttributedString ToNSAttributedString(
 				_ => UITextAlignment.Left
 			};
 
-			style.LineBreakMode = defaultLineBreakMode switch
+			style.LineBreakMode = lineBreakMode switch
 			{
 				LineBreakMode.NoWrap => UILineBreakMode.Clip,
+				LineBreakMode.WordWrap => UILineBreakMode.WordWrap,
 				LineBreakMode.CharacterWrap => UILineBreakMode.CharacterWrap,
 				LineBreakMode.HeadTruncation => UILineBreakMode.HeadTruncation,
-				LineBreakMode.MiddleTruncation => UILineBreakMode.MiddleTruncation,
 				LineBreakMode.TailTruncation => UILineBreakMode.TailTruncation,
+				LineBreakMode.MiddleTruncation => UILineBreakMode.MiddleTruncation,
 				_ => UILineBreakMode.WordWrap
 			};
 

src/Controls/src/Core/SearchBar/SearchBar.Android.cs

@@ -23,17 +23,5 @@ public static void MapText(SearchBarHandler2 handler, SearchBar searchBar)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView.EditText, searchBar);
 		}
-
-		// Material3 specific overload for SearchBarHandler2
-		internal static void MapTextTransform(SearchBarHandler2 handler, SearchBar searchBar)
-		{
-			if (searchBar.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, searchBar);
-		}
 	}
 }

src/Controls/src/Core/SearchBar/SearchBar.Mapper.cs

@@ -27,16 +27,16 @@ static SearchBar()
 			{
 				// Material3 SearchBar handler mappings
 				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(Text), MapText);
-				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(TextTransform), MapTextTransform);
+				SearchBarHandler2.Mapper.ReplaceMapping<SearchBar, SearchBarHandler2>(nameof(TextTransform), MapText);
 			}
 			else
 			{
 				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(Text), MapText);
-				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapTextTransform);
+				SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapText);
 			}
 #else
 			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(Text), MapText);
-			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapTextTransform);
+			SearchBarHandler.Mapper.ReplaceMapping<SearchBar, ISearchBarHandler>(nameof(TextTransform), MapText);
 #endif
 
 #if IOS || ANDROID
@@ -47,16 +47,5 @@ static SearchBar()
 			SearchBarHandler.CommandMapper.PrependToMapping(nameof(ISearchBar.Focus), InputView.MapFocus);
 #endif
 		}
-
-		static void MapTextTransform(ISearchBarHandler handler, SearchBar searchBar)
-		{
-			if (searchBar.IsConnectingHandler())
-			{
-				// If we're connecting the handler, we don't want to map the text multiple times.
-				return;
-			}
-
-			MapText(handler, searchBar);
-		}
 	}
 }

src/Controls/src/Core/SearchBar/SearchBar.iOS.cs

@@ -17,13 +17,7 @@ public static void MapSearchBarStyle(ISearchBarHandler handler, SearchBar search
 		public static void MapText(ISearchBarHandler handler, SearchBar searchBar)
 		{
 			Platform.SearchBarExtensions.UpdateText(handler.PlatformView, searchBar);
-
-			// Any text update requires that we update any attributed string formatting.
-			// During handler connection these properties are applied by the normal mapper sweep after Text.
-			if (!handler.IsConnectingHandler())
-			{
-				SearchBarHandler.MapFormatting(handler, searchBar);
-			}
+			SearchBarHandler.MapFormatting(handler, searchBar);
 		}
 
 		internal static void MapUserInteraction(ISearchBarHandler handler, SearchBar searchBar)

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml

@@ -55,12 +55,7 @@
               </Button>
 
               <Label Grid.Row="1"
-                     Text="Clicked Event: "
-                     AutomationId="MainLabel">
-                     <Label.GestureRecognizers>
-                            <TapGestureRecognizer Tapped="MainLabel_Tapped"/>
-                     </Label.GestureRecognizers>
-              </Label>
+                     Text="Clicked Event: "/>
               <Label Grid.Row="1"
                      Grid.Column="1"
                      x:Name="ClickedEventLabel"

src/Controls/tests/TestCases.HostApp/FeatureMatrix/Button/ButtonControlPage.xaml.cs

@@ -1,5 +1,3 @@
-using Microsoft.Maui.Controls.Internals;
-
 namespace Maui.Controls.Sample;
 
 public class ButtonControlPage : NavigationPage
@@ -54,17 +52,4 @@ public void OnButtonReleased(object sender, EventArgs e)
 			ReleasedEventLabel.Text = "Released Event Executed";
 		}
 	}
-
-	void MainLabel_Tapped(object sender, TappedEventArgs e)
-	{
-		// Recreate the page to verify initial mappers
-		ToolbarItems.Clear();
-		Content = new ContentView();
-		INameScope scope = this;
-		scope.UnregisterName("ClickedEventLabel");
-		scope.UnregisterName("ReleasedEventLabel");
-		scope.UnregisterName("PressedEventLabel");
-		scope.UnregisterName("ButtonShadow");
-		InitializeComponent();
-	}
 }