Skip to content

Fix: Fixed keyboard focus in Columns View #18643

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
yair100 merged 2 commits into from
Jun 25, 2026
+31 −11
Merged

Fix: Fixed keyboard focus in Columns View #18643

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb21a7
Update ColumnsLayoutPage.xaml.cs
yair100 Jun 25, 2026
325488f
Fix performance
yair100 Jun 25, 2026
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
42 changes: 31 additions & 11 deletions src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ private void ColumnViewBrowser_GotFocus(object sender, RoutedEventArgs e)
return;

var currentBlade = ColumnHost.ActiveBlades.ToList().Single(x => (x.Content as Frame)?.Content == sender);
currentBlade.StartBringIntoView();
currentBlade.StartBringIntoView(new BringIntoViewOptions { AnimationDesired = false });
if (ColumnHost.ActiveBlades is not null)
{
ColumnHost.ActiveBlades.ToList().ForEach(x =>
Expand Down Expand Up @@ -325,17 +325,21 @@ public void MoveFocusToPreviousBlade(int currentBladeIndex)
DismissOtherBlades(currentBladeIndex);

var activeBlade = ColumnHost.ActiveBlades[currentBladeIndex - 1];
activeBlade.Focus(FocusState.Programmatic);
FocusIndex = currentBladeIndex - 1;

var activeBladeColumnViewBase = RetrieveBladeColumnViewBase(activeBlade);
if (activeBladeColumnViewBase is null)
if (activeBladeColumnViewBase?.FileList is null)
{
activeBlade.Focus(FocusState.Programmatic);
return;
}

// This allows to deselect and reselect the parent folder, hence forcing the refocus.
var selectedItem = activeBladeColumnViewBase.FileList.SelectedItem;
activeBladeColumnViewBase.FileList.SelectedItem = null;
activeBladeColumnViewBase.FileList.SelectedItem = selectedItem;
var fileList = activeBladeColumnViewBase.FileList;
if (fileList.SelectedItem is not null &&
fileList.ContainerFromItem(fileList.SelectedItem) is ListViewItem container)
container.Focus(FocusState.Programmatic);
else
fileList.Focus(FocusState.Programmatic);
}

public void MoveFocusToNextBlade(int currentBladeIndex)
Expand All @@ -344,14 +348,30 @@ public void MoveFocusToNextBlade(int currentBladeIndex)
return;

var activeBlade = ColumnHost.ActiveBlades[currentBladeIndex];
activeBlade.Focus(FocusState.Programmatic);
var next = RetrieveBladeColumnViewBase(activeBlade);
if (next?.FileList is null)
return;

FocusIndex = currentBladeIndex;

var activeBladeColumnViewBase = RetrieveBladeColumnViewBase(activeBlade);
if (activeBladeColumnViewBase is not null)
// Promote the next blade to IsCurrentInstance synchronously. ColumnViewBrowser_GotFocus
// would normally do this, but it runs after KeyUp — and KeyUp's ColumnViewBase_KeyUp
// would otherwise see the old blade as active, find its selection cleared by
// HandleSelectionChange below, and call CloseUnnecessaryColumns → DismissOtherBlades
// which tears down the blade we are about to focus into.
foreach (var blade in ColumnHost.ActiveBlades)
{
activeBladeColumnViewBase.FileList.SelectedIndex = 0;
if ((blade.Content as Frame)?.Content is ColumnShellPage shell)
shell.IsCurrentInstance = blade == activeBlade;
}

next.FileList.SelectedIndex = 0;

// BladeItem.Focus falls through to the title-bar tab strip; focus the inner ListViewItem.
if (next.FileList.ContainerFromIndex(0) is ListViewItem firstContainer)
firstContainer.Focus(FocusState.Programmatic);
else
next.FileList.Focus(FocusState.Programmatic);
}

private ColumnLayoutPage? RetrieveBladeColumnViewBase(BladeItem blade)
Expand Down
Loading