material-react-table 1.6.2 → 1.6.3

package/dist/cjs/index.js

@@ -2504,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;
@@ -2515,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,
     ]);