Code Quality: Focus correct filter header in dual pane

Author: yaira2

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

@@ -1,15 +1,12 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
 namespace Files.App.Actions
 {
 	internal sealed partial class ToggleFilterHeaderAction : ObservableObject, IToggleAction
 	{
 		private readonly IGeneralSettingsService generalSettingsService = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
+		private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		public string Label
 			=> Strings.ToggleFilterHeader.GetLocalizedResource();
@@ -28,17 +25,14 @@ public ToggleFilterHeaderAction()
 			generalSettingsService.PropertyChanged += GeneralSettingsService_PropertyChanged;
 		}
 
-		public async Task ExecuteAsync(object? parameter = null)
+		public Task ExecuteAsync(object? parameter = null)
 		{
 			generalSettingsService.ShowFilterHeader = !IsOn;
 
 			if (IsOn)
-			{
-				// Delay to ensure the UI updates before focusing
-				await Task.Delay(100);
-				var filterTextBox = (MainWindow.Instance.Content as Frame)?.FindDescendant("FilterTextBox") as AutoSuggestBox;
-				filterTextBox?.Focus(FocusState.Programmatic);
-			}
+				ContentPageContext.ShellPage!.ShellViewModel.InvokeFocusFilterHeader();
+
+			return Task.CompletedTask;
 		}
 
 		private void GeneralSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)

src/Files.App/ViewModels/ShellViewModel.cs

@@ -161,6 +161,8 @@ public GitProperties EnabledGitProperties
 		private CancellationTokenSource searchCTS;
 		private CancellationTokenSource updateTagGroupCTS;
 
+		public event EventHandler FocusFilterHeader;
+
 		public event EventHandler DirectoryInfoUpdated;
 
 		public event EventHandler GitDirectoryUpdated;
@@ -190,6 +192,11 @@ public GitProperties EnabledGitProperties
 
 		public event ItemLoadStatusChangedEventHandler ItemLoadStatusChanged;
 
+		public void InvokeFocusFilterHeader()
+		{
+			FocusFilterHeader.Invoke(this, null);
+		}
+
 		public async Task SetWorkingDirectoryAsync(string? value)
 		{
 			if (string.IsNullOrWhiteSpace(value))
@@ -740,10 +747,10 @@ public void UpdateEmptyTextType()
 		}
 
 		private string? _filesAndFoldersFilter;
-		public string? FilesAndFoldersFilter 
-		{ 
-			get => _filesAndFoldersFilter; 
-			set => SetProperty(ref _filesAndFoldersFilter, value); 
+		public string? FilesAndFoldersFilter
+		{
+			get => _filesAndFoldersFilter;
+			set => SetProperty(ref _filesAndFoldersFilter, value);
 		}
 
 

src/Files.App/Views/Shells/ModernShellPage.xaml.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Animation;
@@ -45,6 +46,7 @@ public ModernShellPage() : base(new CurrentInstanceViewModel())
 			ShellViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
 			ShellViewModel.GitDirectoryUpdated += FilesystemViewModel_GitDirectoryUpdated;
 			ShellViewModel.DirectoryInfoUpdated += ShellViewModel_DirectoryInfoUpdated;
+			ShellViewModel.FocusFilterHeader += ShellViewModel_FocusFilterHeader;
 
 			ToolbarViewModel.PathControlDisplayText = Strings.Home.GetLocalizedResource();
 			ToolbarViewModel.RefreshWidgetsRequested += ModernShellPage_RefreshWidgetsRequested;
@@ -53,6 +55,14 @@ public ModernShellPage() : base(new CurrentInstanceViewModel())
 			_navigationInteractionTracker.NavigationRequested += OverscrollNavigationRequested;
 		}
 
+		private async void ShellViewModel_FocusFilterHeader(object sender, EventArgs e)
+		{
+			// Delay to ensure the UI is ready for focus
+			await Task.Delay(100);
+			if (FilterTextBox?.IsLoaded ?? false)
+				FilterTextBox.Focus(FocusState.Programmatic);
+		}
+
 		private void ShellViewModel_DirectoryInfoUpdated(object sender, EventArgs e)
 		{
 			// Regular binding causes issues when refreshing the directory so we set the text manually
@@ -151,7 +161,7 @@ protected override async void ViewModel_WorkingDirectoryModified(object sender,
 		private async void ItemDisplayFrame_Navigated(object sender, NavigationEventArgs e)
 		{
 			ContentPage = await GetContentOrNullAsync();
-			
+
 			ToolbarViewModel.UpdateAdditionalActions();
 			if (ItemDisplayFrame.CurrentSourcePageType == (typeof(DetailsLayoutPage))
 				|| ItemDisplayFrame.CurrentSourcePageType == typeof(GridLayoutPage))