Skip to content

Commit 5adb782

Browse files
authored
Merge pull request #661 from jbetancur/fix/650
fix incorrect selected row count when using selectableRowDisabled
2 parents 5e8fce5 + 19ac5a3 commit 5adb782

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/DataTable/TableColCheckbox.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ const TableColCheckbox = ({ head }) => {
2828
const indeterminate = selectedRows.length > 0 && !allSelected;
2929
const rows = selectableRowDisabled ? data.filter(row => !selectableRowDisabled(row)) : data;
3030
const isDisabled = rows.length === 0;
31-
const rowCount = data.length;
31+
// The row count should subtrtact rows that are disabled
32+
const rowCount = Math.min(data.length, rows.length);
3233

3334
const handleSelectAll = useCallback(() => dispatch({
3435
type: 'SELECT_ALL_ROWS',

0 commit comments

Comments
 (0)