diff --git a/Maui.DataGrid/CompatibilitySuppressions.xml b/Maui.DataGrid/CompatibilitySuppressions.xml index 5061d11..08c7a4f 100644 --- a/Maui.DataGrid/CompatibilitySuppressions.xml +++ b/Maui.DataGrid/CompatibilitySuppressions.xml @@ -78,6 +78,20 @@ lib/net7.0/Maui.DataGrid.dll true + + CP0002 + M:Maui.DataGrid.DataGridColumn.IsSortable + lib/net7.0/Maui.DataGrid.dll + lib/net7.0/Maui.DataGrid.dll + true + + + CP0002 + M:Maui.DataGrid.DataGridColumn.IsSortable(Maui.DataGrid.DataGrid) + lib/net7.0/Maui.DataGrid.dll + lib/net7.0/Maui.DataGrid.dll + true + CP0002 M:Maui.DataGrid.DataGridColumn.set_EditCellTemplate(Microsoft.Maui.Controls.DataTemplate) diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs index 7ac2aa6..31dcfc0 100644 --- a/Maui.DataGrid/DataGrid.xaml.cs +++ b/Maui.DataGrid/DataGrid.xaml.cs @@ -124,7 +124,7 @@ private bool CanSort(SortData? sortData) return false; } - if (!columnToSort.IsSortable(this)) + if (!columnToSort.IsSortable()) { Debug.WriteLine($"{columnToSort.PropertyName} column is not sortable"); return false; @@ -1220,7 +1220,7 @@ private View GetHeaderViewForColumn(DataGridColumn column) { column.HeaderLabel.Style = column.HeaderLabelStyle ?? HeaderLabelStyle ?? _defaultHeaderStyle; - if (!IsSortable || !column.SortingEnabled || !column.IsSortable(this)) + if (!IsSortable || !column.SortingEnabled || !column.IsSortable()) { return new ContentView { diff --git a/Maui.DataGrid/DataGridColumn.cs b/Maui.DataGrid/DataGridColumn.cs index fac07df..1381723 100644 --- a/Maui.DataGrid/DataGridColumn.cs +++ b/Maui.DataGrid/DataGridColumn.cs @@ -326,8 +326,7 @@ public Style HeaderLabelStyle /// Determines via reflection if the column's data type is sortable. /// If you want to disable sorting for specific column please use property /// - /// The to sort for. - public bool IsSortable(DataGrid dataGrid) + public bool IsSortable() { if (_isSortable is not null) { @@ -336,7 +335,7 @@ public bool IsSortable(DataGrid dataGrid) try { - if (dataGrid?.ItemsSource is null) + if (DataGrid?.ItemsSource is null) { _isSortable = false; }