Skip to content

Commit 0c99f40

Browse files
authored
[DataGrid] Only add Selectable items when using Select All (#3453)
* Only add Selecatable items when using Select All * Fix test by apllying correct default value
1 parent f0f1bf8 commit 0c99f40

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/Core/Components/DataGrid/Columns/SelectColumn.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// ------------------------------------------------------------------------
2+
// MIT License - Copyright (c) Microsoft Corporation. All rights reserved.
3+
// ------------------------------------------------------------------------
4+
15
using Microsoft.AspNetCore.Components;
26
using Microsoft.AspNetCore.Components.Rendering;
37
using Microsoft.AspNetCore.Components.Web;
@@ -528,7 +532,10 @@ internal async Task OnClickAllAsync(MouseEventArgs e)
528532
_selectedItems.Clear();
529533
if (SelectAll == true)
530534
{
531-
_selectedItems.AddRange(InternalGridContext.Grid.Items?.ToArray() ?? InternalGridContext.Items);
535+
// Only add selectable items
536+
_selectedItems.AddRange((InternalGridContext.Grid.Items?.ToList() ?? InternalGridContext.Items)
537+
.Where(item => Selectable?.Invoke(item) ?? true)
538+
);
532539
}
533540

534541
if (SelectedItemsChanged.HasDelegate)

0 commit comments

Comments
 (0)