assign focus visual target

 focus visual target for:
hyperlink button
radio button
button
command bar
menu items
toggle switch

Author: mou-haz

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/HyperlinkButton/HyperlinkButton.xaml

@@ -30,6 +30,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
+                        ui:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"

source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/ToggleSwitch/ToggleSwitch.xaml

@@ -32,6 +32,7 @@
         <Setter Property="MinWidth" Value="{DynamicResource ToggleSwitchThemeMinWidth}" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
         <Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:ToggleSwitch">

source/iNKORE.UI.WPF.Modern/Themes/Controls/Button.xaml

@@ -33,6 +33,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Border
                             x:Name="Border"
@@ -81,7 +82,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Grid>
+                    <Grid chelper:FocusVisualHelper.IsTemplateFocusTarget="True">
                         <local:ElevationBorder
                             x:Name="Background"
                             Background="{TemplateBinding Background}"

source/iNKORE.UI.WPF.Modern/Themes/Controls/CommandBar.xaml

@@ -43,6 +43,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <local:ContentPresenterEx
                             x:Name="ContentPresenter"

source/iNKORE.UI.WPF.Modern/Themes/Controls/Expander.xaml

@@ -560,6 +560,7 @@
                             IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                             IsEnabled="{TemplateBinding IsEnabled}"
                             Style="{DynamicResource ExpanderCardHeaderDownStyle}"
+                            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                             Tag="{TemplateBinding chelper:ControlHelper.CornerRadius}" />
                         <!--  The clip is a composition clip applied in code  -->
                         <Border x:Name="ExpanderContentClip" DockPanel.Dock="Bottom">
@@ -908,6 +909,7 @@
     </Style>
 
     <Style x:Key="DefaultExpanderStyle" TargetType="Expander">
+        <Setter Property="IsTabStop" Value="False"/>
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
         <Setter Property="Background" Value="Transparent" />

source/iNKORE.UI.WPF.Modern/Themes/Controls/MenuItem.xaml

@@ -50,6 +50,7 @@
             Margin="{DynamicResource MenuBarItemMargin}"
             Background="{TemplateBinding Background}"
             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
             SnapsToDevicePixels="True">
             <Grid>
                 <Border
@@ -86,6 +87,7 @@
             Margin="{DynamicResource MenuBarItemMargin}"
             Background="{TemplateBinding Background}"
             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
             SnapsToDevicePixels="True">
             <Grid>
                 <Border
@@ -168,6 +170,7 @@
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}"
             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
             SnapsToDevicePixels="true">
             <Grid x:Name="AnimationRoot">
                 <Grid.ColumnDefinitions>
@@ -269,6 +272,7 @@
             BorderBrush="{TemplateBinding BorderBrush}"
             BorderThickness="{TemplateBinding BorderThickness}"
             CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+            chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
             SnapsToDevicePixels="True">
             <Grid x:Name="AnimationRoot">
                 <Grid.ColumnDefinitions>

source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationBackButton.xaml

@@ -37,6 +37,7 @@
                         x:Name="RootGrid"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <local:FontIcon
                             x:Name="Content"

source/iNKORE.UI.WPF.Modern/Themes/Controls/NavigationView.xaml

@@ -40,6 +40,7 @@
                         HorizontalAlignment="Stretch"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>

source/iNKORE.UI.WPF.Modern/Themes/Controls/RadioButton.xaml

@@ -36,6 +36,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding chelper:ControlHelper.CornerRadius}"
+                        chelper:FocusVisualHelper.IsTemplateFocusTarget="True"
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Grid.ColumnDefinitions>