Fix: Fixed opening a tag from sidebar in a new tab (#10665)

Author: gave92

src/Files.App/Helpers/ContextFlyoutItemHelper.cs

@@ -538,7 +538,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Text = "BaseLayoutItemContextFlyoutPinToFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE840",
 					Command = commandsViewModel.PinDirectoryToFavoritesCommand,
-					ShowItem = !itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = itemViewModel.CurrentFolder is not null && !itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
 					ShowInFtpPage = true,
 					ShowInRecycleBin = true,
 				},
@@ -547,7 +547,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Text = "BaseLayoutContextFlyoutUnpinFromFavorites/Text".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = commandsViewModel.UnpinDirectoryFromFavoritesCommand,
-					ShowItem = itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
+					ShowItem = itemViewModel.CurrentFolder is not null && itemViewModel.CurrentFolder.IsPinned & userSettingsService.AppearanceSettingsService.ShowFavoritesSection,
 					ShowInFtpPage = true,
 					ShowInRecycleBin = true,
 				},
@@ -558,7 +558,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Command = commandsViewModel.PinItemToStartCommand,
 					ShowInFtpPage = true,
 					ShowOnShift = true,
-					ShowItem = !itemViewModel.CurrentFolder.IsItemPinnedToStart,
+					ShowItem = itemViewModel.CurrentFolder is not null && !itemViewModel.CurrentFolder.IsItemPinnedToStart,
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
@@ -567,7 +567,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
 					Command = commandsViewModel.UnpinItemFromStartCommand,
 					ShowInFtpPage = true,
 					ShowOnShift = true,
-					ShowItem = itemViewModel.CurrentFolder.IsItemPinnedToStart,
+					ShowItem = itemViewModel.CurrentFolder is not null && itemViewModel.CurrentFolder.IsItemPinnedToStart,
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{

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

@@ -77,10 +77,10 @@ public bool IsCurrentInstance
 
 		public bool IsColumnView => SlimContentPage is ColumnViewBrowser;
 
-		public ItemViewModel FilesystemViewModel { get; private set; } = null;
+		public ItemViewModel FilesystemViewModel { get; private set; }
 		public CurrentInstanceViewModel InstanceViewModel { get; }
-		private BaseLayout contentPage = null;
 
+		private BaseLayout contentPage;
 		public BaseLayout ContentPage
 		{
 			get => contentPage;
@@ -96,7 +96,6 @@ public BaseLayout ContentPage
 		}
 
 		private bool isPageMainPane;
-
 		public bool IsPageMainPane
 		{
 			get => isPageMainPane;
@@ -143,6 +142,13 @@ public ModernShellPage()
 			FilesystemHelpers = new FilesystemHelpers(this, cancellationTokenSource.Token);
 			storageHistoryHelpers = new StorageHistoryHelpers(new StorageHistoryOperations(this, cancellationTokenSource.Token));
 
+			FilesystemViewModel = new ItemViewModel(InstanceViewModel.FolderSettings);
+			FilesystemViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
+			FilesystemViewModel.ItemLoadStatusChanged += FilesystemViewModel_ItemLoadStatusChanged;
+			FilesystemViewModel.DirectoryInfoUpdated += FilesystemViewModel_DirectoryInfoUpdated;
+			FilesystemViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
+			FilesystemViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
+
 			ToolbarViewModel.SearchBox.TextChanged += ModernShellPage_TextChanged;
 			ToolbarViewModel.SearchBox.QuerySubmitted += ModernShellPage_QuerySubmitted;
 			ToolbarViewModel.InstanceViewModel = InstanceViewModel;
@@ -514,20 +520,29 @@ public NavigationParams NavParams
 		private void OnNavigationParamsChanged()
 		{
 			if (string.IsNullOrEmpty(NavParams?.NavPath) || NavParams.NavPath == "Home".GetLocalizedResource())
+			{
 				ItemDisplayFrame.Navigate(typeof(WidgetsPage),
 					new NavigationArguments()
 					{
 						NavPathParam = NavParams?.NavPath,
 						AssociatedTabInstance = this
 					}, new EntranceNavigationTransitionInfo());
+			}
 			else
+			{
+				var isTagSearch = NavParams.NavPath.StartsWith("tag:");
+
 				ItemDisplayFrame.Navigate(InstanceViewModel.FolderSettings.GetLayoutType(NavParams.NavPath),
 					new NavigationArguments()
 					{
 						NavPathParam = NavParams.NavPath,
 						SelectItems = !string.IsNullOrWhiteSpace(NavParams?.SelectItem) ? new[] { NavParams.SelectItem } : null,
+						IsSearchResultPage = isTagSearch,
+						SearchPathParam = isTagSearch ? "Home".GetLocalizedResource() : null,
+						SearchQuery = isTagSearch ? navParams.NavPath : null,
 						AssociatedTabInstance = this
 					});
+			}
 		}
 
 		public static readonly DependencyProperty NavParamsProperty =
@@ -574,12 +589,6 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
 
 		private void Page_Loaded(object sender, RoutedEventArgs e)
 		{
-			FilesystemViewModel = new ItemViewModel(InstanceViewModel?.FolderSettings);
-			FilesystemViewModel.WorkingDirectoryModified += ViewModel_WorkingDirectoryModified;
-			FilesystemViewModel.ItemLoadStatusChanged += FilesystemViewModel_ItemLoadStatusChanged;
-			FilesystemViewModel.DirectoryInfoUpdated += FilesystemViewModel_DirectoryInfoUpdated;
-			FilesystemViewModel.PageTypeUpdated += FilesystemViewModel_PageTypeUpdated;
-			FilesystemViewModel.OnSelectionRequestedEvent += FilesystemViewModel_OnSelectionRequestedEvent;
 			OnNavigationParamsChanged();
 			this.Loaded -= Page_Loaded;
 		}

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

@@ -271,7 +271,7 @@ private void Pane_ContentChanged(object sender, TabItemArguments e)
 				InitialPageType = typeof(PaneHolderPage),
 				NavigationArg = new PaneNavigationArguments()
 				{
-					LeftPaneNavPathParam = e?.NavigationArg as string ?? PaneLeft.TabItemArguments?.NavigationArg as string,
+					LeftPaneNavPathParam = PaneLeft.TabItemArguments?.NavigationArg as string ?? e?.NavigationArg as string,
 					RightPaneNavPathParam = IsRightPaneVisible ? PaneRight?.TabItemArguments?.NavigationArg as string : null
 				}
 			};