Skip to content

Fixed two issues with keyboard navigation #2037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2020
Merged

Fixed two issues with keyboard navigation #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ca695
Keyboard Input: Better enable selection of various focusable controls…
lukeblevins Oct 1, 2020
0a5ab5f
Keyboard Navigation: Make sure all sidebar items are tab stop enabled
lukeblevins Oct 1, 2020
f09c2e9
Remove Redundant NavigationViewItem Template
lukeblevins Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 3 additions & 134 deletions Files/UserControls/SidebarControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,14 @@
x:Class="Files.Controls.SidebarControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
xmlns:contract4NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,4)"
xmlns:contract4Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,4)"
xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Files.Controls"
xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
xmlns:local1="using:Files"
xmlns:local="using:Files.Controls"
xmlns:local2="using:Files.Filesystem"
xmlns:local3="using:Files.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:media="using:Microsoft.UI.Xaml.Media"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
d:DesignHeight="768"
d:DesignWidth="200"
mc:Ignorable="d">
Expand All @@ -34,125 +27,6 @@
TintOpacity="{x:Bind AppSettings.AcrylicTheme.TintOpacity, Mode=OneWay}" />
</ResourceDictionary>
<ResourceDictionary>
<Style x:Key="DefaultSidebarStyle" TargetType="muxc:NavigationViewItem">
<Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
<Setter Property="Background" Value="{ThemeResource NavigationViewItemBackground}" />
<Setter Property="BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrush}" />
<Setter Property="BorderThickness" Value="{StaticResource NavigationViewItemBorderThickness}" />
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
<Setter Property="UseSystemFocusVisuals" Value="True" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="TabNavigation" Value="Once" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="muxc:NavigationViewItem">
<Grid x:Name="NVIRootGrid">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<primitives:NavigationViewItemPresenter
x:Name="NavigationViewItemPresenter"
Margin="{TemplateBinding Margin}"
Padding="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
primitiveContract7Present:CornerRadius="{TemplateBinding CornerRadius}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
ContentTransitions="{TemplateBinding ContentTransitions}"
Control.IsTemplateFocusTarget="True"
Foreground="{TemplateBinding Foreground}"
Icon="{TemplateBinding Icon}"
IsTabStop="false"
UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
<muxc:ItemsRepeater
x:Name="NavigationViewItemMenuItemsHost"
Grid.Row="1"
Visibility="Collapsed">
<muxc:ItemsRepeater.Layout>
<muxc:StackLayout Orientation="Vertical" />
</muxc:ItemsRepeater.Layout>
</muxc:ItemsRepeater>
<FlyoutBase.AttachedFlyout>
<Flyout
x:Name="ChildrenFlyout"
contract7NotPresent:Placement="Right"
contract7Present:Placement="RightEdgeAlignedTop">
<Flyout.FlyoutPresenterStyle>
<Style TargetType="FlyoutPresenter">
<!-- Set negative top margin to make the flyout align exactly with the button -->
<Setter Property="Margin" Value="0,-4,0,0" />
</Style>
</Flyout.FlyoutPresenterStyle>
<Grid x:Name="FlyoutRootGrid">
<Grid x:Name="FlyoutContentGrid" />
</Grid>
</Flyout>
</FlyoutBase.AttachedFlyout>

<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ItemOnNavigationViewListPositionStates">
<VisualState x:Name="OnLeftNavigation">
<VisualState.Setters>
<Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPane}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="OnLeftNavigationReveal">
<VisualState.Setters>
<Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnLeftPaneWithRevealFocus}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="OnTopNavigationPrimary">
<VisualState.Setters>
<Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPane}" />
<contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
<contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="OnTopNavigationPrimaryReveal">
<VisualState.Setters>
<Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneWithRevealFocus}" />
<contract7NotPresent:Setter Target="ChildrenFlyout.Placement" Value="Bottom" />
<contract7Present:Setter Target="ChildrenFlyout.Placement" Value="BottomEdgeAlignedLeft" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="OnTopNavigationOverflow">
<VisualState.Setters>
<Setter Target="NavigationViewItemPresenter.Style" Value="{StaticResource MUX_NavigationViewItemPresenterStyleWhenOnTopPaneOverflow}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>

<VisualStateGroup x:Name="DragStates">
<VisualState x:Name="DragEnter">
<VisualState.Setters>
<contract4Present:Setter Target="NVIRootGrid.(media:RevealBrush.State)" Value="PointerOver" />
<Setter Target="NVIRootGrid.Background" Value="{ThemeResource NavigationViewItemBackgroundPointerOver}" />
<Setter Target="NVIRootGrid.BorderBrush" Value="{ThemeResource NavigationViewItemBorderBrushPointerOver}" />
<Setter Target="NavigationViewItemPresenter.Foreground" Value="{ThemeResource NavigationViewItemForegroundPointerOver}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="DragLeave" />
<VisualState x:Name="Drop" />
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<DataTemplate x:Key="LocationNavItem" x:DataType="local2:LocationItem">
<muxc:NavigationViewItem
AllowDrop="True"
Expand All @@ -164,9 +38,7 @@
DragOver="NavigationViewLocationItem_DragOver"
Drop="NavigationViewLocationItem_Drop"
IsRightTapEnabled="True"
IsTabStop="False"
RightTapped="NavigationViewLocationItem_RightTapped"
Style="{StaticResource DefaultSidebarStyle}"
Tag="{x:Bind Path}">
<muxc:NavigationViewItem.Icon>
<FontIcon
Expand All @@ -190,7 +62,6 @@
Drop="NavigationViewDriveItem_Drop"
IsRightTapEnabled="True"
RightTapped="NavigationViewDriveItem_RightTapped"
Style="{StaticResource DefaultSidebarStyle}"
Tag="{x:Bind Path}"
ToolTipService.ToolTip="{x:Bind SpaceText}"
Visibility="{x:Bind ItemVisibility}">
Expand All @@ -211,8 +82,6 @@
DataContext="{x:Bind}"
DragEnter="NavigationViewItem_DragEnter"
DragLeave="NavigationViewItem_DragLeave"
IsTabStop="False"
Style="{StaticResource DefaultSidebarStyle}"
Tag="{x:Bind Path}">
<muxc:NavigationViewItem.Icon>
<BitmapIcon
Expand Down
1 change: 0 additions & 1 deletion Files/UserControls/YourHome.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
x:Class="Files.YourHome"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Files"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down
3 changes: 2 additions & 1 deletion Files/Views/LayoutModes/GenericFileBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,9 @@ protected override void Page_CharacterReceived(CoreWindow sender, CharacterRecei
{
if (App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser))
{
// Don't block the various uses of enter key (key 13)
var focusedElement = FocusManager.GetFocusedElement() as FrameworkElement;
if (focusedElement is TextBox || focusedElement is PasswordBox ||
if (args.KeyCode == 13 || focusedElement is Button || focusedElement is TextBox || focusedElement is PasswordBox ||
Interacts.Interaction.FindParent<ContentDialog>(focusedElement) != null)
{
return;
Expand Down
3 changes: 2 additions & 1 deletion Files/Views/LayoutModes/GridViewBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,9 @@ protected override void Page_CharacterReceived(CoreWindow sender, CharacterRecei
{
if (App.CurrentInstance.CurrentPageType == typeof(GridViewBrowser) && !isRenamingItem)
{
// Don't block the various uses of enter key (key 13)
var focusedElement = FocusManager.GetFocusedElement() as FrameworkElement;
if (focusedElement is TextBox || focusedElement is PasswordBox ||
if (args.KeyCode == 13 || focusedElement is Button || focusedElement is TextBox || focusedElement is PasswordBox ||
Interacts.Interaction.FindParent<ContentDialog>(focusedElement) != null)
{
return;
Expand Down