Correctly return early if no columns exist

akgulebubekir · Dec 30, 2023 · e238055 · e238055
1 parent a14e64b
commit e238055
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -1254,8 +1254,9 @@ private void InitHeaderView()
         _headerView.Padding = new(BorderThickness.Left, BorderThickness.Top, BorderThickness.Right, 0);
         _headerView.ColumnSpacing = BorderThickness.HorizontalThickness;
 
-        if (Columns == null)
+        if (Columns == null || Columns.Count == 0)
         {
+            _headerView.ColumnDefinitions.Clear();
             return;
         }
 

diff --git a/Maui.DataGrid/DataGridRow.cs b/Maui.DataGrid/DataGridRow.cs
@@ -87,6 +87,12 @@ private void CreateView()
 
         SetStyling();
 
+        if (DataGrid.Columns == null || DataGrid.Columns.Count == 0)
+        {
+            ColumnDefinitions.Clear();
+            return;
+        }
+
         for (var i = 0; i < DataGrid.Columns.Count; i++)
         {
             var col = DataGrid.Columns[i];