@tanstack/table-core 8.0.0-beta.5 → 8.0.0-beta.8

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

@@ -818,7 +818,6 @@
     getDefaultOptions: instance => {
       return {
         onExpandedChange: makeStateUpdater('expanded', instance),
-        autoResetExpanded: true,
         paginateExpandedRows: true
       };
     },
@@ -827,6 +826,8 @@
       let queued = false;
       return {
         _autoResetExpanded: () => {
+          var _ref, _instance$options$aut;
+
           if (!registered) {
             instance._queue(() => {
               registered = true;
@@ -835,11 +836,7 @@
             return;
           }
 
-          if (instance.options.autoResetAll === false) {
-            return;
-          }
-
-          if (instance.options.autoResetAll === true || instance.options.autoResetExpanded) {
+          if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetExpanded) != null ? _ref : !instance.options.manualExpanding) {
             if (queued) return;
             queued = true;
 
@@ -903,7 +900,7 @@
           });
           return maxDepth;
         },
-        getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+        getPreExpandedRowModel: () => instance.getSortedRowModel(),
         getExpandedRowModel: () => {
           if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
             instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1504,7 +1501,7 @@
 
           instance.setGrouping(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
         },
-        getPreGroupedRowModel: () => instance.getSortedRowModel(),
+        getPreGroupedRowModel: () => instance.getFilteredRowModel(),
         getGroupedRowModel: () => {
           if (!instance._getGroupedRowModel && instance.options.getGroupedRowModel) {
             instance._getGroupedRowModel = instance.options.getGroupedRowModel(instance);
@@ -1537,7 +1534,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: () => {
           {
@@ -1692,7 +1689,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;
             pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
             return { ...old,
               pageIndex
@@ -1721,9 +1718,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);
@@ -1733,7 +1730,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) {
@@ -1787,15 +1784,9 @@
           return instance._getPaginationRowModel();
         },
         getPageCount: () => {
-          const {
-            pageCount
-          } = instance.getState().pagination;
-
-          if (typeof pageCount !== 'undefined') {
-            return pageCount;
-          }
+          var _instance$options$pag2;
 
-          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);
         }
       };
     }
@@ -2117,7 +2108,7 @@
             return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugTable;
           }
         }),
-        getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getGroupedRowModel()], (rowSelection, rowModel) => {
+        getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getSortedRowModel()], (rowSelection, rowModel) => {
           if (!Object.keys(rowSelection).length) {
             return {
               rows: [],
@@ -2667,7 +2658,7 @@
 
           instance.setSorting(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
         },
-        getPreSortedRowModel: () => instance.getFilteredRowModel(),
+        getPreSortedRowModel: () => instance.getGroupedRowModel(),
         getSortedRowModel: () => {
           if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
             instance._getSortedRowModel = instance.options.getSortedRowModel(instance);