@tanstack/react-table 8.0.0-alpha.3 → 8.0.0-alpha.4

package/build/types/core.d.ts

@@ -76,7 +76,7 @@ export declare type CoreColumnDef<TData, TValue, TFilterFns, TSortingFns, TAggre
         header: Header<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
         column: Column<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
     }>;
-} & //       | Renderable<{ //       | string //     header?: //     accessorKey?: never //     id: string //     accessorFn: AccessorFn<TData> // | {
+} & //           instance: ReactTable< //       | Renderable<{ //       | string //     header?: //     accessorKey?: never //     id: string //     accessorFn: AccessorFn<TData> // | {
 {
     __generated: true;
     width?: number;

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

@@ -1,8 +1,9 @@
 import { OnChangeFn, ReactTable, Row, RowModel, Updater } from '../types';
+export declare type PageCount = undefined | null | number;
 export declare type PaginationState = {
     pageIndex: number;
     pageSize: number;
-    pageCount: number;
+    pageCount?: PageCount;
 };
 export declare type PaginationTableState = {
     pagination: PaginationState;
@@ -24,12 +25,12 @@ export declare type PaginationInstance<TData, TValue, TFilterFns, TSortingFns, T
     resetPageIndex: () => void;
     setPageSize: (updater: Updater<number>) => void;
     resetPageSize: () => void;
-    setPageCount: (updater: Updater<number>) => void;
+    setPageCount: (updater: Updater<PageCount>) => void;
     getPageOptions: () => number[];
     getCanPreviousPage: () => boolean;
     getCanNextPage: () => boolean;
-    gotoPreviousPage: () => void;
-    gotoNextPage: () => void;
+    previousPage: () => void;
+    nextPage: () => void;
     getPaginationRowModel: () => RowModel<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
     getPrePaginationRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];
     getPrePaginationFlatRows: () => Row<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>[];

package/build/types/index.d.ts

@@ -4,4 +4,5 @@ export * from './utils/globalFilterRowsFn';
 export * from './utils/sortRowsFn';
 export * from './utils/groupRowsFn';
 export * from './utils/expandRowsFn';
+export * from './utils/paginateRowsFn';
 export { createTable } from './createTable';

package/build/umd/index.development.js

@@ -681,6 +681,32 @@
     };
   }
 
+  function paginateRowsFn(instance, rowModel) {
+    var _instance$getState$pa = instance.getState().pagination,
+        pageSize = _instance$getState$pa.pageSize,
+        pageIndex = _instance$getState$pa.pageIndex;
+    var rows = rowModel.rows,
+        flatRows = rowModel.flatRows,
+        rowsById = rowModel.rowsById;
+    var pageStart = pageSize * pageIndex;
+    var pageEnd = pageStart + pageSize;
+    rows = rows.slice(pageStart, pageEnd);
+
+    if (!instance.options.paginateExpandedRows) {
+      return expandRowsFn(instance, {
+        rows: rows,
+        flatRows: flatRows,
+        rowsById: rowsById
+      });
+    }
+
+    return {
+      rows: rows,
+      flatRows: flatRows,
+      rowsById: rowsById
+    };
+  }
+
   //
   function getInitialState$9() {
     return {
@@ -3477,8 +3503,7 @@
     return {
       pagination: {
         pageIndex: 0,
-        pageSize: 10,
-        pageCount: -1
+        pageSize: 10
       }
     };
   }
@@ -3507,17 +3532,15 @@
       },
       setPagination: function setPagination(updater) {
         var safeUpdater = function safeUpdater(old) {
-          functionalUpdate(old, updater);
+          var newState = functionalUpdate(updater, old);
 
-          if (!instance.options.paginateRowsFn) {
-            var _instance$getPreExpan;
+          if (instance.options.paginateRowsFn) {
+            var _instance$getPrePagin;
 
-            return _extends({}, old, {
-              pageCount: (_instance$getPreExpan = instance.getPreExpandedRows()) != null && _instance$getPreExpan.length ? Math.ceil(instance.getPreExpandedRows().length / instance.getState().pagination.pageSize) : 0
-            });
+            newState.pageCount = (_instance$getPrePagin = instance.getPrePaginationRows()) != null && _instance$getPrePagin.length ? Math.ceil(instance.getPrePaginationRows().length / instance.getState().pagination.pageSize) : 0;
           }
 
-          return old;
+          return newState;
         };
 
         return instance.options.onPaginationChange == null ? void 0 : instance.options.onPaginationChange(safeUpdater, functionalUpdate(safeUpdater, instance.getState().pagination));
@@ -3533,10 +3556,11 @@
       },
       setPageIndex: function setPageIndex(updater) {
         instance.setPagination(function (old) {
-          var newPageIndex = functionalUpdate(updater, old.pageIndex);
-          var maxPageIndex = old.pageCount > 0 ? old.pageCount - 1 : Number.MAX_SAFE_INTEGER;
+          var pageIndex = functionalUpdate(updater, old.pageIndex);
+          var maxPageIndex = old.pageCount && old.pageCount > 0 ? old.pageCount - 1 : Number.MAX_SAFE_INTEGER;
+          pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
           return _extends({}, old, {
-            pageIndex: Math.min(Math.max(0, newPageIndex), maxPageIndex)
+            pageIndex: pageIndex
           });
         });
       },
@@ -3561,8 +3585,14 @@
       },
       setPageCount: function setPageCount(updater) {
         return instance.setPagination(function (old) {
+          var newPageCount = functionalUpdate(updater, old.pageCount);
+
+          if (typeof newPageCount === 'number') {
+            newPageCount = Math.max(-1, newPageCount);
+          }
+
           return _extends({}, old, {
-            pageCount: Math.max(-1, functionalUpdate(updater, old.pageCount))
+            pageCount: newPageCount
           });
         });
       },
@@ -3571,7 +3601,7 @@
       }, function (pageSize, pageCount) {
         var pageOptions = [];
 
-        if (pageCount > 0) {
+        if (pageCount && pageCount > 0) {
           pageOptions = [].concat(new Array(pageCount)).fill(null).map(function (_, i) {
             return i;
           });
@@ -3601,13 +3631,13 @@
 
         return pageIndex < Math.ceil(instance.getPrePaginationRows().length / pageSize) - 1;
       },
-      gotoPreviousPage: function gotoPreviousPage() {
-        return instance.setPageIndex == null ? void 0 : instance.setPageIndex(function (old) {
+      previousPage: function previousPage() {
+        return instance.setPageIndex(function (old) {
           return old - 1;
         });
       },
-      gotoNextPage: function gotoNextPage() {
-        return instance.setPageIndex == null ? void 0 : instance.setPageIndex(function (old) {
+      nextPage: function nextPage() {
+        return instance.setPageIndex(function (old) {
           return old + 1;
         });
       },
@@ -4579,7 +4609,7 @@
       // The final calls start at the bottom of the model,
       // expanded rows, which then work their way up
       getRowModel: function getRowModel() {
-        return instance.getExpandedRowModel();
+        return instance.getPaginationRowModel();
       },
       getRows: function getRows() {
         return instance.getRowModel().rows;
@@ -4766,6 +4796,7 @@
   exports.expandRowsFn = expandRowsFn;
   exports.globalFilterRowsFn = globalFilterRowsFn;
   exports.groupRowsFn = groupRowsFn;
+  exports.paginateRowsFn = paginateRowsFn;
   exports.sortRowsFn = sortRowsFn;
 
   Object.defineProperty(exports, '__esModule', { value: true });