@tanstack/react-table 8.0.0-beta.4 → 8.0.0-beta.7

package/build/stats-html.html

@@ -2669,7 +2669,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"name":"packages","children":[{"name":"table-core/build/esm/index.js","uid":"50f7-127"},{"name":"react-table/src/index.tsx","uid":"50f7-129"}]}]}],"isRoot":true},"nodeParts":{"50f7-127":{"renderedLength":138364,"gzipLength":23596,"brotliLength":0,"mainUid":"50f7-126"},"50f7-129":{"renderedLength":2135,"gzipLength":854,"brotliLength":0,"mainUid":"50f7-128"}},"nodeMetas":{"50f7-126":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"50f7-127"},"imported":[],"importedBy":[{"uid":"50f7-128"}]},"50f7-128":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"50f7-129"},"imported":[{"uid":"50f7-130"},{"uid":"50f7-126"}],"importedBy":[],"isEntry":true},"50f7-130":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"50f7-128"}],"isExternal":true}},"env":{"rollup":"2.70.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"name":"packages","children":[{"name":"table-core/build/esm/index.js","uid":"779a-127"},{"name":"react-table/src/index.tsx","uid":"779a-129"}]}]}],"isRoot":true},"nodeParts":{"779a-127":{"renderedLength":138802,"gzipLength":23615,"brotliLength":0,"mainUid":"779a-126"},"779a-129":{"renderedLength":2135,"gzipLength":854,"brotliLength":0,"mainUid":"779a-128"}},"nodeMetas":{"779a-126":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"779a-127"},"imported":[],"importedBy":[{"uid":"779a-128"}]},"779a-128":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"779a-129"},"imported":[{"uid":"779a-130"},{"uid":"779a-126"}],"importedBy":[],"isEntry":true},"779a-130":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"779a-128"}],"isExternal":true}},"env":{"rollup":"2.70.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -11,11 +11,11 @@
             "children": [
               {
                 "name": "table-core/build/esm/index.js",
-                "uid": "50f7-132"
+                "uid": "779a-132"
               },
               {
                 "name": "react-table/src/index.tsx",
-                "uid": "50f7-134"
+                "uid": "779a-134"
               }
             ]
           }
@@ -25,55 +25,55 @@
     "isRoot": true
   },
   "nodeParts": {
-    "50f7-132": {
-      "renderedLength": 138364,
-      "gzipLength": 23596,
+    "779a-132": {
+      "renderedLength": 138802,
+      "gzipLength": 23615,
       "brotliLength": 0,
-      "mainUid": "50f7-131"
+      "mainUid": "779a-131"
     },
-    "50f7-134": {
+    "779a-134": {
       "renderedLength": 2135,
       "gzipLength": 854,
       "brotliLength": 0,
-      "mainUid": "50f7-133"
+      "mainUid": "779a-133"
     }
   },
   "nodeMetas": {
-    "50f7-131": {
+    "779a-131": {
       "id": "/packages/table-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "50f7-132"
+        "index.production.js": "779a-132"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "50f7-133"
+          "uid": "779a-133"
         }
       ]
     },
-    "50f7-133": {
+    "779a-133": {
       "id": "/packages/react-table/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "50f7-134"
+        "index.production.js": "779a-134"
       },
       "imported": [
         {
-          "uid": "50f7-135"
+          "uid": "779a-135"
         },
         {
-          "uid": "50f7-131"
+          "uid": "779a-131"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "50f7-135": {
+    "779a-135": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "50f7-133"
+          "uid": "779a-133"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -848,7 +848,6 @@
     getDefaultOptions: instance => {
       return {
         onExpandedChange: makeStateUpdater('expanded', instance),
-        autoResetExpanded: true,
         paginateExpandedRows: true
       };
     },
@@ -857,6 +856,8 @@
       let queued = false;
       return {
         _autoResetExpanded: () => {
+          var _ref, _instance$options$aut;
+
           if (!registered) {
             instance._queue(() => {
               registered = true;
@@ -865,11 +866,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;
 
@@ -933,7 +930,7 @@
           });
           return maxDepth;
         },
-        getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+        getPreExpandedRowModel: () => instance.getSortedRowModel(),
         getExpandedRowModel: () => {
           if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
             instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1534,7 +1531,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);
@@ -1567,7 +1564,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: () => {
           {
@@ -2052,11 +2049,11 @@
           });
         },
         toggleAllPageRowsSelected: value => instance.setRowSelection(old => {
-          typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
+          const resolvedValue = typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
           const rowSelection = { ...old
           };
           instance.getRowModel().rows.forEach(row => {
-            mutateRowIsSelected(rowSelection, row.id, value, instance);
+            mutateRowIsSelected(rowSelection, row.id, resolvedValue, instance);
           });
           return rowSelection;
         }),
@@ -2147,7 +2144,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: [],
@@ -2211,7 +2208,7 @@
         },
         getIsSomePageRowsSelected: () => {
           const paginationFlatRows = instance.getPaginationRowModel().flatRows;
-          return instance.getIsAllPageRowsSelected() ? false : !!(paginationFlatRows != null && paginationFlatRows.length);
+          return instance.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
         },
         getToggleAllRowsSelectedHandler: () => {
           return e => {
@@ -2697,7 +2694,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);
@@ -3847,20 +3844,34 @@
       const pageStart = pageSize * pageIndex;
       const pageEnd = pageStart + pageSize;
       rows = rows.slice(pageStart, pageEnd);
+      let paginatedRowModel;
 
       if (!instance.options.paginateExpandedRows) {
-        return expandRows({
+        paginatedRowModel = expandRows({
           rows,
           flatRows,
           rowsById
         });
+      } else {
+        paginatedRowModel = {
+          rows,
+          flatRows,
+          rowsById
+        };
       }
 
-      return {
-        rows,
-        flatRows,
-        rowsById
+      paginatedRowModel.flatRows = [];
+
+      const handleRow = row => {
+        paginatedRowModel.flatRows.push(row);
+
+        if (row.subRows.length) {
+          row.subRows.forEach(handleRow);
+        }
       };
+
+      paginatedRowModel.rows.forEach(handleRow);
+      return paginatedRowModel;
     }, {
       key: 'getPaginationRowModel',
       debug: () => {