initialize column data type if needed

akgulebubekir · Dec 29, 2023 · e75a119 · e75a119
1 parent e638025
commit e75a119
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -1285,6 +1285,8 @@ private void InitHeaderView()
         {
             var col = Columns[i];
 
+            col.InitializeDataType();
+
             col.ColumnDefinition ??= new(col.Width);
 
             col.DataGrid ??= this;

diff --git a/Maui.DataGrid/DataGridColumn.cs b/Maui.DataGrid/DataGridColumn.cs
@@ -173,6 +173,8 @@ public event EventHandler SizeChanged
 
     internal SortingOrder SortingOrder { get; set; }
 
+    internal Type? DataType { get; private set; }
+
     internal DataGrid? DataGrid { get; set; }
 
     internal ColumnDefinition? ColumnDefinition
@@ -338,15 +340,9 @@ public bool IsSortable(DataGrid dataGrid)
             {
                 _isSortable = false;
             }
-            else
+            else if (DataType is not null)
             {
-                var listItemType = dataGrid.ItemsSource.GetType().GetGenericArguments().Single();
-                var columnDataType = listItemType.GetProperty(PropertyName)?.PropertyType;
-
-                if (columnDataType is not null)
-                {
-                    _isSortable = typeof(IComparable).IsAssignableFrom(columnDataType);
-                }
+                _isSortable = typeof(IComparable).IsAssignableFrom(DataType);
             }
         }
         catch
@@ -357,6 +353,17 @@ public bool IsSortable(DataGrid dataGrid)
         return _isSortable ??= false;
     }
 
+    internal void InitializeDataType()
+    {
+        ArgumentNullException.ThrowIfNull(DataGrid);
+
+        if (DataType == null && EditCellTemplate == null)
+        {
+            var rowDataType = DataGrid.ItemsSource.GetType().GetGenericArguments().Single();
+            DataType = rowDataType.GetProperty(PropertyName)?.PropertyType;
+        }
+    }
+
     private void OnSizeChanged() => _sizeChangedEventManager.HandleEvent(this, EventArgs.Empty, nameof(SizeChanged));
 
     #endregion Methods