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

package/build/esm/index.js

@@ -655,6 +655,32 @@ function expandRowsFn(instance, sortedRowModel) {
   };
 }
 
+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 {
@@ -3451,8 +3477,7 @@ function getInitialState$1() {
   return {
     pagination: {
       pageIndex: 0,
-      pageSize: 10,
-      pageCount: -1
+      pageSize: 10
     }
   };
 }
@@ -3481,17 +3506,15 @@ function getInstance$1(instance) {
     },
     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));
@@ -3507,10 +3530,11 @@ function getInstance$1(instance) {
     },
     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
         });
       });
     },
@@ -3535,8 +3559,14 @@ function getInstance$1(instance) {
     },
     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
         });
       });
     },
@@ -3545,7 +3575,7 @@ function getInstance$1(instance) {
     }, function (pageSize, pageCount) {
       var pageOptions = [];
 
-      if (pageCount > 0) {
+      if (pageCount && pageCount > 0) {
         pageOptions = [].concat(new Array(pageCount)).fill(null).map(function (_, i) {
           return i;
         });
@@ -3575,13 +3605,13 @@ function getInstance$1(instance) {
 
       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;
       });
     },
@@ -4555,7 +4585,7 @@ function createTableInstance(options, rerender) {
     // 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;
@@ -4743,5 +4773,5 @@ function createTable() {
   };
 }
 
-export { columnFilterRowsFn, createTable, expandRowsFn, globalFilterRowsFn, groupRowsFn, sortRowsFn };
+export { columnFilterRowsFn, createTable, expandRowsFn, globalFilterRowsFn, groupRowsFn, paginateRowsFn, sortRowsFn };
 //# sourceMappingURL=index.js.map