material-react-table 2.11.0 → 2.11.1

package/dist/index.esm.js

@@ -402,11 +402,12 @@ const getIsRowSelected = ({ row, table, }) => {
 };
 const getMRT_RowSelectionHandler = () => ({ event, row, staticRowIndex = 0, table, }) => {
     var _a;
-    const { getState, options: { enableBatchRowSelection, enableRowPinning, rowPinningDisplayMode, }, refs: { lastSelectedRowId: lastSelectedRowId }, } = table;
+    const { getState, options: { enableBatchRowSelection, enableRowPinning, manualPagination, rowPinningDisplayMode, }, refs: { lastSelectedRowId: lastSelectedRowId }, } = table;
     const { pagination: { pageIndex, pageSize }, } = getState();
-    const isChecked = getIsRowSelected({ row, table });
+    const paginationOffset = manualPagination ? 0 : pageSize * pageIndex;
+    const isCurrentRowChecked = getIsRowSelected({ row, table });
     const isStickySelection = enableRowPinning && (rowPinningDisplayMode === null || rowPinningDisplayMode === void 0 ? void 0 : rowPinningDisplayMode.includes('select'));
-    // toggle selected of this row
+    // toggle selection of this row
     row.getToggleSelectedHandler()(event);
     // if shift key is pressed, select all rows between last selected and this one
     if (enableBatchRowSelection &&
@@ -415,22 +416,31 @@ const getMRT_RowSelectionHandler = () => ({ event, row, staticRowIndex = 0, tabl
         const rows = getMRT_Rows(table, undefined, true);
         const lastIndex = rows.findIndex((r) => r.id === lastSelectedRowId.current);
         if (lastIndex !== -1) {
-            const currentIndex = staticRowIndex + pageSize * pageIndex;
+            const isLastIndexChecked = getIsRowSelected({
+                row: rows === null || rows === void 0 ? void 0 : rows[lastIndex],
+                table,
+            });
+            const currentIndex = staticRowIndex + paginationOffset;
             const [start, end] = lastIndex < currentIndex
                 ? [lastIndex, currentIndex]
                 : [currentIndex, lastIndex];
-            for (let i = start; i <= end; i++) {
-                rows[i].toggleSelected(!isChecked);
+            // toggle selection of all rows between last selected and this one
+            // but only if the last selected row is not the same as the current one
+            if (isCurrentRowChecked !== isLastIndexChecked) {
+                for (let i = start; i <= end; i++) {
+                    rows[i].toggleSelected(!isCurrentRowChecked);
+                }
             }
         }
     }
+    // record the last selected row id
     lastSelectedRowId.current = row.id;
     // if all sub rows were selected, unselect them
     if (row.getCanSelectSubRows() && row.getIsAllSubRowsSelected()) {
         (_a = row.subRows) === null || _a === void 0 ? void 0 : _a.forEach((r) => r.toggleSelected(false));
     }
     if (isStickySelection) {
-        row.pin(!row.getIsPinned() && isChecked
+        row.pin(!row.getIsPinned() && isCurrentRowChecked
             ? (rowPinningDisplayMode === null || rowPinningDisplayMode === void 0 ? void 0 : rowPinningDisplayMode.includes('bottom'))
                 ? 'bottom'
                 : 'top'
@@ -1027,8 +1037,8 @@ const MRT_SelectCheckbox = (_a) => {
         }, sx: (theme) => (Object.assign({ height: density === 'compact' ? '1.75rem' : '2.5rem', m: density !== 'compact' ? '-0.4rem' : undefined, width: density === 'compact' ? '1.75rem' : '2.5rem', zIndex: 0 }, parseFromValuesOrFunc(checkboxProps === null || checkboxProps === void 0 ? void 0 : checkboxProps.sx, theme))), title: undefined });
     return (jsx(Tooltip, Object.assign({}, getCommonTooltipProps(), { title: (_b = checkboxProps === null || checkboxProps === void 0 ? void 0 : checkboxProps.title) !== null && _b !== void 0 ? _b : (selectAll
             ? localization.toggleSelectAll
-            : localization.toggleSelectRow), children: enableMultiRowSelection === false ? (jsx(Radio, Object.assign({}, commonProps))) : (jsx(Checkbox, Object.assign({ indeterminate: selectAll
-                ? table.getIsSomeRowsSelected() && !allRowsSelected
+            : localization.toggleSelectRow), children: enableMultiRowSelection === false ? (jsx(Radio, Object.assign({}, commonProps))) : (jsx(Checkbox, Object.assign({ indeterminate: !isChecked && selectAll
+                ? table.getIsSomeRowsSelected()
                 : (row === null || row === void 0 ? void 0 : row.getIsSomeSelected()) && row.getCanSelectSubRows() }, commonProps))) })));
 };