diff --git a/packages/table-core/src/features/RowSelection.ts b/packages/table-core/src/features/RowSelection.ts index e5fddaba9d..672eb3b207 100644 --- a/packages/table-core/src/features/RowSelection.ts +++ b/packages/table-core/src/features/RowSelection.ts @@ -435,12 +435,11 @@ export const RowSelection: TableFeature = { } table.getIsSomeRowsSelected = () => { - const totalSelected = Object.keys( - table.getState().rowSelection ?? {}, - ).length + const visibleRows = table.getFilteredRowModel().flatRows + const selectedVisibleRows = visibleRows.filter(row => row.getIsSelected()) return ( - totalSelected > 0 && - totalSelected < table.getFilteredRowModel().flatRows.length + selectedVisibleRows.length > 0 && + selectedVisibleRows.length < visibleRows.length ) }