Fix: Fixed issue where archive files were incorrectly grouped by size (#11222)

Author: hishitetsu

src/Files.App/Helpers/ItemListDisplayHelpers/GroupingHelper.cs

@@ -18,7 +18,7 @@ public static Func<ListedItem, string> GetItemGroupKeySelector(GroupOption optio
 			return option switch
 			{
 				GroupOption.Name => x => new string(x.Name.Take(1).ToArray()).ToUpperInvariant(),
-				GroupOption.Size => x => x.PrimaryItemAttribute != StorageItemTypes.Folder ? GetGroupSizeKey(x.FileSizeBytes) : x.FileSizeDisplay,
+				GroupOption.Size => x => x.PrimaryItemAttribute != StorageItemTypes.Folder || x.IsArchive ? GetGroupSizeKey(x.FileSizeBytes) : x.FileSizeDisplay,
 				GroupOption.DateCreated => x => dateTimeFormatter.ToTimeSpanLabel(x.ItemDateCreatedReal).Text,
 				GroupOption.DateModified => x => dateTimeFormatter.ToTimeSpanLabel(x.ItemDateModifiedReal).Text,
 				GroupOption.FileType => x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsShortcut ? x.ItemType : x.FileExtension?.ToLowerInvariant() ?? " ",
@@ -60,7 +60,7 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
 				GroupOption.Size => (x =>
 				{
 					var first = x.First();
-					if (first.PrimaryItemAttribute != StorageItemTypes.Folder)
+					if (first.PrimaryItemAttribute != StorageItemTypes.Folder || first.IsArchive)
 					{
 						var vals = GetGroupSizeInfo(first.FileSizeBytes);
 						//x.Model.Text = vals.text;

src/Files.App/ViewModels/ItemViewModel.cs

@@ -710,15 +710,17 @@ private void OrderGroups(CancellationToken token = default)
 			{
 				if (folderSettings.DirectoryGroupOption == GroupOption.Size)
 					// Always show file sections below folders
-					FilesAndFolders.GroupedCollection.Order(x => x.OrderBy(y => y.First().PrimaryItemAttribute != StorageItemTypes.Folder).ThenBy(y => y.Model.SortIndexOverride).ThenBy(y => y.Model.Text));
+					FilesAndFolders.GroupedCollection.Order(x => x.OrderBy(y => y.First().PrimaryItemAttribute != StorageItemTypes.Folder || y.First().IsArchive)
+						.ThenBy(y => y.Model.SortIndexOverride).ThenBy(y => y.Model.Text));
 				else
 					FilesAndFolders.GroupedCollection.Order(x => x.OrderBy(y => y.Model.SortIndexOverride).ThenBy(y => y.Model.Text));
 			}
 			else
 			{
 				if (folderSettings.DirectoryGroupOption == GroupOption.Size)
 					// Always show file sections below folders
-					FilesAndFolders.GroupedCollection.Order(x => x.OrderBy(y => y.First().PrimaryItemAttribute != StorageItemTypes.Folder).ThenByDescending(y => y.Model.SortIndexOverride).ThenByDescending(y => y.Model.Text));
+					FilesAndFolders.GroupedCollection.Order(x => x.OrderBy(y => y.First().PrimaryItemAttribute != StorageItemTypes.Folder || y.First().IsArchive)
+						.ThenByDescending(y => y.Model.SortIndexOverride).ThenByDescending(y => y.Model.Text));
 				else
 					FilesAndFolders.GroupedCollection.Order(x => x.OrderByDescending(y => y.Model.SortIndexOverride).ThenByDescending(y => y.Model.Text));
 			}