Merge pull request #173 from surya3655/TextInputLayout-Accessibility-Issue

Resolve Accessibility Issue in TextInputLayout

Author: PaulAndersonS

maui/src/NumericEntry/SfNumericEntry.cs

@@ -486,8 +486,12 @@ protected override List<SemanticsNode> GetSemanticsNodesCore(double width, doubl
 		{
             // Ensure any necessary size updates are performed
 			UpdateSemanticsSizes();
-			if (SemanticsDataIsCurrent() && IsTextInputLayout)
+			if (SemanticsDataIsCurrent() || IsTextInputLayout)
 			{
+				if(IsTextInputLayout)
+				{
+					_numericEntrySemanticsNodes.Clear();
+				}
 				return _numericEntrySemanticsNodes;
 			}
 

maui/src/NumericEntry/SfNumericUpDown.cs

@@ -1142,6 +1142,10 @@ protected override List<SemanticsNode> GetSemanticsNodesCore(double width, doubl
 
 			if (SemanticsDataIsCurrent() || IsTextInputLayout)
 			{
+				if (IsTextInputLayout)
+				{
+					_numericUpDownSemanticsNodes.Clear();
+				}
 				return _numericUpDownSemanticsNodes;
 			}
 			var upbuttonstate = !(_valueStates == ValueStates.Maximum) || AutoReverse;

maui/src/TextInputLayout/SfTextInputLayout.Methods.cs

@@ -242,6 +242,35 @@ internal void StartAnimation()
 
 		#region Private Methods
 
+		/// <summary>
+		/// This refresh the semantic nodes of the textinputlayout
+		/// </summary>
+		void ResetSemantics()
+		{
+			if (_textInputLayoutSemanticsNodes != null)
+			{
+				_textInputLayoutSemanticsNodes.Clear();
+				this.InvalidateSemantics();
+			}
+		}
+
+		/// <summary>
+		/// Resets semantics on first character input or when text is cleared.
+		/// </summary>
+		void HandleSemanticsReset()
+		{
+			if (string.IsNullOrEmpty(_text))
+			{
+				_hasResetSemantics = false;
+				ResetSemantics();
+			}
+			else if (_text.Length == 1 && !_hasResetSemantics)
+			{
+				ResetSemantics();
+				_hasResetSemantics = true;
+			}
+		}
+
 		/// <summary>
 		/// Gets the button size based on the vertical alignment and icon templates.
 		/// </summary>

maui/src/TextInputLayout/SfTextInputLayout.Properties.cs

@@ -1779,7 +1779,18 @@ internal bool IsUpDownVerticalAlignment
 		/// <summary>
 		/// Gets the value of the input text of the <see cref="SfTextInputLayout"/>.
 		/// </summary>
-		public string Text { get; internal set; } = string.Empty;
+		public string Text
+		{
+			get => _text;
+			internal set
+			{
+				if (value != _text)
+				{
+					_text = value;
+					HandleSemanticsReset();
+				}
+			}
+		}
 
 		/// <summary>
 		/// Gets a value indicating whether the background mode is outline.
@@ -2151,6 +2162,7 @@ static void OnIsLayoutFocusedChanged(BindableObject bindable, object oldValue, o
 			{
 				inputLayout.ChangeVisualState();
 				inputLayout.StartAnimation();
+				inputLayout.ResetSemantics();
 			}
 		}
 
@@ -2399,6 +2411,7 @@ static void OnPropertyChanged(BindableObject bindable, object oldValue, object n
 			if (bindable is SfTextInputLayout inputLayout && inputLayout._initialLoaded)
 			{
 				inputLayout.UpdateViewBounds();
+				inputLayout.ResetSemantics();
 			}
 		}
 

maui/src/TextInputLayout/SfTextInputLayout.cs

@@ -179,10 +179,20 @@ public partial class SfTextInputLayout : SfContentView, ITouchListener, IParentT
         /// </summary>
         readonly double _defaultLeadAndTrailViewWidth = 24;
 
-        /// <summary>
-        /// Gets or sets a value of leading view width.
-        /// </summary>
-        double _leadViewWidth = 0;
+		/// <summary>
+		/// The list to add the bounds values of drawing elements as nodes.
+		/// </summary>
+		readonly List<SemanticsNode> _textInputLayoutSemanticsNodes = new();
+
+		/// <summary>
+		/// List of semantic nodes for numeric entry.
+		/// </summary>
+		readonly List<SemanticsNode> _numericSemanticsNodes = new();
+
+		/// <summary>
+		/// Gets or sets a value of leading view width.
+		/// </summary>
+		double _leadViewWidth = 0;
 
         /// <summary>
         /// Gets or sets a value of trailing view width.
@@ -277,10 +287,25 @@ public partial class SfTextInputLayout : SfContentView, ITouchListener, IParentT
         /// </summary>
         float _fontsize = DefaultHintFontSize;
 
-        /// <summary>
-        /// Gets the stroke color of the clear button
-        /// </summary>
-        static readonly Color ClearIconStrokeColor = Color.FromArgb("#49454F");
+		/// <summary>
+		/// The field sets and checks the new size of the drawn elements.
+		/// </summary>
+		Size _controlSize = Size.Zero;
+		
+		/// <summary>
+		/// Indicates whether semantics need to be reset.
+		/// </summary>
+		bool _hasResetSemantics = false;
+
+		/// <summary>
+		/// The field sets and checks the text.
+		/// </summary>
+		string _text = string.Empty;
+
+		/// <summary>
+		/// Gets the stroke color of the clear button
+		/// </summary>
+		static readonly Color ClearIconStrokeColor = Color.FromArgb("#49454F");
 
         readonly EffectsRenderer _effectsRenderer;
 
@@ -665,10 +690,119 @@ void OnPickerSelectedIndexChanged(object? sender, EventArgs e)
             }
             InvalidateDrawable();
         }
-#endregion
+
+		/// <summary>
+		/// Populates the list of numeric semantics nodes.
+		/// </summary>
+		/// <param name="content">The content object.</param>
+		void PopulateNumericSemanticsNodes(object? content)
+		{
+			_numericSemanticsNodes.Clear();
+
+			switch (content)
+			{
+				case SfNumericUpDown numericUpDown:
+					AddNumericUpDownNodes(numericUpDown);
+					break;
+				case SfNumericEntry when IsClearIconVisible:
+					AddClearButtonNodes(2);
+					break;
+			}
+		}
+
+		/// <summary>
+		/// Adds semantic nodes for the numeric up-down control.
+		/// </summary>
+		/// <param name="numericUpDown">The numeric up/down control.</param>
+		void AddNumericUpDownNodes(SfNumericUpDown numericUpDown)
+		{
+			bool isUpEnabled = numericUpDown.AutoReverse || numericUpDown._valueStates != ValueStates.Maximum;
+			bool isDownEnabled = numericUpDown.AutoReverse || numericUpDown._valueStates != ValueStates.Minimum;
+			AddUpDownNodes(numericUpDown, isUpEnabled, isDownEnabled);
+		}
+
+		/// <summary>
+		/// Adds semantic nodes for up-down buttons.
+		/// </summary>
+		void AddUpDownNodes(SfNumericUpDown numericUpDown, bool isUpEnabled, bool isDownEnabled)
+		{
+			bool isVerticalInline = numericUpDown.IsInlineVerticalPlacement();
+			bool isLeftAlignment = numericUpDown.UpDownButtonAlignment == UpDownButtonAlignment.Left;
+			bool addClearIconFirst = isVerticalInline ? !isLeftAlignment : !isVerticalInline && !isLeftAlignment;
+
+			if (addClearIconFirst && IsClearIconVisible)
+			{
+				AddClearButtonNodes(2);
+			}
+
+			AddSemanticsNode(isVerticalInline ? _downIconRectF : _upIconRectF, addClearIconFirst ? 3 : 2, "Up button", isUpEnabled);
+			AddSemanticsNode(isVerticalInline ? _upIconRectF : _downIconRectF, addClearIconFirst ? 4 : 3, "Down button", isDownEnabled);
+
+			if (!addClearIconFirst && IsClearIconVisible)
+			{
+				AddClearButtonNodes(4);
+			}
+		}
+
+		/// <summary>
+		/// Adds a semantic node for clear button.
+		/// </summary>
+		void AddClearButtonNodes(int index)
+		{
+			var tempBounds = _clearIconRectF;
+			tempBounds.Width = tempBounds.Height = IconSize;
+			AddSemanticsNode(tempBounds, index, "Clear button");
+		}
+
+		/// <summary>
+		/// Adds a semantic node with specified properties.
+		/// </summary>
+		void AddSemanticsNode(RectF bounds, int id, string description, bool isEnabled = true)
+		{
+			string stateDescription = isEnabled ? $"{description}, double tap to activate" : $"{description}, disabled";
+			if (bounds.Width > 0 && bounds.Height > 0)
+			{
+				_numericSemanticsNodes.Add(CreateSemanticsNode(id, new Rect(bounds.X, bounds.Y, bounds.Width, bounds.Height), stateDescription));
+			}
+		}
+
+		/// <summary>
+		/// Creates a semantic node with specified ID, bounds, and description.
+		/// </summary>
+		/// <param name="id">The ID of the semantics node.</param>
+		/// <param name="rect">The bounds of the node.</param>
+		/// <param name="description">The description associated with the node.</param>
+		/// <returns>A newly created SemanticsNode object.</returns>
+		SemanticsNode CreateSemanticsNode(int id, Rect rect, string description) =>
+			new SemanticsNode
+			{
+				Id = id,
+				Bounds = rect,
+				Text = description
+			};
+		#endregion
 
 		#region Override Methods
 
+		/// <summary>
+		/// Returns the semantics node list.
+		/// </summary>
+		/// <param name="width">The width of the element.</param>
+		/// <param name="height">The height of the element.</param>
+		/// <returns>A list of semantics nodes.</returns>
+		protected override List<SemanticsNode> GetSemanticsNodesCore(double width, double height)
+		{
+			Size newControlSize = new(Width, Height);
+			if (_controlSize == newControlSize && _textInputLayoutSemanticsNodes.Count != 0)
+			{
+				return _textInputLayoutSemanticsNodes;
+			}
+			_controlSize = newControlSize;
+			PopulateNumericSemanticsNodes(Content);
+			_textInputLayoutSemanticsNodes.AddRange(_numericSemanticsNodes);
+			return _textInputLayoutSemanticsNodes;
+		}
+
 		/// <summary>
 		/// Invoked when the size of the element is allocated.
 		/// </summary>
@@ -718,8 +852,11 @@ protected override void OnContentChanged(object oldValue, object newValue)
             {
                 if (numericEntryContent.Children[0] is Entry numericInputView)
                 {
-					numericInputView.Opacity = IsHintFloated ? 1 : (DeviceInfo.Platform == DevicePlatform.iOS ? 0.00001 : 0);
-					AutomationProperties.SetIsInAccessibleTree(numericInputView, false); // Exclude numeric entry view from accessibility.
+#if ANDROID || IOS
+					numericInputView.Opacity = IsHintFloated ? 1 : 0.00001;
+#else
+					numericInputView.Opacity = IsHintFloated ? 1 : 0;
+#endif
 				}
             }
             else if (newValue is Picker picker)
@@ -728,7 +865,6 @@ protected override void OnContentChanged(object oldValue, object newValue)
                 {
 					picker.Opacity = IsHintFloated ? 1 : (DeviceInfo.Platform == DevicePlatform.iOS ? 0.00001 : 0);
 				}
-				AutomationProperties.SetIsInAccessibleTree(picker, false); // Exclude picker from accessibility.
 			}
 
             base.OnContentChanged(oldValue, newValue);
@@ -737,8 +873,8 @@ protected override void OnContentChanged(object oldValue, object newValue)
             {
                 OnEnabledPropertyChanged(IsEnabled);
             }
-
 			SetCustomDescription(newValue);
+			ResetSemantics();
         }
 
 		/// <summary>