Update BaseLayoutPage.cs

Author: yaira2

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -1008,6 +1008,7 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			var key = e.Key;
 			var filter = ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter;
 			bool isShiftDown = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+			bool isFilteringEnabled = FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems;
 
 			// OEM codes
 			bool isOemMinus = (int)key == (int)Keys.OemMinus;
@@ -1026,31 +1027,33 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			{
 				string typedChar = char.ToLowerInvariant(ch).ToString();
 
-				if (FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+				if (isFilteringEnabled)
 				{
 					if (!GeneralSettingsService.ShowFilterHeader)
 						GeneralSettingsService.ShowFilterHeader = true;
 
 					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += typedChar;
 				}
-
-				JumpString += typedChar;
-			}
-			else if (key == VirtualKey.Space && !string.IsNullOrEmpty(filter) &&
-					 FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
-			{
-				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += " ";
+				else
+				{
+					JumpString += typedChar;
+					return;
+				}
 			}
-			else if (key == VirtualKey.Back && !string.IsNullOrEmpty(filter) &&
-					 FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+			else if (isFilteringEnabled && !string.IsNullOrEmpty(filter))
 			{
-				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = filter[..^1];
-
-				if (string.IsNullOrEmpty(ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter))
+				if (key == VirtualKey.Space)
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += " ";
+				else if (key == VirtualKey.Back && filter.Length > 1)
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = filter[..^1];
+				else if (key == VirtualKey.Back && filter.Length == 1)
+				{
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = string.Empty;
 					GeneralSettingsService.ShowFilterHeader = false;
+				}
 			}
 
-			if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+			if (isFilteringEnabled)
 			{
 				var jumpedToItem = ParentShellPageInstance!.ShellViewModel.FilesAndFolders
 					.FirstOrDefault(f => f.Name?.Contains(ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter, StringComparison.OrdinalIgnoreCase) == true);