Use generic arguments if possible to get type of elements in lists

CommunityToolkit · Aug 23, 2023 · 72bf0b1 · 72bf0b1
1 parent a9fdaab
commit 72bf0b1
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.cs b/components/Collections/src/AdvancedCollectionView/AdvancedCollectionView.cs
@@ -382,7 +382,18 @@ int IComparer<object>.Compare(object x, object y)
     {
         if (!_sortProperties.Any())
         {
-            var type = x.GetType();
+            var listType = _source?.GetType();
+            Type type;
+
+            if (listType != null && listType.IsGenericType)
+            {
+                type = listType.GetGenericArguments()[0];
+            }
+            else
+            {
+                type = x.GetType();
+            }
+
             foreach (var sd in _sortDescriptions)
             {
                 if (!string.IsNullOrEmpty(sd.PropertyName))