material-react-table 1.6.2 → 1.6.3

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.2",
+  "version": "1.6.3",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",

package/src/body/MRT_TableBody.tsx

@@ -35,7 +35,9 @@ export const MRT_TableBody: FC<Props> = ({
       enableRowVirtualization,
       layoutMode,
       localization,
+      manualExpanding,
       manualFiltering,
+      manualGrouping,
       manualPagination,
       manualSorting,
       memoMode,
@@ -47,8 +49,15 @@ export const MRT_TableBody: FC<Props> = ({
     },
     refs: { tableContainerRef, tablePaperRef },
   } = table;
-  const { columnFilters, density, globalFilter, pagination, sorting } =
-    getState();
+  const {
+    columnFilters,
+    density,
+    expanded,
+    globalFilter,
+    globalFilterFn,
+    pagination,
+    sorting,
+  } = getState();
 
   const tableBodyProps =
     muiTableBodyProps instanceof Function
@@ -65,30 +74,43 @@ export const MRT_TableBody: FC<Props> = ({
       ? rowVirtualizerProps({ table })
       : rowVirtualizerProps;
 
-  const rows = useMemo(() => {
-    if (
-      enableGlobalFilterRankedResults &&
-      globalFilter &&
+  const shouldRankResults = useMemo(
+    () =>
+      !manualExpanding &&
       !manualFiltering &&
+      !manualGrouping &&
       !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;
+      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 = useMemo(() => {
+    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,
   ]);