Skip to content

Commit 6743f8a

Browse files
committed
Improve fix
1 parent 0f0d798 commit 6743f8a

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx

+8-13
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,15 @@ export const DatagridHeader = (props: DatagridHeaderProps) => {
6262

6363
const handleSelectAll = useCallback(
6464
event => {
65-
if (event.target.checked) {
66-
const all = ids.concat(
67-
selectedIds.filter(id => !ids.includes(id))
68-
);
69-
onSelect(
70-
isRowSelectable
71-
? all.filter(id =>
72-
data[id] ? isRowSelectable(data[id]) : true
65+
onSelect(
66+
event.target.checked
67+
? ids
68+
.filter(id =>
69+
isRowSelectable ? isRowSelectable(data[id]) : true
7370
)
74-
: all
75-
);
76-
} else {
77-
onSelect([]);
78-
}
71+
.concat(selectedIds.filter(id => !ids.includes(id)))
72+
: []
73+
);
7974
},
8075
[data, ids, onSelect, isRowSelectable, selectedIds]
8176
);

0 commit comments

Comments
 (0)