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

package/build/cjs/table-core/build/esm/index.js

@@ -828,7 +828,6 @@ const Expanding = {
   getDefaultOptions: instance => {
     return {
       onExpandedChange: makeStateUpdater('expanded', instance),
-      autoResetExpanded: true,
       paginateExpandedRows: true
     };
   },
@@ -837,6 +836,8 @@ const Expanding = {
     let queued = false;
     return {
       _autoResetExpanded: () => {
+        var _ref, _instance$options$aut;
+
         if (!registered) {
           instance._queue(() => {
             registered = true;
@@ -845,11 +846,7 @@ const Expanding = {
           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;
 
@@ -913,7 +910,7 @@ const Expanding = {
         });
         return maxDepth;
       },
-      getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+      getPreExpandedRowModel: () => instance.getSortedRowModel(),
       getExpandedRowModel: () => {
         if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
           instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1514,7 +1511,7 @@ const Grouping = {
 
         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);
@@ -1547,7 +1544,7 @@ const Grouping = {
       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: () => {
         if (process.env.NODE_ENV === 'development') {
@@ -1702,7 +1699,7 @@ const Pagination = {
       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
@@ -1731,9 +1728,9 @@ const Pagination = {
         });
       },
       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);
@@ -1743,7 +1740,7 @@ const Pagination = {
           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) {
@@ -1797,15 +1794,9 @@ const Pagination = {
         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);
       }
     };
   }
@@ -2127,7 +2118,7 @@ const RowSelection = {
           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: [],
@@ -2677,7 +2668,7 @@ const Sorting = {
 
         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);