Improve keyboard nav in column layout (#7494)

Author: yaira2

src/Files/BaseLayout.cs

@@ -507,7 +507,7 @@ public void SetSelectedItemsOnNavigation()
                     ItemManipulationModel.SetSelectedItems(liItemsToSelect);
                     ItemManipulationModel.FocusSelectedItems();
                 }
-                else
+                else if (navigationArguments != null && navigationArguments.FocusOnNavigation)
                 {
                     ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control
                 }

src/Files/Views/LayoutModes/ColumnViewBase.xaml

@@ -167,6 +167,7 @@
                     IsRightTapEnabled="True"
                     ItemsSource="{x:Bind CollectionViewSource.View, Mode=OneWay}"
                     PreviewKeyDown="FileList_PreviewKeyDown"
+                    PreviewKeyUp="FileList_PreviewKeyUp"
                     RightTapped="FileList_RightTapped"
                     ScrollViewer.IsScrollInertiaEnabled="True"
                     SelectionChanged="FileList_SelectionChanged"

src/Files/Views/LayoutModes/ColumnViewBase.xaml.cs

@@ -26,6 +26,7 @@ public ColumnViewBase() : base()
             this.InitializeComponent();
             var selectionRectangle = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
             selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
+            tapDebounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
         }
 
         protected override void HookEvents()
@@ -147,6 +148,11 @@ private void ListViewTextBoxItemName_TextChanged(object sender, TextChangedEvent
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
+            if (eventArgs.Parameter is NavigationArguments navArgs)
+            {
+                // Focus filelist only if first column
+                navArgs.FocusOnNavigation = (navArgs.AssociatedTabInstance as ColumnShellPage)?.ColumnParams?.Column == 0;
+            }
             base.OnNavigatedTo(eventArgs);
         }
 
@@ -336,6 +342,26 @@ private void HandleRightClick(object sender, RightTappedRoutedEventArgs e)
             ItemManipulationModel.SetSelectedItem(objectPressed);
         }
 
+        private DispatcherQueueTimer tapDebounceTimer;
+
+        private void FileList_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
+        {
+            // Open selected directory
+            tapDebounceTimer.Stop();
+            if (IsItemSelected && SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
+            {
+                var currItem = SelectedItem;
+                tapDebounceTimer.Debounce(() =>
+                {
+                    if (currItem == SelectedItem)
+                    {
+                        ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
+                    }
+                    tapDebounceTimer.Stop();
+                }, TimeSpan.FromMilliseconds(200));
+            }
+        }
+
         private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
         {
             var ctrlPressed = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
@@ -382,7 +408,7 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
             else if (e.Key == VirtualKey.Up || e.Key == VirtualKey.Down)
             {
                 // If list has only one item, select it on arrow down/up (#5681)
-                if (!IsItemSelected && FileList.Items.Count == 1)
+                if (!IsItemSelected)
                 {
                     FileList.SelectedIndex = 0;
                     e.Handled = true;
@@ -399,14 +425,11 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
                     e.Handled = true;
                 }
             }
-            else if (e.Key == VirtualKey.Right) // Right arrow: open selected folder
+            else if (e.Key == VirtualKey.Right) // Right arrow: switch focus to next column
             {
                 if (!IsRenamingItem && !ParentShellPageInstance.NavToolbarViewModel.IsEditModeEnabled)
                 {
-                    if (IsItemSelected && SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
-                    {
-                        ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
-                    }
+                    FocusManager.TryMoveFocus(FocusNavigationDirection.Next);
                     e.Handled = true;
                 }
             }

src/Files/Views/LayoutModes/ColumnViewBrowser.xaml.cs

@@ -62,11 +62,6 @@ private void ColumnViewBase_ItemInvoked(object sender, EventArgs e)
                     NavPathParam = column.NavPathParam
                 });
             }
-            else
-            {
-                // Navigation path is already open, only select next column
-                FocusManager.TryMoveFocus(FocusNavigationDirection.Next);
-            }
         }
 
         private void ContentChanged(IShellPage p)
@@ -106,7 +101,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
         public override void Dispose()
         {
             base.Dispose();
-            ColumnHost.ActiveBlades.ForEach(x => (((x.Content as Frame)?.Content as ColumnShellPage).SlimContentPage as ColumnViewBase).ItemInvoked -= ColumnViewBase_ItemInvoked);
+            ColumnHost.ActiveBlades.Select(x => ((x.Content as Frame)?.Content as ColumnShellPage).SlimContentPage as ColumnViewBase).Where(x => x != null).ForEach(x => x.ItemInvoked -= ColumnViewBase_ItemInvoked);
             ColumnHost.ActiveBlades.ForEach(x => ((x.Content as Frame)?.Content as UIElement).GotFocus -= ColumnViewBrowser_GotFocus);
             ColumnHost.ActiveBlades.Select(x => (x.Content as Frame)?.Content).OfType<IDisposable>().ForEach(x => x.Dispose());
             UnhookEvents();
@@ -133,7 +128,10 @@ private void DismissOtherBlades(BladeItem blade)
                         {
                             disposableContent.Dispose();
                         }
-                        (((ColumnHost.ActiveBlades[index + 1].Content as Frame).Content as ColumnShellPage).SlimContentPage as ColumnViewBase).ItemInvoked -= ColumnViewBase_ItemInvoked;
+                        if (((ColumnHost.ActiveBlades[index + 1].Content as Frame).Content as ColumnShellPage)?.SlimContentPage is ColumnViewBase columnLayout)
+                        {
+                            columnLayout.ItemInvoked -= ColumnViewBase_ItemInvoked;
+                        }
                         ((ColumnHost.ActiveBlades[index + 1].Content as Frame).Content as UIElement).GotFocus -= ColumnViewBrowser_GotFocus;
                         ColumnHost.Items.RemoveAt(index + 1);
                         ColumnHost.ActiveBlades.RemoveAt(index + 1);

src/Files/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

@@ -180,7 +180,12 @@ protected override void InitializeCommandsViewModel()
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
+            if (eventArgs.Parameter is NavigationArguments navArgs)
+            {
+                navArgs.FocusOnNavigation = true;
+            }
             base.OnNavigatedTo(eventArgs);
+
             if (ParentShellPageInstance.InstanceViewModel?.FolderSettings.ColumnsViewModel != null)
             {
                 ColumnsViewModel = ParentShellPageInstance.InstanceViewModel.FolderSettings.ColumnsViewModel;

src/Files/Views/LayoutModes/GridViewBrowser.xaml.cs

@@ -145,6 +145,10 @@ protected override void InitializeCommandsViewModel()
 
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
+            if (eventArgs.Parameter is NavigationArguments navArgs)
+            {
+                navArgs.FocusOnNavigation = true;
+            }
             base.OnNavigatedTo(eventArgs);
 
             currentIconSize = FolderSettings.GetIconSize();
@@ -405,7 +409,7 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
             else if (e.Key == VirtualKey.Up || e.Key == VirtualKey.Down)
             {
                 // If list has only one item, select it on arrow down/up (#5681)
-                if (!IsItemSelected && FileList.Items.Count == 1)
+                if (!IsItemSelected)
                 {
                     FileList.SelectedIndex = 0;
                     e.Handled = true;

src/Files/Views/ModernShellPage.xaml.cs

@@ -1129,6 +1129,7 @@ public class NavigationParams
 
     public class NavigationArguments
     {
+        public bool FocusOnNavigation { get; set; } = false;
         public string NavPathParam { get; set; } = null;
         public IShellPage AssociatedTabInstance { get; set; }
         public bool IsSearchResultPage { get; set; } = false;