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

package/build/types/core.d.ts

@@ -76,8 +76,6 @@ 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> // | {
-{
     __generated: true;
     width?: number;
     minWidth?: number;

package/build/types/createTable.d.ts

@@ -1,7 +1,7 @@
 import { Cell, Column, Row } from '.';
 import { ReactTable, ColumnDef, AccessorFn, Options, Renderable, Header } from './types';
 import { Overwrite } from './utils';
-declare type TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
+export declare type TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns> = {
     RowType<TTData>(): TableHelper<TTData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
     FilterFns: <TTFilterFns>(filterFns: TTFilterFns) => TableHelper<TData, TValue, TTFilterFns, TSortingFns, TAggregationFns>;
     SortingFns: <TTSortingFns>(sortingFns: TTSortingFns) => TableHelper<TData, TValue, TFilterFns, TTSortingFns, TAggregationFns>;
@@ -50,4 +50,3 @@ declare type TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns
     };
 };
 export declare function createTable<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>(): TableHelper<TData, TValue, TFilterFns, TSortingFns, TAggregationFns>;
-export {};

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 { createTable } from './createTable';
+export * from './utils/paginateRowsFn';
+export * from './createTable';

package/build/types/utils.d.ts

@@ -9,9 +9,6 @@ export declare type Updater<TInput, TOutput> = TOutput | DataUpdateFunction<TInp
 export declare function functionalUpdate<TInput, TOutput = TInput>(updater: Updater<TInput, TOutput>, input: TInput): TOutput;
 export declare function noop(): void;
 export declare function makeStateUpdater(key: keyof TableState, instance: unknown): (updater: Updater<any, any>) => void;
-export declare const safeUseLayoutEffect: typeof React.useLayoutEffect;
-export declare function useMountedLayoutEffect(fn: any, deps: any[]): void;
-export declare function useGetLatest<T>(obj: T): () => T;
 declare type AnyFunction = (...args: any) => any;
 export declare function isFunction<T extends AnyFunction>(d: any): d is T;
 export declare function flattenBy<TNode>(arr: TNode[], getChildren: (item: TNode) => TNode[]): TNode[];
@@ -22,7 +19,6 @@ export declare function memo<TDeps extends readonly any[], TResult>(getDeps: ()
     debug?: boolean;
     onChange?: (result: TResult, previousResult?: TResult) => void;
 }): () => TResult;
-export declare function isPlainObject(o: any): o is Object;
 export declare type Render = typeof flexRender;
 export declare function flexRender<TProps extends {}>(Comp: Renderable<TProps>, props: TProps): React.ReactNode;
 export {};

package/build/umd/index.development.js

@@ -416,9 +416,7 @@
         return _extends({}, old, (_extends2 = {}, _extends2[key] = functionalUpdate(updater, old[key]), _extends2));
       });
     };
-  } // SSR has issues with useLayoutEffect still, so use useEffect during SSR
-
-  typeof document !== 'undefined' ? React__default["default"].useLayoutEffect : React__default["default"].useEffect;
+  }
   function isFunction(d) {
     return d instanceof Function;
   }
@@ -452,19 +450,17 @@
     var result;
     return function () {
       var newDeps = getDeps();
-      var newSerializedDeps = newDeps;
-      var oldSerializedDeps = deps;
-      var depsChanged = newSerializedDeps.length !== oldSerializedDeps.length || newSerializedDeps.some(function (dep, index) {
-        return oldSerializedDeps[index] !== dep;
+      var depsChanged = newDeps.length !== deps.length || newDeps.some(function (dep, index) {
+        return deps[index] !== dep;
       });
 
       if (depsChanged) {
         if (opts != null && opts.debug) {
           console.info(opts == null ? void 0 : opts.key, _extends({
-            length: oldSerializedDeps.length + " -> " + newSerializedDeps.length
-          }, newSerializedDeps.map(function (_, index) {
-            if (oldSerializedDeps[index] !== newSerializedDeps[index]) {
-              return [index, oldSerializedDeps[index], newSerializedDeps[index]];
+            length: deps.length + " -> " + newDeps.length
+          }, newDeps.map(function (_, index) {
+            if (deps[index] !== newDeps[index]) {
+              return [index, deps[index], newDeps[index]];
             }
 
             return false;
@@ -479,15 +475,14 @@
 
         var oldResult = result;
         result = fn.apply(void 0, newDeps);
-        deps = newSerializedDeps;
+        deps = newDeps;
         opts == null ? void 0 : opts.onChange == null ? void 0 : opts.onChange(result, oldResult);
         oldResult = undefined;
       }
 
       return result;
     };
-  } // Copied from: https://github.com/jonschlinkert/is-plain-object
-
+  }
   function flexRender(Comp, props) {
     return !Comp ? null : isReactComponent(Comp) ? /*#__PURE__*/React__default["default"].createElement(Comp, props) : Comp;
   }
@@ -681,6 +676,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 {
@@ -1063,9 +1084,9 @@
         return (_instance$getState$gr2 = instance.getState().grouping) == null ? void 0 : _instance$getState$gr2.indexOf(columnId);
       },
       resetGrouping: function resetGrouping() {
-        var _instance$options$ini, _instance$options, _instance$options$ini2;
+        var _instance$initialStat, _instance$initialStat2;
 
-        instance.setGrouping((_instance$options$ini = (_instance$options = instance.options) == null ? void 0 : (_instance$options$ini2 = _instance$options.initialState) == null ? void 0 : _instance$options$ini2.grouping) != null ? _instance$options$ini : []);
+        instance.setGrouping((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
       },
       getToggleGroupingProps: function getToggleGroupingProps(columnId, userProps) {
         var column = instance.getColumn(columnId);
@@ -1288,9 +1309,9 @@
         return instance.options.onColumnPinningChange == null ? void 0 : instance.options.onColumnPinningChange(updater, functionalUpdate(updater, instance.getState().columnPinning));
       },
       resetColumnPinning: function resetColumnPinning() {
-        var _instance$options$ini, _instance$options$ini2;
+        var _instance$initialStat, _instance$initialStat2;
 
-        return instance.setColumnPinning((_instance$options$ini = (_instance$options$ini2 = instance.options.initialState) == null ? void 0 : _instance$options$ini2.columnPinning) != null ? _instance$options$ini : {});
+        return instance.setColumnPinning((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnPinning) != null ? _instance$initialStat : {});
       },
       pinColumn: function pinColumn(columnId, position) {
         var column = instance.getColumn(columnId);
@@ -2372,9 +2393,9 @@
         });
       },
       resetColumnFilters: function resetColumnFilters() {
-        var _instance$options$ini, _instance$options2, _instance$options2$in;
+        var _instance$initialStat, _instance$initialStat2;
 
-        instance.setColumnFilters((_instance$options$ini = (_instance$options2 = instance.options) == null ? void 0 : (_instance$options2$in = _instance$options2.initialState) == null ? void 0 : _instance$options2$in.columnFilters) != null ? _instance$options$ini : []);
+        instance.setColumnFilters((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.columnFilters) != null ? _instance$initialStat : []);
       },
       getColumnFilteredRowModel: memo(function () {
         return [instance.getState().columnFilters, instance.getCoreRowModel(), instance.options.columnFilterRowsFn];
@@ -2474,7 +2495,7 @@
         key: 'getGlobalFilteredRowModel',
         debug: instance.options.debug,
         onChange: function onChange() {
-          return instance._notifySortingReset();
+          instance._notifySortingReset();
         }
       }),
       getPreGlobalFilteredRows: function getPreGlobalFilteredRows() {
@@ -2861,9 +2882,9 @@
         })) != null ? _instance$getState$so2 : -1;
       },
       resetSorting: function resetSorting() {
-        var _instance$options$ini, _instance$options, _instance$options$ini2;
+        var _instance$initialStat, _instance$initialStat2;
 
-        instance.setSorting((_instance$options$ini = (_instance$options = instance.options) == null ? void 0 : (_instance$options$ini2 = _instance$options.initialState) == null ? void 0 : _instance$options$ini2.sorting) != null ? _instance$options$ini : []);
+        instance.setSorting((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
       },
       getToggleSortingProps: function getToggleSortingProps(columnId, userProps) {
         var column = instance.getColumn(columnId);
@@ -2968,13 +2989,9 @@
       toggleRowExpanded: function toggleRowExpanded(rowId, expanded) {
         if (!rowId) return;
         instance.setExpanded(function (old) {
-          var _old, _expanded;
-
-          if (old === void 0) {
-            old = {};
-          }
+          var _expanded;
 
-          var exists = old === true ? true : !!((_old = old) != null && _old[rowId]);
+          var exists = old === true ? true : !!(old != null && old[rowId]);
           var oldExpanded = {};
 
           if (old === true) {
@@ -3012,9 +3029,9 @@
         }
       },
       resetExpanded: function resetExpanded() {
-        var _instance$options$ini, _instance$options, _instance$options$ini2;
+        var _instance$initialStat, _instance$initialStat2;
 
-        instance.setExpanded((_instance$options$ini = (_instance$options = instance.options) == null ? void 0 : (_instance$options$ini2 = _instance$options.initialState) == null ? void 0 : _instance$options$ini2.expanded) != null ? _instance$options$ini : {});
+        instance.setExpanded((_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.expanded) != null ? _instance$initialStat : {});
       },
       getIsRowExpanded: function getIsRowExpanded(rowId) {
         var _instance$options$get;
@@ -3114,7 +3131,7 @@
         key: 'getExpandedRowModel',
         debug: instance.options.debug,
         onChange: function onChange() {
-          return instance._notifyPageIndexReset();
+          instance._notifyPageIndexReset();
         }
       }),
       getPreExpandedRows: function getPreExpandedRows() {
@@ -3477,8 +3494,7 @@
     return {
       pagination: {
         pageIndex: 0,
-        pageSize: 10,
-        pageCount: -1
+        pageSize: 10
       }
     };
   }
@@ -3507,17 +3523,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 +3547,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
           });
         });
       },
@@ -3544,9 +3559,9 @@
         instance.setPageIndex(0);
       },
       resetPageSize: function resetPageSize() {
-        var _instance$options$ini, _instance$options$ini2, _instance$options$ini3;
+        var _instance$initialStat2, _instance$initialStat3, _instance$initialStat4;
 
-        instance.setPageSize((_instance$options$ini = (_instance$options$ini2 = instance.options.initialState) == null ? void 0 : (_instance$options$ini3 = _instance$options$ini2.pagination) == null ? void 0 : _instance$options$ini3.pageSize) != null ? _instance$options$ini : 10);
+        instance.setPageSize((_instance$initialStat2 = (_instance$initialStat3 = instance.initialState) == null ? void 0 : (_instance$initialStat4 = _instance$initialStat3.pagination) == null ? void 0 : _instance$initialStat4.pageSize) != null ? _instance$initialStat2 : 10);
       },
       setPageSize: function setPageSize(updater) {
         instance.setPagination(function (old) {
@@ -3561,8 +3576,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 +3592,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 +3622,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 +4600,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 +4787,7 @@
   exports.expandRowsFn = expandRowsFn;
   exports.globalFilterRowsFn = globalFilterRowsFn;
   exports.groupRowsFn = groupRowsFn;
+  exports.paginateRowsFn = paginateRowsFn;
   exports.sortRowsFn = sortRowsFn;
 
   Object.defineProperty(exports, '__esModule', { value: true });