@tanstack/table-core 8.0.0-beta.6 → 8.0.0-beta.9

package/build/types/features/Pagination.d.ts

@@ -3,7 +3,6 @@ import { OnChangeFn, TableGenerics, TableInstance, RowModel, Updater } from '../
 export declare type PaginationState = {
     pageIndex: number;
     pageSize: number;
-    pageCount?: number;
 };
 export declare type PaginationTableState = {
     pagination: PaginationState;
@@ -12,6 +11,7 @@ export declare type PaginationInitialTableState = {
     pagination?: Partial<PaginationState>;
 };
 export declare type PaginationOptions<TGenerics extends TableGenerics> = {
+    pageCount?: number;
     manualPagination?: boolean;
     onPaginationChange?: OnChangeFn<PaginationState>;
     autoResetPageIndex?: boolean;

package/build/umd/index.development.js

@@ -973,38 +973,54 @@
   };
 
   const includesString = (row, columnId, filterValue) => {
+    var _row$getValue;
+
     const search = filterValue.toLowerCase();
-    return row.getValue(columnId).toLowerCase().includes(search);
+    return (_row$getValue = row.getValue(columnId)) == null ? void 0 : _row$getValue.toLowerCase().includes(search);
   };
 
   includesString.autoRemove = val => testFalsey(val);
 
   const includesStringSensitive = (row, columnId, filterValue) => {
-    return row.getValue(columnId).includes(filterValue);
+    var _row$getValue2;
+
+    return (_row$getValue2 = row.getValue(columnId)) == null ? void 0 : _row$getValue2.includes(filterValue);
   };
 
   includesStringSensitive.autoRemove = val => testFalsey(val);
 
   const equalsString = (row, columnId, filterValue) => {
-    return row.getValue(columnId).toLowerCase() === filterValue.toLowerCase();
+    var _row$getValue3;
+
+    return ((_row$getValue3 = row.getValue(columnId)) == null ? void 0 : _row$getValue3.toLowerCase()) === filterValue.toLowerCase();
   };
 
   equalsString.autoRemove = val => testFalsey(val);
 
   const arrIncludes = (row, columnId, filterValue) => {
-    return row.getValue(columnId).includes(filterValue);
+    var _row$getValue4;
+
+    return (_row$getValue4 = row.getValue(columnId)) == null ? void 0 : _row$getValue4.includes(filterValue);
   };
 
   arrIncludes.autoRemove = val => testFalsey(val) || !(val != null && val.length);
 
   const arrIncludesAll = (row, columnId, filterValue) => {
-    return !filterValue.some(val => !row.getValue(columnId).includes(val));
+    return !filterValue.some(val => {
+      var _row$getValue5;
+
+      return !((_row$getValue5 = row.getValue(columnId)) != null && _row$getValue5.includes(val));
+    });
   };
 
   arrIncludesAll.autoRemove = val => testFalsey(val) || !(val != null && val.length);
 
   const arrIncludesSome = (row, columnId, filterValue) => {
-    return filterValue.some(val => row.getValue(columnId).includes(val));
+    return filterValue.some(val => {
+      var _row$getValue6;
+
+      return (_row$getValue6 = row.getValue(columnId)) == null ? void 0 : _row$getValue6.includes(val);
+    });
   };
 
   arrIncludesSome.autoRemove = val => testFalsey(val) || !(val != null && val.length);
@@ -1534,7 +1550,7 @@
         getIsAggregated: () => {
           var _row$subRows;
 
-          return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
+          return !cell.getIsGrouped() && !cell.getIsPlaceholder() && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
         },
         renderAggregatedCell: () => {
           {
@@ -1689,7 +1705,7 @@
         setPageIndex: updater => {
           instance.setPagination(old => {
             let pageIndex = functionalUpdate(updater, old.pageIndex);
-            const maxPageIndex = typeof old.pageCount !== 'undefined' ? old.pageCount - 1 : Number.MAX_SAFE_INTEGER;
+            const maxPageIndex = typeof instance.options.pageCount === 'undefined' || instance.options.pageCount === -1 ? Number.MAX_SAFE_INTEGER : instance.options.pageCount - 1;
             pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
             return { ...old,
               pageIndex
@@ -1718,9 +1734,9 @@
           });
         },
         setPageCount: updater => instance.setPagination(old => {
-          var _old$pageCount;
+          var _instance$options$pag;
 
-          let newPageCount = functionalUpdate(updater, (_old$pageCount = old.pageCount) != null ? _old$pageCount : -1);
+          let newPageCount = functionalUpdate(updater, (_instance$options$pag = instance.options.pageCount) != null ? _instance$options$pag : -1);
 
           if (typeof newPageCount === 'number') {
             newPageCount = Math.max(-1, newPageCount);
@@ -1730,7 +1746,7 @@
             pageCount: newPageCount
           };
         }),
-        getPageOptions: memo(() => [instance.getState().pagination.pageSize, instance.getState().pagination.pageCount], (pageSize, pageCount) => {
+        getPageOptions: memo(() => [instance.getPageCount()], pageCount => {
           let pageOptions = [];
 
           if (pageCount && pageCount > 0) {
@@ -1784,15 +1800,9 @@
           return instance._getPaginationRowModel();
         },
         getPageCount: () => {
-          const {
-            pageCount
-          } = instance.getState().pagination;
+          var _instance$options$pag2;
 
-          if (typeof pageCount !== 'undefined') {
-            return pageCount;
-          }
-
-          return Math.ceil(instance.getPrePaginationRowModel().rows.length / instance.getState().pagination.pageSize);
+          return (_instance$options$pag2 = instance.options.pageCount) != null ? _instance$options$pag2 : Math.ceil(instance.getPrePaginationRowModel().rows.length / instance.getState().pagination.pageSize);
         }
       };
     }
@@ -3225,8 +3235,6 @@
   function filterRowModelFromLeafs(rowsToFilter, filterRow, instance) {
     const newFilteredFlatRows = [];
     const newFilteredRowsById = {};
-    let row;
-    let newRow;
 
     const recurseFilterRows = function (rowsToFilter, depth) {
       if (depth === void 0) {
@@ -3238,10 +3246,10 @@
       for (let i = 0; i < rowsToFilter.length; i++) {
         var _row$subRows;
 
-        row = rowsToFilter[i];
+        let row = rowsToFilter[i];
 
         if ((_row$subRows = row.subRows) != null && _row$subRows.length) {
-          newRow = createRow(instance, row.id, row.original, row.index, row.depth);
+          const newRow = createRow(instance, row.id, row.original, row.index, row.depth);
           newRow.columnFilters = row.columnFilters;
           newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
 
@@ -3270,10 +3278,7 @@
   }
   function filterRowModelFromRoot(rowsToFilter, filterRow, instance) {
     const newFilteredFlatRows = [];
-    const newFilteredRowsById = {};
-    let rows;
-    let row;
-    let newRow; // Filters top level and nested rows
+    const newFilteredRowsById = {}; // Filters top level and nested rows
 
     const recurseFilterRows = function (rowsToFilter, depth) {
       if (depth === void 0) {
@@ -3281,17 +3286,17 @@
       }
 
       // Filter from parents downward first
-      rows = []; // Apply the filter to any subRows
+      const rows = []; // Apply the filter to any subRows
 
       for (let i = 0; i < rowsToFilter.length; i++) {
-        row = rowsToFilter[i];
+        let row = rowsToFilter[i];
         const pass = filterRow(row);
 
         if (pass) {
           var _row$subRows2;
 
           if ((_row$subRows2 = row.subRows) != null && _row$subRows2.length) {
-            newRow = createRow(instance, row.id, row.original, row.index, row.depth);
+            const newRow = createRow(instance, row.id, row.original, row.index, row.depth);
             newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
             row = newRow;
           }