Code Quality: Store sidebar group expansion state

Author: yair100

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

@@ -170,6 +170,41 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool ShowFileTagsSection { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating if the pinned section should be expanded.
+		/// </summary>
+		bool IsPinnedSectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the library section should be expanded.
+		/// </summary>
+		bool IsLibrarySectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the drive section should be expanded.
+		/// </summary>
+		bool IsDriveSectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the cloud drive section should be expanded.
+		/// </summary>
+		bool IsCloudDriveSectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the network section should be expanded.
+		/// </summary>
+		bool IsNetworkSectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the wsl section should be expanded.
+		/// </summary>
+		bool IsWslSectionExpanded { get; set; }
+
+		/// <summary>
+		/// Gets or sets a value indicating if the file tags section should be expanded.
+		/// </summary>
+		bool IsFileTagsSectionExpanded { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to move shell extensions into a sub menu.
 		/// </summary>

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -209,6 +209,48 @@ public bool ShowFileTagsSection
 			set => Set(value);
 		}
 
+		public bool IsPinnedSectionExpanded
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
+		public bool IsLibrarySectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool IsDriveSectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool IsCloudDriveSectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool IsNetworkSectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool IsWslSectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
+		public bool IsFileTagsSectionExpanded
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public bool MoveShellExtensionsToSubMenu
 		{
 			get => Get(true);

src/Files.App/ViewModels/UserControls/SidebarViewModel.TabExpansion.cs

@@ -8,14 +8,8 @@ namespace Files.App.ViewModels.UserControls
 {
 	public sealed partial class SidebarViewModel
 	{
-		// Each tab is the sole source of truth for its own expansion (sections and folders alike); Pinned/Drives/CloudDrives are seeded as expanded so a fresh tab matches the historical defaults.
+		// Each tab is the sole source of truth for its own expansion (sections and folders alike); section expansion is additionally mirrored into the per-section IGeneralSettingsService.Is*SectionExpanded bools so it survives across sessions and seeds freshly opened tabs.
 		private static readonly string[] SectionKeyByEnum = BuildSectionKeyByEnum();
-		private static readonly string[] DefaultExpandedSectionKeys =
-		{
-			SectionKeyByEnum[(int)SectionType.Pinned],
-			SectionKeyByEnum[(int)SectionType.Drives],
-			SectionKeyByEnum[(int)SectionType.CloudDrives],
-		};
 
 		private static string[] BuildSectionKeyByEnum()
 		{
@@ -26,6 +20,54 @@ private static string[] BuildSectionKeyByEnum()
 			return arr;
 		}
 
+		private IEnumerable<string> GetPersistedExpandedSectionKeys()
+		{
+			var general = UserSettingsService.GeneralSettingsService;
+			if (general.IsPinnedSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.Pinned];
+			if (general.IsLibrarySectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.Library];
+			if (general.IsDriveSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.Drives];
+			if (general.IsCloudDriveSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.CloudDrives];
+			if (general.IsNetworkSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.Network];
+			if (general.IsWslSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.WSL];
+			if (general.IsFileTagsSectionExpanded)
+				yield return SectionKeyByEnum[(int)SectionType.FileTag];
+		}
+
+		private void PersistSectionExpansion(SectionType section, bool isExpanded)
+		{
+			var general = UserSettingsService.GeneralSettingsService;
+			switch (section)
+			{
+				case SectionType.Pinned:
+					general.IsPinnedSectionExpanded = isExpanded;
+					break;
+				case SectionType.Library:
+					general.IsLibrarySectionExpanded = isExpanded;
+					break;
+				case SectionType.Drives:
+					general.IsDriveSectionExpanded = isExpanded;
+					break;
+				case SectionType.CloudDrives:
+					general.IsCloudDriveSectionExpanded = isExpanded;
+					break;
+				case SectionType.Network:
+					general.IsNetworkSectionExpanded = isExpanded;
+					break;
+				case SectionType.WSL:
+					general.IsWslSectionExpanded = isExpanded;
+					break;
+				case SectionType.FileTag:
+					general.IsFileTagsSectionExpanded = isExpanded;
+					break;
+			}
+		}
+
 		private readonly Dictionary<TabBarItem, HashSet<string>> tabExpansionState = new();
 		private readonly HashSet<INotifyPropertyChanged> trackedItems = new();
 		private readonly HashSet<INotifyCollectionChanged> trackedChildCollections = new();
@@ -113,8 +155,8 @@ private HashSet<string> GetOrInitTabState(TabBarItem tab)
 		{
 			if (!tabExpansionState.TryGetValue(tab, out var state))
 			{
-				state = new HashSet<string>(DefaultExpandedSectionKeys, StringComparer.OrdinalIgnoreCase);
-				// Inherit whatever section state the user currently sees so a freshly opened tab matches expectation rather than snapping back to defaults.
+				state = new HashSet<string>(GetPersistedExpandedSectionKeys(), StringComparer.OrdinalIgnoreCase);
+				// Inherit whatever section state the user currently sees so a freshly opened tab matches expectation rather than snapping back to the persisted baseline.
 				foreach (var sectionObj in sidebarItems)
 				{
 					if (sectionObj is LocationItem section && section.IsExpanded)
@@ -231,6 +273,8 @@ private void CaptureExpansionToCurrentTab(INavigationControlItem item)
 				state.Add(key);
 			else
 				state.Remove(key);
+			if (item is LocationItem { IsHeader: true } section)
+				PersistSectionExpansion(section.Section, item.IsExpanded);
 		}
 
 		// Restores expansion for the initial pass over sidebarItems and for items realized later (async section sync, lazy-loaded subfolders).