Merge pull request #75 from saiganesh-sakthivel/main

SegmentedControl does not receive Focus when pressing the Tab key on Windows

Author: PaulAndersonS

maui/src/SegmentedControl/Interface/ISegmentInfo.cs

@@ -130,6 +130,13 @@ 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

@@ -1067,6 +1067,21 @@ protected override Size ArrangeContent(Rect bounds)
 			return base.ArrangeContent(bounds);
 		}
 
+#if WINDOWS
+		/// <summary>
+		/// Raises when <see cref="SfSegmentedControl"/>'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>
 		/// Invokes on the binding context of the view changed.
 		/// </summary>
@@ -1174,6 +1189,16 @@ 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/Keyboard/KeyNavigationView.cs

@@ -199,6 +199,21 @@ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
 			canvas.CanvasRestoreState();
 		}
 
-		#endregion
+#if WINDOWS
+		/// <summary>
+		/// Raises when <see cref="KeyNavigationView"/>'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 platformView)
+			{
+				platformView.IsTabStop = false;
+			}
+		}
+#endif
+
+#endregion
 	}
 }

maui/src/SegmentedControl/Views/OutlinedBorderView.cs

@@ -83,6 +83,21 @@ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
 			base.OnDraw(canvas, dirtyRect);
 		}
 
+#if WINDOWS
+		/// <summary>
+		/// Raises when <see cref="OutlinedBorderView"/>'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 platformView)
+			{
+				platformView.IsTabStop = false;
+			}
+		}
+#endif
+
 		#endregion
 	}
 }

maui/src/SegmentedControl/Views/SegmentLayout.cs

@@ -196,6 +196,24 @@ 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;
+			}
+
 			e.Handled = true;
 		}
 

maui/src/SegmentedControl/Views/Selection/SelectionView.cs

@@ -298,6 +298,17 @@ protected override void OnDraw(ICanvas canvas, RectF dirtyRect)
 			base.OnDraw(canvas, dirtyRect);
 		}
 
+#if WINDOWS
+		protected override void OnHandlerChanged()
+		{
+			base.OnHandlerChanged();
+			if (this.Handler != null && this.Handler.PlatformView != null && this.Handler.PlatformView is Microsoft.UI.Xaml.UIElement platformView)
+			{
+				platformView.IsTabStop = false;
+			}
+		}
+#endif
+
 		#endregion
 	}
 }