@tanstack/react-table 8.5.22 → 8.5.25

package/build/cjs/table-core/build/esm/index.js

@@ -1480,7 +1480,7 @@ const Pagination = {
         table.setPagination(old => {
           let pageIndex = functionalUpdate(updater, old.pageIndex);
           const maxPageIndex = typeof table.options.pageCount === 'undefined' || table.options.pageCount === -1 ? Number.MAX_SAFE_INTEGER : table.options.pageCount - 1;
-          pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
+          pageIndex = Math.max(0, Math.min(pageIndex, maxPageIndex));
           return {
             ...old,
             pageIndex
@@ -2856,19 +2856,30 @@ function filterRowModelFromLeafs(rowsToFilter, filterRow, table) {
     for (let i = 0; i < rowsToFilter.length; i++) {
       var _row$subRows;
       let row = rowsToFilter[i];
+      const newRow = createRow(table, row.id, row.original, row.index, row.depth);
+      newRow.columnFilters = row.columnFilters;
       if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
-        const newRow = createRow(table, row.id, row.original, row.index, row.depth);
-        newRow.columnFilters = row.columnFilters;
         newRow.subRows = recurseFilterRows(row.subRows);
-        if (!newRow.subRows.length) {
+        row = newRow;
+        if (filterRow(row) && !newRow.subRows.length) {
+          rows.push(row);
+          newFilteredRowsById[row.id] = row;
+          newFilteredRowsById[i] = row;
+          continue;
+        }
+        if (filterRow(row) || newRow.subRows.length) {
+          rows.push(row);
+          newFilteredRowsById[row.id] = row;
+          newFilteredRowsById[i] = row;
           continue;
         }
+      } else {
         row = newRow;
-      }
-      if (filterRow(row)) {
-        rows.push(row);
-        newFilteredRowsById[row.id] = row;
-        newFilteredRowsById[i] = row;
+        if (filterRow(row)) {
+          rows.push(row);
+          newFilteredRowsById[row.id] = row;
+          newFilteredRowsById[i] = row;
+        }
       }
     }
     return rows;