Fix: Fixed issues with grouping by tags (#16740)

Author: ferrariofilippo

src/Files.App/UserControls/Menus/FileTagsContextMenu.cs

@@ -14,6 +14,12 @@ public sealed class FileTagsContextMenu : MenuFlyout
 		private IFileTagsSettingsService FileTagsSettingsService { get; } =
 			Ioc.Default.GetService<IFileTagsSettingsService>();
 
+		/// <summary>
+		/// Event fired when an item's tags are updated (added/removed).
+		/// Used to refresh groups in ShellViewModel.
+		/// </summary>
+		public event EventHandler? TagsChanged;
+
 		public IEnumerable<ListedItem> SelectedItems { get; }
 
 		public FileTagsContextMenu(IEnumerable<ListedItem> selectedItems)
@@ -81,6 +87,7 @@ private void RemoveFileTag(IEnumerable<ListedItem> selectedListedItems, TagViewM
 					selectedItem.FileTags = tagList;
 				}
 			}
+			TagsChanged?.Invoke(this, EventArgs.Empty);
 		}
 
 		private void AddFileTag(IEnumerable<ListedItem> selectedListedItems, TagViewModel added)
@@ -93,6 +100,7 @@ private void AddFileTag(IEnumerable<ListedItem> selectedListedItems, TagViewMode
 					selectedItem.FileTags = [.. existingTags, added.Uid];
 				}
 			}
+			TagsChanged?.Invoke(this, EventArgs.Empty);
 		}
 	}
 }

src/Files.App/ViewModels/ShellViewModel.cs

@@ -146,6 +146,7 @@ public GitProperties EnabledGitProperties
 		private CancellationTokenSource loadPropsCTS;
 		private CancellationTokenSource watcherCTS;
 		private CancellationTokenSource searchCTS;
+		private CancellationTokenSource updateTagGroupCTS;
 
 		public event EventHandler DirectoryInfoUpdated;
 
@@ -1315,9 +1316,41 @@ await SafetyExtensions.IgnoreExceptions(() =>
 			finally
 			{
 				itemLoadQueue.TryRemove(item.ItemPath, out _);
+				await RefreshTagGroups();
 			}
 		}
 
+		public async Task RefreshTagGroups()
+		{
+			if (FilesAndFolders.IsGrouped &&
+				folderSettings.DirectoryGroupOption is GroupOption.FileTag &&
+				itemLoadQueue.IsEmpty())
+			{
+				updateTagGroupCTS?.Cancel();
+				updateTagGroupCTS = new();
+
+				await GroupOptionsUpdatedAsync(updateTagGroupCTS.Token);
+			}
+		}
+
+		public Task UpdateItemsTags(Dictionary<string, string[]> newTags)
+		{
+			return dispatcherQueue.EnqueueOrInvokeAsync(() =>
+			{
+				int count = newTags.Count;
+				foreach(var item in FilesAndFolders)
+				{
+					if (newTags.TryGetValue(item.ItemPath, out var tags))
+					{
+						item.FileTags = tags;
+						if (--count == 0)
+							break;
+					}
+				}
+			},
+			Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
+		}
+
 		private bool CheckElevationRights(ListedItem item)
 		{
 			if (item.SyncStatusUI.LoadSyncStatus)

src/Files.App/ViewModels/UserControls/InfoPaneViewModel.cs

@@ -485,7 +485,23 @@ private void UpdateTagsItems()
 
 			SelectedItem?.FileTagsUI?.ForEach(tag => Items.Add(new TagItem(tag)));
 
-			Items.Add(new FlyoutItem(new Files.App.UserControls.Menus.FileTagsContextMenu(new List<ListedItem>() { SelectedItem })));
+			var contextMenu = new Files.App.UserControls.Menus.FileTagsContextMenu(new List<ListedItem>() { SelectedItem });
+			contextMenu.Closed += HandleClosed;
+			contextMenu.TagsChanged += RequireTagGroupsUpdate;
+
+			Items.Add(new FlyoutItem(contextMenu));
+
+			async void RequireTagGroupsUpdate(object? sender, EventArgs e)
+			{
+				if (contentPageContext.ShellPage is not null)
+					await contentPageContext.ShellPage.ShellViewModel.RefreshTagGroups();
+			}
+
+			void HandleClosed(object? sender, object e)
+			{
+				contextMenu.TagsChanged -= RequireTagGroupsUpdate;
+				contextMenu.Closed -= HandleClosed;
+			}
 		}
 
 		private void SetDriveItem()

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

@@ -1267,6 +1267,7 @@ private async Task HandleTagItemDroppedAsync(FileTagItem fileTagItem, ItemDroppe
 		{
 			var storageItems = await Utils.Storage.FilesystemHelpers.GetDraggedStorageItems(args.DroppedItem);
 			var dbInstance = FileTagsHelper.GetDbInstance();
+			var pathToTags = new Dictionary<string, string[]>();
 			foreach (var item in storageItems.Where(x => !string.IsNullOrEmpty(x.Path)))
 			{
 				var filesTags = FileTagsHelper.ReadFileTag(item.Path);
@@ -1276,8 +1277,15 @@ private async Task HandleTagItemDroppedAsync(FileTagItem fileTagItem, ItemDroppe
 					var fileFRN = await FileTagsHelper.GetFileFRN(item.Item);
 					dbInstance.SetTags(item.Path, fileFRN, filesTags);
 					FileTagsHelper.WriteFileTag(item.Path, filesTags);
+					pathToTags[item.Path] = filesTags;
 				}
 			}
+
+			if (paneHolder.ActivePane is not null)
+			{
+				await paneHolder.ActivePane.ShellViewModel.UpdateItemsTags(pathToTags);
+				await paneHolder.ActivePane.ShellViewModel.RefreshTagGroups();
+			}
 		}
 
 		private static DragEventArgs CompleteDragEventArgs(DragEventArgs e, string captionText, DataPackageOperation operationType)

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -764,6 +764,21 @@ private void AddNewFileTagsToMenu(CommandBarFlyout contextMenu)
 				},
 				Flyout = fileTagsContextMenu
 			});
+
+			fileTagsContextMenu.TagsChanged += RequireTagGroupsUpdate;
+			fileTagsContextMenu.Closed += HandleClosed;
+
+			async void RequireTagGroupsUpdate(object? sender, EventArgs e)
+			{
+				if (ParentShellPageInstance is not null)
+					await ParentShellPageInstance.ShellViewModel.RefreshTagGroups();
+			}
+
+			void HandleClosed(object? sender, object e)
+			{
+				fileTagsContextMenu.TagsChanged -= RequireTagGroupsUpdate;
+				fileTagsContextMenu.Closed -= HandleClosed;
+			}
 		}
 
 		private async Task AddShellMenuItemsAsync(List<ContextMenuFlyoutItemViewModel> shellMenuItems, CommandBarFlyout contextMenuFlyout, bool shiftPressed)

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

@@ -938,7 +938,7 @@ private void FileTag_PointerExited(object sender, PointerRoutedEventArgs e)
 			VisualStateManager.GoToState((UserControl)sender, "Normal", true);
 		}
 
-		private void RemoveTagIcon_Tapped(object sender, TappedRoutedEventArgs e)
+		private async void RemoveTagIcon_Tapped(object sender, TappedRoutedEventArgs e)
 		{
 			var parent = (sender as FontIcon)?.Parent as StackPanel;
 			var tagName = (parent?.Children[TAG_TEXT_BLOCK] as TextBlock)?.Text;
@@ -953,6 +953,9 @@ private void RemoveTagIcon_Tapped(object sender, TappedRoutedEventArgs e)
 				item.FileTags = item.FileTags
 					.Except([tagId])
 					.ToArray();
+
+				if (ParentShellPageInstance is not null)
+					await ParentShellPageInstance.ShellViewModel.RefreshTagGroups();
 			}
 
 			e.Handled = true;