Fix: Fixed issue with opening and closing folder in column layout (#12579)

Author: hishitetsu

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

@@ -170,7 +170,6 @@
 					IsTabStop="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.App/Views/LayoutModes/ColumnViewBase.xaml.cs

@@ -17,7 +17,6 @@
 using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 using static Files.App.Constants;
 using Microsoft.UI.Dispatching;
-using Files.App.Data.EventArguments;
 
 namespace Files.App.Views.LayoutModes
 {
@@ -223,14 +222,29 @@ protected override void FileList_SelectionChanged(object sender, SelectionChange
 				presenter!.Background = this.Resources["ListViewItemBackgroundSelected"] as SolidColorBrush;
 			}
 
-			if (SelectedItems?.Count > 1 || SelectedItem?.PrimaryItemAttribute is StorageItemTypes.File)
+			if (SelectedItems?.Count == 1 && SelectedItem?.PrimaryItemAttribute is StorageItemTypes.Folder && openedFolderPresenter != FileList.ContainerFromItem(SelectedItem))
 			{
-				var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
-				this.FindAscendant<ColumnViewBrowser>()?.DismissOtherBlades(currentBladeIndex);
-				ClearOpenedFolderSelectionIndicator();
+				if (UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)
+					ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
+				else
+					CloseFolder();
+			}
+			else if (SelectedItems?.Count > 1
+				|| SelectedItem?.PrimaryItemAttribute is StorageItemTypes.File
+				|| openedFolderPresenter != null && ParentShellPageInstance != null &&
+				!ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.Contains(FileList.ItemFromContainer(openedFolderPresenter)))
+			{
+				CloseFolder();
 			}
 		}
 
+		private void CloseFolder()
+		{
+			var currentBladeIndex = (ParentShellPageInstance is ColumnShellPage associatedColumnShellPage) ? associatedColumnShellPage.ColumnParams.Column : 0;
+			this.FindAscendant<ColumnViewBrowser>()?.DismissOtherBlades(currentBladeIndex);
+			ClearOpenedFolderSelectionIndicator();
+		}
+
 		private void FileList_RightTapped(object sender, RightTappedRoutedEventArgs e)
 		{
 			if (!IsRenamingItem)
@@ -242,21 +256,6 @@ private void HandleRightClick(object sender, RightTappedRoutedEventArgs e)
 			HandleRightClick(e.OriginalSource);
 		}
 
-		private void FileList_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
-		{
-			if
-			(
-				IsRenamingItem ||
-				!(e.Key is VirtualKey.Up or VirtualKey.Down or VirtualKey.Right) ||
-				SelectedItems?.Count > 1
-			)
-				return;
-
-			// Open selected directory
-			if (IsItemSelected && SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder)
-				ItemInvoked?.Invoke(new ColumnParam { Source = this, NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
-		}
-
 		protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
 			if