Setting

Author: yaira2

src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs

@@ -31,6 +31,8 @@ public Task ExecuteAsync(object? parameter = null)
 
 			if (IsOn)
 				ContentPageContext.ShellPage!.ShellViewModel.InvokeFocusFilterHeader();
+			else
+				ContentPageContext.ShellPage!.ShellViewModel.FilesAndFoldersFilter = string.Empty;
 
 			return Task.CompletedTask;
 		}

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

@@ -1021,16 +1021,34 @@ protected virtual void Page_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 				!Path.GetInvalidFileNameChars().Contains(char.ToLowerInvariant(keyChar.Value)))
 			{
 				string ch = keyChar.Value.ToString().ToLowerInvariant();
-				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += ch;
+
+				if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+				{
+					// Enable filter header
+					if (!UserSettingsService.GeneralSettingsService.ShowFilterHeader)
+						UserSettingsService.GeneralSettingsService.ShowFilterHeader = true;
+
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += ch;
+				}
+
 				JumpString += ch;
 			}
 			else if (key == VirtualKey.Space && !string.IsNullOrEmpty(filter))
 			{
-				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += " ";
+				if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+				{
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter += " ";
+				}
 			}
 			else if (key == VirtualKey.Back && !string.IsNullOrEmpty(filter))
 			{
-				ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = filter[..^1];
+				if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
+				{
+					ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter = filter[..^1];
+
+					if (string.IsNullOrEmpty(ParentShellPageInstance.ShellViewModel.FilesAndFoldersFilter))
+						UserSettingsService.GeneralSettingsService.ShowFilterHeader = false;
+				}
 			}
 		}
 

src/Files.App/Views/MainPage.xaml.cs

@@ -217,7 +217,7 @@ private async Task OnPreviewKeyDownAsync(KeyRoutedEventArgs e)
 						break;
 
 					// Prevent the back key from executing a command if the filter header is not empty
-					if (e.Key is VirtualKey.Back && !string.IsNullOrEmpty(SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn!.ShellViewModel.FilesAndFoldersFilter))
+					if (e.Key is VirtualKey.Back && UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems && !string.IsNullOrEmpty(SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn!.ShellViewModel.FilesAndFoldersFilter))
 						break;
 
 					// Execute command for hotkey