Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Core/Components/DataGrid/Columns/SelectColumn.cs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public DataGridSelectMode SelectMode
/// Null is undefined.
/// </summary>
[Parameter]
public bool? SelectAll { get; set; } = false;
public bool? SelectAll { get; set; }

/// <summary>
/// Gets or sets the action to be executed when the [All] checkbox is clicked.
Expand Down Expand Up @@ -394,15 +394,15 @@ private Icon GetIcon(bool? selected)
{
DataGridSelectMode.Single => IconSelectedSingle,
DataGridSelectMode.SingleSticky => IconSelectedSingle,
_ => IconSelectedMultiple
_ => IconSelectedMultiple,
};
}

return IconUnchecked ?? SelectMode switch
{
DataGridSelectMode.Single => IconUnselectedSingle,
DataGridSelectMode.SingleSticky => IconUnselectedSingle,
_ => IconUnselectedMultiple
_ => IconUnselectedMultiple,
};
}

Expand Down Expand Up @@ -543,7 +543,7 @@ private void RefreshHeaderContent()
// Using SelectedItems only
if (InternalGridContext != null && (Grid.Items != null || Grid.ItemsProvider != null))
{
if (_selectedItems.Count == 0)
if (_selectedItems.Count == 0 && !InternalGridContext.Items.Any(Property))
{
Comment thread
vnbaaij marked this conversation as resolved.
Outdated
return false;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Core/Components/DataGrid/FluentDataGrid.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,9 @@ private string AriaSortValue(ColumnBase<TGridItem> column)
public override ValueTask DisposeAsync()
{
_currentPageItemsChanged.Dispose();
#pragma warning disable MA0042 // Do not use blocking calls in an async method
_scope?.Dispose();
#pragma warning restore MA0042 // Do not use blocking calls in an async method

return base.DisposeAsync();
}
Expand Down
Loading