Code Quality: Fixed issue where Omnibar returned focus to wrong pane

Author: yaira2

src/Files.App/Data/Contracts/IShellPanesPage.cs

@@ -64,6 +64,11 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged
 		/// </summary>
 		public void FocusOtherPane();
 
+		/// <summary>
+		/// Focuses the active pane.
+		/// </summary>
+		public void FocusActivePane();
+
 		/// <summary>
 		/// Gets open panes.
 		/// </summary>

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

@@ -177,7 +177,7 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 			if (mode == OmnibarPathMode)
 			{
 				await ViewModel.HandleItemNavigationAsync(args.Text);
-				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 				return;
 			}
 
@@ -197,7 +197,7 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 						continue;
 
 					await command.ExecuteAsync();
-					(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+					ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 					return;
 				}
 
@@ -214,14 +214,14 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 						await overload?.InvokeAsync(actionInstance.Context);
 					}
 
-					(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+					ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 					return;
 				}
 
 				await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedResource(),
 					string.Format(Strings.InvalidCommandContent.GetLocalizedResource(), args.Text));
 
-				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 				return;
 			}
 
@@ -242,7 +242,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 					ViewModel.SaveSearchQueryToList(searchQuery);
 				}
 
-				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 				return;
 			}
 		}
@@ -423,7 +423,7 @@ private async void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 			if (e.Key is VirtualKey.Escape)
 			{
 				Omnibar.IsFocused = false;
-				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+				ContentPageContext.ShellPage!.PaneHolder.FocusActivePane();
 			}
 			else if (e.Key is VirtualKey.Tab && Omnibar.IsFocused && !InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down))
 			{

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

@@ -369,6 +369,15 @@ public void FocusOtherPane()
 				GetPane(0)?.Focus(FocusState.Programmatic);
 		}
 
+		/// <inheritdoc/>
+		public void FocusActivePane()
+		{
+			if (ActivePane == (IShellPage)GetPane(0)!)
+				GetPane(0)?.Focus(FocusState.Programmatic);
+			else
+				GetPane(1)?.Focus(FocusState.Programmatic);
+		}
+
 		/// <inheritdoc/>
 		public IEnumerable<ModernShellPage> GetPanes()
 		{