Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,15 @@ export const MRT_SelectCheckbox = <TData extends MRT_RowData>({

const selectAll = !row;

const getLeafRows = () => (
selectAllMode === 'page'
? table.getPaginationRowModel().flatRows
: table.getPrePaginationRowModel().flatRows
).filter((r) => !r.getIsGrouped());

// Fix: getIsAllPageRowsSelected() / getIsAllRowsSelected() include group rows
const allRowsSelected = selectAll
? selectAllMode === 'page'
? table.getIsAllPageRowsSelected()
: table.getIsAllRowsSelected()
? getLeafRows().every((r) => r.getIsSelected())
: undefined;

const isChecked = selectAll
Expand Down Expand Up @@ -122,7 +127,8 @@ export const MRT_SelectCheckbox = <TData extends MRT_RowData>({
<Checkbox
indeterminate={
!isChecked && selectAll
? table.getIsSomeRowsSelected()
? // Fix: getIsSomeRowsSelected() includes group rows, use leaf-only filter
getLeafRows().some((r) => r.getIsSelected())
: row?.getIsSomeSelected() && row.getCanSelectSubRows()
}
{...commonProps}
Expand Down
27 changes: 24 additions & 3 deletions packages/material-react-table/src/utils/row.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,19 @@ export const getMRT_RowSelectionHandler =

const wasCurrentRowChecked = getIsRowSelected({ row, table });

// If this is a group row, toggle all its leaf sub-rows instead of itself
// to prevent the group row ID from entering rowSelection
if (row.getIsGrouped()) {
const newValue = value ?? !wasCurrentRowChecked;
row.getLeafRows().forEach((leafRow) => {
if (leafRow.getCanSelect()) {
leafRow.toggleSelected(newValue);
}
});
lastSelectedRowId.current = row.id;
return;
}

// toggle selection of this row
row.toggleSelected(value ?? !wasCurrentRowChecked);

Expand Down Expand Up @@ -250,9 +263,17 @@ export const getMRT_SelectAllHandler =
refs: { lastSelectedRowId },
} = table;

selectAllMode === 'all' || forceAll
? table.toggleAllRowsSelected(value ?? (event as any).target.checked)
: table.toggleAllPageRowsSelected(value ?? (event as any).target.checked);
// Fix: replaces toggleAllPageRowsSelected() / toggleAllRowsSelected() which
// include group rows in flatRows, causing group IDs to pollute rowSelection.
const checked = value ?? (event as any).target.checked;
const rows = (selectAllMode === 'all' || forceAll
? table.getPrePaginationRowModel().flatRows
: table.getPaginationRowModel().flatRows
).filter((row) => !row.getIsGrouped());
rows.forEach((row) => {
if (row.getCanSelect()) row.toggleSelected(checked);
});

if (enableRowPinning && rowPinningDisplayMode?.includes('select')) {
table.setRowPinning({ bottom: [], top: [] });
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { type MRT_ColumnDef, MaterialReactTable, useMaterialReactTable } from '../../src';
import { faker } from '@faker-js/faker';
import { type Meta } from '@storybook/react';

const meta: Meta = {
title: 'Fixed Bugs/Grouping RowSelection',
};

export default meta;

type Person = {
address: string;
city: string;
firstName: string;
lastName: string;
state: string;
gender: string;
};

const columns: MRT_ColumnDef<Person>[] = [
{
accessorKey: 'firstName',
header: 'First Name',
},
{
accessorKey: 'lastName',
header: 'Last Name',
},
{
accessorKey: 'address',
header: 'Address',
},
{
accessorKey: 'city',
header: 'City',
},
{
accessorKey: 'state',
header: 'State',
},
{
accessorKey: 'gender',
header: 'Gender',
},
];

const data = [...Array(300)].map(() => ({
address: faker.location.streetAddress(),
city: faker.location.city(),
firstName: faker.person.firstName(),
lastName: faker.person.lastName(),
state: faker.location.state(),
gender: ["Male", "Female"][faker.number.int({min: 0, max: 1})]
}));

export const GroupingRowSelection = () => {
const table = useMaterialReactTable({
columns,
data,
enableGrouping: true,
enableRowSelection: true,
initialState: {
grouping: ["gender"]
}
})
console.log(table.getState().rowSelection);
return <MaterialReactTable table={table} />
};