chore: set name and automation id properly for TextElement

unoplatform · May 13, 2023 · d3120bc · d3120bc
1 parent 7548790
commit d3120bc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Documents/TextElement.cs b/src/Uno.UI/UI/Xaml/Documents/TextElement.cs
@@ -311,7 +311,22 @@ public bool AllowFocusOnInteraction
 
 		#endregion
 
-		public string Name { get; set; }
+		private string _name;
+
+		public string Name
+		{
+			get => _name;
+			set
+			{
+				if (_name != value)
+				{
+					_name = value;
+					OnNameChangedPartial(value);
+				}
+			}
+		}
+
+		partial void OnNameChangedPartial(string newValue);
 
 		/// <summary>
 		/// Retrieves the parent RichTextBox/CRichTextBlock/TextBlock.

diff --git a/src/Uno.UI/UI/Xaml/Documents/TextElement.wasm.cs b/src/Uno.UI/UI/Xaml/Documents/TextElement.wasm.cs
@@ -1,4 +1,8 @@
-namespace Windows.UI.Xaml.Documents
+using Uno.UI;
+using Uno.UI.Xaml;
+using Windows.UI.Xaml.Automation;
+
+namespace Windows.UI.Xaml.Documents
 {
 	partial class TextElement
 	{
@@ -45,5 +49,18 @@ partial void OnTextDecorationsChangedPartial()
 		{
 			this.SetTextDecorations(ReadLocalValue(TextDecorationsProperty));
 		}
+
+		partial void OnNameChangedPartial(string newValue)
+		{
+			if (FrameworkElementHelper.IsUiAutomationMappingEnabled)
+			{
+				AutomationProperties.SetAutomationId(this, newValue);
+			}
+
+			if (FeatureConfiguration.UIElement.AssignDOMXamlName)
+			{
+				WindowManagerInterop.SetName(HtmlId, newValue);
+			}
+		}
 	}
 }