Merge pull request #83 from saiganesh-sakthivel/main

Fixed the segmentedcontrol keyboard navigation and accessibility issue in windows

Author: PaulAndersonS

maui/src/SegmentedControl/Interface/ISegmentInfo.cs

@@ -130,13 +130,6 @@ internal interface ISegmentItemInfo : ISegmentInfo
 		/// </summary>
 		void ClearFocusedView();
 
-#if WINDOWS
-		/// <summary>
-		/// Update the keyboard focused view for the segmentedControl.
-		/// </summary>
-		void SetFocusVisualState(bool state);
-#endif
-
 		/// <summary>
 		/// Updates the scroll view position to focused index for the segment item.
 		/// </summary>

maui/src/SegmentedControl/SfSegmentedControl.cs

@@ -92,7 +92,9 @@ public SfSegmentedControl()
 			MinimumHeightRequest = 40;
 			SelectionIndicatorSettings.Parent = this;
 			TextStyle.Parent = this;
+#if !WINDOWS
 			this.AddKeyboardListener(this);
+#endif
 		}
 
 		#endregion
@@ -1189,16 +1191,6 @@ void ISegmentItemInfo.ClearFocusedView()
 			_keyNavigationView?.ClearFocusedView();
 		}
 
-#if WINDOWS
-		void ISegmentItemInfo.SetFocusVisualState(bool state)
-		{
-			if (this.Handler != null && this.Handler.PlatformView != null && this.Handler.PlatformView is Microsoft.UI.Xaml.UIElement nativeView)
-			{
-				nativeView.UseSystemFocusVisuals = state;
-			}
-		}
-#endif
-
 		/// <summary>
 		/// Updates the scroll view position to focused index for the segment item.
 		/// </summary>

maui/src/SegmentedControl/Views/SegmentItemView.cs

@@ -9,7 +9,7 @@ namespace Syncfusion.Maui.Toolkit.SegmentedControl
 	/// <summary>
 	/// Represents a view used to display an individual segment item within a segmented control.
 	/// </summary>
-	internal partial class SegmentItemView : SfContentView, ITouchListener, ITapGestureListener
+	internal partial class SegmentItemView : SfContentView, ITouchListener, ITapGestureListener, IKeyboardListener
 	{
 		#region Fields
 
@@ -70,10 +70,15 @@ internal SegmentItemView(ISegmentItemInfo itemInfo, SfSegmentItem item)
 			InitializeEffectsView();
 			this.AddTouchListener(this);
 			this.AddGestureListener(this);
+#if WINDOWS
+			this.AddKeyboardListener(this);
+#endif
 			if (itemInfo?.SegmentTemplate != null)
 			{
 				CreateSegmentItemTemplateView();
 			}
+
+			UpdateSemantics();
 		}
 
 		#endregion
@@ -107,6 +112,7 @@ internal void UpdateSelection()
 			_isSelected = true;
 			_selectionView?.UpdateVisualState(true);
 			InvalidateDrawable();
+			UpdateSemantics();
 		}
 
 		/// <summary>
@@ -123,6 +129,7 @@ internal void ClearSelection()
 			_isSelected = false;
 			_selectionView.UpdateVisualState(_isSelected, false);
 			InvalidateDrawable();
+			UpdateSemantics();
 		}
 
 		/// <summary>
@@ -420,6 +427,9 @@ void InitializeImageView()
 #endif
 			};
 
+#if WINDOWS
+			AutomationProperties.SetIsInAccessibleTree(_imageView, false);
+#endif
 			Children.Add(_imageView);
 		}
 
@@ -435,6 +445,9 @@ void InitializeSelectionView()
 			}
 
 			_selectionView = new SelectionView(_segmentItem, itemInfo);
+#if WINDOWS
+			AutomationProperties.SetIsInAccessibleTree(_selectionView, false);
+#endif
 			Children.Add(_selectionView);
 		}
 
@@ -453,6 +466,9 @@ void InitializeEffectsView()
 			_effectsView.ShouldIgnoreTouches = true;
 			_effectsView.AnimationCompleted += OnEffectsViewAnimationCompleted;
 			_effectsView.ClipToBounds = true;
+#if WINDOWS
+			AutomationProperties.SetIsInAccessibleTree(_effectsView, false);
+#endif
 			Children.Add(_effectsView);
 		}
 
@@ -597,6 +613,28 @@ void RemoveEffects()
 			_effectsView.Reset();
 		}
 
+		/// <summary>
+		/// Method to update the semantic properties.
+		/// </summary>
+		void UpdateSemantics()
+		{
+			if (_segmentItem != null)
+			{
+				if (!string.IsNullOrEmpty(SemanticProperties.GetDescription(_segmentItem)))
+				{
+					SemanticProperties.SetDescription(this, SemanticProperties.GetDescription(_segmentItem));
+				}
+				else if (!_segmentItem.IsEnabled || (itemInfo != null && !itemInfo.IsEnabled))
+				{
+					SemanticProperties.SetDescription(this, _segmentItem.Text + SfSegmentedResources.GetLocalizedString("Disabled"));
+				}
+				else
+				{
+					SemanticProperties.SetDescription(this, _isSelected ? _segmentItem.Text + SfSegmentedResources.GetLocalizedString("Selected") : _segmentItem.Text);
+				}
+			}
+		}
+
 		/// <summary>
 		/// Method to remove the selection view handlers.
 		/// </summary>
@@ -746,7 +784,11 @@ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
 				semanticsNode.OnClick = OnSemanticsNodeClick;
 			}
 			string text = _segmentItem.Text;
-			if (!_segmentItem.IsEnabled || (itemInfo != null && !itemInfo.IsEnabled))
+			if (!string.IsNullOrEmpty(SemanticProperties.GetDescription(_segmentItem)))
+			{
+				semanticsNode.Text = SemanticProperties.GetDescription(_segmentItem);
+			}
+			else if (!_segmentItem.IsEnabled || (itemInfo != null && !itemInfo.IsEnabled))
 			{
 				semanticsNode.Text = text + SfSegmentedResources.GetLocalizedString("Disabled");
 			}
@@ -758,6 +800,21 @@ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
 			return [semanticsNode];
 		}
 
+#if WINDOWS
+		/// <summary>
+		/// Raises when <see cref="SegmentItemView"/>'s handler gets changed.
+		/// <exclude/>
+		/// </summary>
+		protected override void OnHandlerChanged()
+		{
+			base.OnHandlerChanged();
+			if (this.Handler != null && this.Handler.PlatformView != null && this.Handler.PlatformView is Microsoft.UI.Xaml.UIElement nativeView)
+			{
+				nativeView.IsTabStop = true;
+			}
+		}
+#endif
+
 		/// <summary>
 		/// Measures the size of the view's content based on the specified constraints.
 		/// </summary>
@@ -875,6 +932,30 @@ void ITapGestureListener.OnTap(Syncfusion.Maui.Toolkit.Internals.TapEventArgs e)
 #endif
 		}
 
+		/// <summary>
+		/// Gets a value indicating whether the view can become the first responder to listen the keyboard actions.
+		/// </summary>
+		/// <remarks>This property will be considered only in iOS Platform.</remarks>
+		bool IKeyboardListener.CanBecomeFirstResponder
+		{
+			get { return true; }
+		}
+
+		/// <inheritdoc/>
+		void IKeyboardListener.OnKeyDown(KeyEventArgs e)
+		{
+			if (e.Key == KeyboardKey.Enter)
+			{
+				UpdateSelectedIndex();
+			}
+		}
+
+		/// <inheritdoc/>
+		void IKeyboardListener.OnKeyUp(KeyEventArgs args)
+		{
+
+		}
+
 		#endregion
 	}
 }

maui/src/SegmentedControl/Views/SegmentLayout.cs

@@ -6,11 +6,7 @@ namespace Syncfusion.Maui.Toolkit.SegmentedControl
 	/// <summary>
 	/// Represents a layout for arranging and displaying a collection of segment items.
 	/// </summary>
-#if WINDOWS
-	internal partial class SegmentLayout : SfView, IKeyboardListener
-#else
 	internal class SegmentLayout : SfView
-#endif
 	{
 		#region Fields
 
@@ -50,9 +46,6 @@ internal SegmentLayout(ISegmentItemInfo itemInfo)
 			_itemInfo = itemInfo;
 			DrawingOrder = DrawingOrder.AboveContent;
 			InitializeSegmentItemsView();
-#if WINDOWS
-			this.AddKeyboardListener(this);
-#endif
 		}
 
 		#endregion
@@ -196,21 +189,11 @@ internal void ProcessOnKeyDown(KeyEventArgs e)
 				_focusedIndex = -1;
 			}
 
-#if WINDOWS
-			if (e.Key == KeyboardKey.Left || e.Key == KeyboardKey.Right)
-			{
-				_itemInfo?.SetFocusVisualState(false);
-			}
-#endif
-
 			if (e.Key == KeyboardKey.Tab || (e.Key == KeyboardKey.Tab && e.IsShiftKeyPressed) || e.Key == KeyboardKey.Down || e.Key == KeyboardKey.Up)
 			{
 				e.Handled = false;
 				_focusedIndex = -1;
 				_itemInfo?.ClearFocusedView();
-#if WINDOWS
-				_itemInfo?.SetFocusVisualState(true);
-#endif
 				return;
 			}
 
@@ -849,30 +832,5 @@ protected override Size ArrangeContent(Rect bounds)
 		}
 
 		#endregion
-
-		#region Interface implementation
-#if WINDOWS
-		/// <summary>
-		/// Gets a value indicating whether the view can become the first responder to listen the keyboard actions.
-		/// </summary>
-		/// <remarks>This property will be considered only in iOS Platform.</remarks>
-		bool IKeyboardListener.CanBecomeFirstResponder
-		{
-			get { return true; }
-		}
-
-		/// <inheritdoc/>
-		void IKeyboardListener.OnKeyDown(KeyEventArgs e)
-		{
-			ProcessOnKeyDown(e);
-		}
-
-		/// <inheritdoc/>
-		void IKeyboardListener.OnKeyUp(KeyEventArgs e)
-		{
-
-		}
-#endif
-		#endregion
 	}
 }