Feature: Added option to always switch to newly created tab (#16613)

yaira2 · web-flow · commit d12b6ba60d1c · 2024-12-17T10:01:25.000-05:00
diff --git a/src/Files.App/Actions/Content/Tags/OpenAllTaggedActions.cs b/src/Files.App/Actions/Content/Tags/OpenAllTaggedActions.cs
@@ -47,7 +47,7 @@ public async Task ExecuteAsync(object? parameter = null)
 			await Task.WhenAll(filePaths.Select(path => NavigationHelpers.OpenPath(path, _pageContext.ShellPage!)));
 
 			foreach (var path in folderPaths) 
-				await NavigationHelpers.OpenPathInNewTab(path, false);
+				await NavigationHelpers.OpenPathInNewTab(path);
 		}
 
 		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromHomeAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromHomeAction.cs
@@ -23,7 +23,7 @@ public override async Task ExecuteAsync(object? parameter = null)
 			if (await DriveHelpers.CheckEmptyDrive(HomePageContext.RightClickedItem!.Path))
 				return;
 
-			await NavigationHelpers.OpenPathInNewTab(HomePageContext.RightClickedItem!.Path ?? string.Empty, false);
+			await NavigationHelpers.OpenPathInNewTab(HomePageContext.RightClickedItem!.Path ?? string.Empty);
 		}
 
 		protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs b/src/Files.App/Actions/Navigation/OpenInNewTab/OpenInNewTabFromSidebarAction.cs
@@ -21,7 +21,7 @@ public override async Task ExecuteAsync(object? parameter = null)
 			if (await DriveHelpers.CheckEmptyDrive(SidebarContext.RightClickedItem!.Path))
 				return;
 
-			await NavigationHelpers.OpenPathInNewTab(SidebarContext.RightClickedItem!.Path ?? string.Empty, false);
+			await NavigationHelpers.OpenPathInNewTab(SidebarContext.RightClickedItem!.Path ?? string.Empty);
 		}
 
 		protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
diff --git a/src/Files.App/Data/Contracts/IGeneralSettingsService.cs b/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
@@ -60,6 +60,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool AlwaysOpenDualPaneInNewTab { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to always switch to newly opened tab.
+		/// </summary>
+		bool AlwaysSwitchToNewlyOpenedTab { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to display the quick access widget.
 		/// </summary>
@@ -114,7 +119,7 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// Gets or sets a value indicating if the favorites section should be visible.
 		/// </summary>
 		bool ShowPinnedSection { get; set; }
-		
+
 		/// <summary>
 		/// Gets or sets a value indicating if the favorites section should be expanded.
 		/// </summary>
@@ -244,7 +249,7 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// Gets or sets a value indicating whether or not to leave app running in the background.
 		/// </summary>
 		bool LeaveAppRunning { get; set; }
-		
+
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to show Files in the system tray.
 		/// </summary>
diff --git a/src/Files.App/Helpers/Navigation/NavigationHelpers.cs b/src/Files.App/Helpers/Navigation/NavigationHelpers.cs
@@ -5,32 +5,50 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
-using Windows.Storage.Search;
-using Microsoft.UI.Xaml.Media;
+using System.IO;
 using Windows.Storage;
+using Windows.Storage.Search;
 using Windows.System;
-using System.IO;
 
 namespace Files.App.Helpers
 {
 	public static class NavigationHelpers
 	{
+		private static readonly IGeneralSettingsService GeneralSettingsService = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
+
 		private static readonly IWindowsRecentItemsService WindowsRecentItemsService = Ioc.Default.GetRequiredService<IWindowsRecentItemsService>();
 		private static MainPageViewModel MainPageViewModel { get; } = Ioc.Default.GetRequiredService<MainPageViewModel>();
 		private static DrivesViewModel DrivesViewModel { get; } = Ioc.Default.GetRequiredService<DrivesViewModel>();
 		private static INetworkService NetworkService { get; } = Ioc.Default.GetRequiredService<INetworkService>();
 
-		public static Task OpenPathInNewTab(string? path, bool focusNewTab)
+		/// <summary>
+		/// Opens the path in a new tab.
+		/// </summary>
+		/// <param name="path">The path to open in a new tab.</param>
+		/// <param name="switchToNewTab">Indicates whether to switch to the new tab.</param>
+		/// <returns></returns>
+		public static Task OpenPathInNewTab(string? path, bool switchToNewTab)
+		{
+			return AddNewTabByPathAsync(typeof(ShellPanesPage), path, switchToNewTab);
+		}
+
+		/// <summary>
+		/// Opens the path in a new tab and automatically switches to the newly
+		/// created tab if configured in settings.
+		/// </summary>
+		/// <param name="path">The path to open in a new tab.</param>
+		/// <returns></returns>
+		public static Task OpenPathInNewTab(string? path)
 		{
-			return AddNewTabByPathAsync(typeof(ShellPanesPage), path, focusNewTab);
+			return AddNewTabByPathAsync(typeof(ShellPanesPage), path, GeneralSettingsService.AlwaysSwitchToNewlyOpenedTab);
 		}
 
 		public static Task AddNewTabAsync()
 		{
 			return AddNewTabByPathAsync(typeof(ShellPanesPage), "Home", true);
 		}
 
-		public static async Task AddNewTabByPathAsync(Type type, string? path, bool focusNewTab, int atIndex = -1)
+		public static async Task AddNewTabByPathAsync(Type type, string? path, bool switchToNewTab, int atIndex = -1)
 		{
 			if (string.IsNullOrEmpty(path))
 			{
@@ -63,7 +81,7 @@ public static async Task AddNewTabByPathAsync(Type type, string? path, bool focu
 
 			MainPageViewModel.AppInstances.Insert(index, tabItem);
 
-			if (focusNewTab)
+			if (switchToNewTab)
 				App.AppModel.TabStripSelectedIndex = index;
 		}
 
diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs
@@ -77,6 +77,12 @@ public bool AlwaysOpenDualPaneInNewTab
 			set => Set(value);
 		}
 
+		public bool AlwaysSwitchToNewlyOpenedTab
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public bool ShowQuickAccessWidget
 		{
 			get => Get(true);
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -4016,4 +4016,7 @@
   <data name="Total" xml:space="preserve">
     <value>Total</value>
   </data>
+  <data name="AlwaysSwitchToNewlyOpenedTab" xml:space="preserve">
+    <value>Always switch focus to newly created tab</value>
+  </data>
 </root>
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -38,7 +38,7 @@ sender is not Button button ||
 			if (await DriveHelpers.CheckEmptyDrive(path))
 				return;
 
-			await NavigationHelpers.OpenPathInNewTab(path, false);
+			await NavigationHelpers.OpenPathInNewTab(path);
 		}
 
 		private void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)
diff --git a/src/Files.App/UserControls/Widgets/NetworkLocationsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/NetworkLocationsWidget.xaml.cs
@@ -38,7 +38,7 @@ sender is not Button button ||
 			if (await DriveHelpers.CheckEmptyDrive(path))
 				return;
 
-			await NavigationHelpers.OpenPathInNewTab(path, false);
+			await NavigationHelpers.OpenPathInNewTab(path);
 		}
 
 		private void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -26,7 +26,7 @@ sender is not Button button ||
 				button.Tag.ToString() is not string path)
 				return;
 
-			await NavigationHelpers.OpenPathInNewTab(path, false);
+			await NavigationHelpers.OpenPathInNewTab(path);
 		}
 
 		private async void Button_Click(object sender, RoutedEventArgs e)
diff --git a/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs b/src/Files.App/ViewModels/Layouts/BaseLayoutViewModel.cs
@@ -64,9 +64,9 @@ private async Task ItemPointerPressedAsync(PointerRoutedEventArgs e)
 				_associatedInstance.SlimContentPage.IsMiddleClickToScrollEnabled = true;
 
 				if (Item.IsShortcut)
-					await NavigationHelpers.OpenPathInNewTab(((e.OriginalSource as FrameworkElement)?.DataContext as ShortcutItem)?.TargetPath ?? Item.ItemPath, false);
+					await NavigationHelpers.OpenPathInNewTab(((e.OriginalSource as FrameworkElement)?.DataContext as ShortcutItem)?.TargetPath ?? Item.ItemPath);
 				else
-					await NavigationHelpers.OpenPathInNewTab(Item.ItemPath, false);
+					await NavigationHelpers.OpenPathInNewTab(Item.ItemPath);
 			}
 		}
 
diff --git a/src/Files.App/ViewModels/Settings/GeneralViewModel.cs b/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
@@ -2,10 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using System.Collections.Specialized;
-using System.Globalization;
-using Windows.Globalization;
 using Windows.Storage;
-using Windows.Storage.Pickers;
 using Windows.System;
 using static Files.App.Helpers.MenuFlyoutHelper;
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
@@ -320,6 +317,20 @@ public bool AlwaysOpenDualPaneInNewTab
 			}
 		}
 
+		public bool AlwaysSwitchToNewlyOpenedTab
+		{
+			get => UserSettingsService.GeneralSettingsService.AlwaysSwitchToNewlyOpenedTab;
+			set
+			{
+				if (value != UserSettingsService.GeneralSettingsService.AlwaysSwitchToNewlyOpenedTab)
+				{
+					UserSettingsService.GeneralSettingsService.AlwaysSwitchToNewlyOpenedTab = value;
+
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		private void ChangePageAsync()
 		{
 			var result = CommonDialogService.Open_FileOpenDialog(MainWindow.Instance.WindowHandle, true, [], Environment.SpecialFolder.Desktop, out var filePath);
diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs
@@ -761,7 +761,7 @@ public async void HandleItemInvokedAsync(object item, PointerUpdateKind pointerU
 				middleClickPressed) &&
 				navigationControlItem.Path is not null)
 			{
-				await NavigationHelpers.OpenPathInNewTab(navigationControlItem.Path, false);
+				await NavigationHelpers.OpenPathInNewTab(navigationControlItem.Path);
 				return;
 			}
 
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -62,7 +62,7 @@ public async Task NavigateToPath(string path)
 			var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
 			if (ctrlPressed)
 			{
-				await NavigationHelpers.OpenPathInNewTab(path, false);
+				await NavigationHelpers.OpenPathInNewTab(path);
 				return;
 			}
 
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs
@@ -78,7 +78,7 @@ public async Task NavigateToPath(string path)
 			var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
 			if (ctrlPressed)
 			{
-				await NavigationHelpers.OpenPathInNewTab(path, false);
+				await NavigationHelpers.OpenPathInNewTab(path);
 				return;
 			}
 
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
@@ -209,7 +209,7 @@ public async Task NavigateToPath(string path)
 			var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
 			if (ctrlPressed)
 			{
-				await NavigationHelpers.OpenPathInNewTab(path, false);
+				await NavigationHelpers.OpenPathInNewTab(path);
 				return;
 			}
 
diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -438,7 +438,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
 					if (folders is not null)
 					{
 						foreach (ListedItem folder in folders)
-							await NavigationHelpers.OpenPathInNewTab(folder.ItemPath, false);
+							await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
 					}
 				}
 				else if (ctrlPressed && shiftPressed)
diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
@@ -445,7 +445,7 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
 					foreach (ListedItem? folder in folders)
 					{
 						if (folder is not null)
-							await NavigationHelpers.OpenPathInNewTab(folder.ItemPath, false);
+							await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
 					}
 				}
 				else if (ctrlPressed && shiftPressed)
diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml b/src/Files.App/Views/Settings/GeneralPage.xaml
@@ -185,6 +185,7 @@
 				</local:SettingsBlockControl.ExpandableContent>
 			</local:SettingsBlockControl>
 
+			<!--  Dual Pane  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xE89F;" />
@@ -205,6 +206,19 @@
 				</local:SettingsBlockControl.ExpandableContent>
 			</local:SettingsBlockControl>
 
+			<!--  Switch to new tab  -->
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=AlwaysSwitchToNewlyOpenedTab}" HorizontalAlignment="Stretch">
+				<local:SettingsBlockControl.Icon>
+					<FontIcon Glyph="&#xE8AB;" />
+				</local:SettingsBlockControl.Icon>
+				<ToggleSwitch
+					x:Name="AlwaysSwitchToNewlyOpenedTab"
+					AutomationProperties.Name="{helpers:ResourceString Name=AlwaysSwitchToNewlyOpenedTab}"
+					IsOn="{x:Bind ViewModel.AlwaysSwitchToNewlyOpenedTab, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</local:SettingsBlockControl>
+
+			<!--  Widgets  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=Widgets}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xF246;" />

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public async Task ExecuteAsync(object? parameter = null)`
`47`	`47`	`await Task.WhenAll(filePaths.Select(path => NavigationHelpers.OpenPath(path, _pageContext.ShellPage!)));`
`48`	`48`
`49`	`49`	`foreach (var path in folderPaths)`
`50`		`- await NavigationHelpers.OpenPathInNewTab(path, false);`
	`50`	`+ await NavigationHelpers.OpenPathInNewTab(path);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public override async Task ExecuteAsync(object? parameter = null)`
`23`	`23`	`if (await DriveHelpers.CheckEmptyDrive(HomePageContext.RightClickedItem!.Path))`
`24`	`24`	`return;`
`25`	`25`
`26`		`- await NavigationHelpers.OpenPathInNewTab(HomePageContext.RightClickedItem!.Path ?? string.Empty, false);`
	`26`	`+ await NavigationHelpers.OpenPathInNewTab(HomePageContext.RightClickedItem!.Path ?? string.Empty);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public override async Task ExecuteAsync(object? parameter = null)`
`21`	`21`	`if (await DriveHelpers.CheckEmptyDrive(SidebarContext.RightClickedItem!.Path))`
`22`	`22`	`return;`
`23`	`23`
`24`		`- await NavigationHelpers.OpenPathInNewTab(SidebarContext.RightClickedItem!.Path ?? string.Empty, false);`
	`24`	`+ await NavigationHelpers.OpenPathInNewTab(SidebarContext.RightClickedItem!.Path ?? string.Empty);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`protected override void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,12 @@ public bool AlwaysOpenDualPaneInNewTab`
`77`	`77`	`set => Set(value);`
`78`	`78`	`}`
`79`	`79`
	`80`	`+ public bool AlwaysSwitchToNewlyOpenedTab`
	`81`	`+ {`
	`82`	`+ get => Get(false);`
	`83`	`+ set => Set(value);`
	`84`	`+ }`
	`85`	`+`
`80`	`86`	`public bool ShowQuickAccessWidget`
`81`	`87`	`{`
`82`	`88`	`get => Get(true);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ sender is not Button button \|\|`
`38`	`38`	`if (await DriveHelpers.CheckEmptyDrive(path))`
`39`	`39`	`return;`
`40`	`40`
`41`		`- await NavigationHelpers.OpenPathInNewTab(path, false);`
	`41`	`+ await NavigationHelpers.OpenPathInNewTab(path);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private void Button_RightTapped(object sender, RightTappedRoutedEventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ sender is not Button button \|\|`
`26`	`26`	`button.Tag.ToString() is not string path)`
`27`	`27`	`return;`
`28`	`28`
`29`		`- await NavigationHelpers.OpenPathInNewTab(path, false);`
	`29`	`+ await NavigationHelpers.OpenPathInNewTab(path);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`private async void Button_Click(object sender, RoutedEventArgs e)`