Fix: Fixed issue where opening tags from the sidebar would default to the Details View (#14523)

yaira2 · web-flow · commit f6f590a5b723 · 2024-01-22T13:05:57.000-08:00
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -506,9 +506,11 @@ public void NavigateWithArguments(Type sourcePageType, NavigationArguments navAr
 
 		public void NavigateToPath(string navigationPath, NavigationArguments? navArgs = null)
 		{
-			var layout = navigationPath.StartsWith("tag:")
-				? typeof(DetailsLayoutPage)
-				: FolderSettings.GetLayoutType(navigationPath);
+			var layout = FolderSettings.GetLayoutType(navigationPath);
+
+			// Don't use Columns Layout for displaying tags
+			if (navigationPath.StartsWith("tag:") && layout == typeof(ColumnsLayoutPage))
+				layout = typeof(DetailsLayoutPage);
 
 			NavigateToPath(navigationPath, layout, navArgs);
 		}

Original file line number	Diff line number	Diff line change
`@@ -506,9 +506,11 @@ public void NavigateWithArguments(Type sourcePageType, NavigationArguments navAr`
`506`	`506`
`507`	`507`	`public void NavigateToPath(string navigationPath, NavigationArguments? navArgs = null)`
`508`	`508`	`{`
`509`		`- var layout = navigationPath.StartsWith("tag:")`
`510`		`- ? typeof(DetailsLayoutPage)`
`511`		`- : FolderSettings.GetLayoutType(navigationPath);`
	`509`	`+ var layout = FolderSettings.GetLayoutType(navigationPath);`
	`510`	`+`
	`511`	`+ // Don't use Columns Layout for displaying tags`
	`512`	`+ if (navigationPath.StartsWith("tag:") && layout == typeof(ColumnsLayoutPage))`
	`513`	`+ layout = typeof(DetailsLayoutPage);`
`512`	`514`
`513`	`515`	`NavigateToPath(navigationPath, layout, navArgs);`
`514`	`516`	`}`