@mirror-physics/fractal-ui 0.2.0-next.68 → 0.2.0-next.69

package/dist/index.cjs

@@ -1524,10 +1524,11 @@ function SortableTable({
     const startIndex = (page - 1) * pageSize;
     return sorted.slice(startIndex, startIndex + pageSize);
   }, [pagination, sorted]);
-  const selectableRows = selection ? data.filter((row) => !isRowDisabled?.(row) && !isRowSelectionDisabled?.(row)) : [];
+  const selectedRows = selection ? sorted.filter(selection.isSelected) : [];
+  const selectableRows = selection ? sorted.filter((row) => !isRowDisabled?.(row) && !isRowSelectionDisabled?.(row)) : [];
   const selectedRowCount = selection ? selectableRows.filter(selection.isSelected).length : 0;
   const allRowsSelected = selectableRows.length > 0 && selectedRowCount === selectableRows.length;
-  const someRowsSelected = selectedRowCount > 0 && !allRowsSelected;
+  const someRowsSelected = selectedRows.length > 0 && !allRowsSelected;
   const handleSortClick = (key) => {
     let nextDirection;
     if (!activeKey || !activeDirection) {
@@ -1564,14 +1565,15 @@ function SortableTable({
               {
                 "aria-label": selection.selectAllLabel ?? "Select all rows",
                 checked: allRowsSelected,
-                disabled: selectableRows.length === 0,
+                disabled: selectableRows.length === 0 && selectedRows.length === 0,
                 indeterminate: someRowsSelected,
                 onCheckedChange: (checked) => {
+                  const rows = checked ? selectableRows : selectedRows;
                   if (selection.onSelectAllChange) {
-                    selection.onSelectAllChange(selectableRows, checked);
+                    selection.onSelectAllChange(rows, checked);
                     return;
                   }
-                  selectableRows.forEach((row) => {
+                  rows.forEach((row) => {
                     if (selection.isSelected(row) !== checked) {
                       selection.onSelectedChange(row, checked);
                     }