Code Quality: Focus tab content when switching tabs

Author: yaira2

src/Files.App.Controls/Omnibar/Omnibar.Events.cs

@@ -56,9 +56,6 @@ private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
 
 			IsFocused = false;
 			IsFocusedChanged?.Invoke(this, new(IsFocused));
-
-			// Reset to the default mode when Omnibar loses focus
-			CurrentSelectedMode = Modes?.FirstOrDefault();
 		}
 
 		private async void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)

src/Files.App/Actions/Navigation/NextTabAction.cs

@@ -36,7 +36,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			// Small delay for the UI to load
 			await Task.Delay(500);
 
-			// Refocus on the file list
+			// Focus the content of the selected tab item (needed for keyboard navigation)
 			(multitaskingContext.CurrentTabItem.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 		}
 

src/Files.App/Actions/Navigation/PreviousTabAction.cs

@@ -39,7 +39,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			// Small delay for the UI to load
 			await Task.Delay(500);
 
-			// Refocus on the file list
+			// Focus the content of the selected tab item (needed for keyboard navigation)
 			(multitaskingContext.CurrentTabItem.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 		}
 

src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs

@@ -2,13 +2,16 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using System.Collections.Specialized;
 
 namespace Files.App.Data.Contexts
 {
 	internal sealed partial class MultitaskingContext : ObservableObject, IMultitaskingContext
 	{
+		private readonly MainPageViewModel MainPageViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
+
 		private bool isPopupOpen = false;
 
 		private ITabBar? control;
@@ -69,6 +72,9 @@ private void FocusManager_GotFocus(object? sender, FocusManagerGotFocusEventArgs
 			{
 				int newSelectedIndex = MainPageViewModel.AppInstances.IndexOf(tabItem);
 				UpdateSelectedTabIndex(newSelectedIndex);
+
+				// Focus the content of the selected tab item (needed for pointer navigation)
+				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 			}
 		}
 

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -510,6 +510,10 @@ await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 					await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
 				}
 			}
+			else
+			{
+				Omnibar.CurrentSelectedMode = OmnibarPathMode;
+			}
 		}
 
 		private async void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -390,7 +390,7 @@ private async void ExecuteNavigateToNumberedTabKeyboardAcceleratorCommand(Keyboa
 				// Small delay for the UI to load
 				await Task.Delay(500);
 
-				// Refocus on the file list
+				// Focus the content of the selected tab item (needed for keyboard navigation)
 				(SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 			}