material-react-table 1.6.1 → 1.6.3

package/dist/cjs/index.js

@@ -1126,11 +1126,12 @@ const MRT_SelectCheckbox = ({ row, selectAll, table }) => {
         : muiSelectCheckboxProps instanceof Function
             ? muiSelectCheckboxProps({ row, table })
             : muiSelectCheckboxProps;
-    const commonProps = Object.assign(Object.assign({ checked: selectAll
-            ? selectAllMode === 'page'
-                ? table.getIsAllPageRowsSelected()
-                : table.getIsAllRowsSelected()
-            : row === null || row === void 0 ? void 0 : row.getIsSelected(), disabled: isLoading, inputProps: {
+    const allRowsSelected = selectAll
+        ? selectAllMode === 'page'
+            ? table.getIsAllPageRowsSelected()
+            : table.getIsAllRowsSelected()
+        : undefined;
+    const commonProps = Object.assign(Object.assign({ checked: selectAll ? allRowsSelected : row === null || row === void 0 ? void 0 : row.getIsSelected(), disabled: isLoading || (row && !row.getCanSelect()), inputProps: {
             'aria-label': selectAll
                 ? localization.toggleSelectAll
                 : localization.toggleSelectRow,
@@ -1148,10 +1149,7 @@ const MRT_SelectCheckbox = ({ row, selectAll, table }) => {
     return (React__default["default"].createElement(Tooltip__default["default"], { arrow: true, enterDelay: 1000, enterNextDelay: 1000, title: (_a = checkboxProps === null || checkboxProps === void 0 ? void 0 : checkboxProps.title) !== null && _a !== void 0 ? _a : (selectAll
             ? localization.toggleSelectAll
             : localization.toggleSelectRow) }, enableMultiRowSelection === false ? (React__default["default"].createElement(Radio__default["default"], Object.assign({}, commonProps))) : (React__default["default"].createElement(Checkbox__default["default"], Object.assign({ indeterminate: selectAll
-            ? table.getIsSomeRowsSelected() &&
-                !(selectAllMode === 'page'
-                    ? table.getIsAllPageRowsSelected()
-                    : table.getIsAllRowsSelected())
+            ? table.getIsSomeRowsSelected() && !allRowsSelected
             : row === null || row === void 0 ? void 0 : row.getIsSomeSelected() }, commonProps)))));
 };
 
@@ -2506,8 +2504,8 @@ const Memo_MRT_TableBodyRow = React.memo(MRT_TableBodyRow, (prev, next) => prev.
 
 const MRT_TableBody = ({ columnVirtualizer, table, virtualColumns, virtualPaddingLeft, virtualPaddingRight, }) => {
     var _a, _b, _c;
-    const { getRowModel, getPrePaginationRowModel, getState, options: { enableGlobalFilterRankedResults, enablePagination, enableRowVirtualization, layoutMode, localization, manualFiltering, manualPagination, manualSorting, memoMode, muiTableBodyProps, rowVirtualizerInstanceRef, rowVirtualizerProps, virtualizerInstanceRef, virtualizerProps, }, refs: { tableContainerRef, tablePaperRef }, } = table;
-    const { columnFilters, density, globalFilter, pagination, sorting } = getState();
+    const { getRowModel, getPrePaginationRowModel, getState, options: { enableGlobalFilterRankedResults, enablePagination, enableRowVirtualization, layoutMode, localization, manualExpanding, manualFiltering, manualGrouping, manualPagination, manualSorting, memoMode, muiTableBodyProps, rowVirtualizerInstanceRef, rowVirtualizerProps, virtualizerInstanceRef, virtualizerProps, }, refs: { tableContainerRef, tablePaperRef }, } = table;
+    const { columnFilters, density, expanded, globalFilter, globalFilterFn, pagination, sorting, } = getState();
     const tableBodyProps = muiTableBodyProps instanceof Function
         ? muiTableBodyProps({ table })
         : muiTableBodyProps;
@@ -2517,26 +2515,37 @@ const MRT_TableBody = ({ columnVirtualizer, table, virtualColumns, virtualPaddin
     const vProps = rowVirtualizerProps instanceof Function
         ? rowVirtualizerProps({ table })
         : rowVirtualizerProps;
+    const shouldRankResults = React.useMemo(() => !manualExpanding &&
+        !manualFiltering &&
+        !manualGrouping &&
+        !manualSorting &&
+        enableGlobalFilterRankedResults &&
+        globalFilter &&
+        globalFilterFn === 'fuzzy' &&
+        expanded !== true &&
+        !Object.values(sorting).some(Boolean) &&
+        !Object.values(expanded).some(Boolean), [
+        enableGlobalFilterRankedResults,
+        expanded,
+        globalFilter,
+        manualExpanding,
+        manualFiltering,
+        manualGrouping,
+        manualSorting,
+        sorting,
+    ]);
     const rows = React.useMemo(() => {
-        if (enableGlobalFilterRankedResults &&
-            globalFilter &&
-            !manualFiltering &&
-            !manualSorting &&
-            !Object.values(sorting).some(Boolean)) {
-            const rankedRows = getPrePaginationRowModel().rows.sort((a, b) => rankGlobalFuzzy(a, b));
-            if (enablePagination && !manualPagination) {
-                const start = pagination.pageIndex * pagination.pageSize;
-                return rankedRows.slice(start, start + pagination.pageSize);
-            }
-            return rankedRows;
+        if (!shouldRankResults)
+            return getRowModel().rows;
+        const rankedRows = getPrePaginationRowModel().rows.sort((a, b) => rankGlobalFuzzy(a, b));
+        if (enablePagination && !manualPagination) {
+            const start = pagination.pageIndex * pagination.pageSize;
+            return rankedRows.slice(start, start + pagination.pageSize);
         }
-        return getRowModel().rows;
+        return rankedRows;
     }, [
-        enableGlobalFilterRankedResults,
-        (enableGlobalFilterRankedResults && globalFilter) || !enablePagination
-            ? getPrePaginationRowModel().rows
-            : getRowModel().rows,
-        globalFilter,
+        shouldRankResults,
+        shouldRankResults ? getPrePaginationRowModel().rows : getRowModel().rows,
         pagination.pageIndex,
         pagination.pageSize,
     ]);