Fix: Fixed scrolling to the last item when typing name in the column layout (#11741)

hishitetsu · web-flow · commit ad9cf73a47ed · 2023-03-16T10:05:03.000-04:00
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
@@ -85,7 +85,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send
 
 		protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)
 		{
-			FileList.ScrollIntoView(FileList.Items.Last());
+			if (SelectedItems.Any())
+			{
+				FileList.ScrollIntoView(SelectedItems.Last());
+				(FileList.ContainerFromItem(SelectedItems.Last()) as ListViewItem)?.Focus(FocusState.Keyboard);
+			}
 		}
 
 		protected override void ItemManipulationModel_AddSelectedItemInvoked(object? sender, ListedItem e)

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,11 @@ protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? send`
`85`	`85`
`86`	`86`	`protected override void ItemManipulationModel_FocusSelectedItemsInvoked(object? sender, EventArgs e)`
`87`	`87`	`{`
`88`		`- FileList.ScrollIntoView(FileList.Items.Last());`
	`88`	`+ if (SelectedItems.Any())`
	`89`	`+ {`
	`90`	`+ FileList.ScrollIntoView(SelectedItems.Last());`
	`91`	`+ (FileList.ContainerFromItem(SelectedItems.Last()) as ListViewItem)?.Focus(FocusState.Keyboard);`
	`92`	`+ }`
`89`	`93`	`}`
`90`	`94`
`91`	`95`	`protected override void ItemManipulationModel_AddSelectedItemInvoked(object? sender, ListedItem e)`