@tanstack/react-table 8.0.0-alpha.86 → 8.0.0-alpha.89

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":"74a1-127"},{"name":"react-table/src/index.tsx","uid":"74a1-129"}]}]}],"isRoot":true},"nodeParts":{"74a1-127":{"renderedLength":137358,"gzipLength":23347,"brotliLength":0,"mainUid":"74a1-126"},"74a1-129":{"renderedLength":2102,"gzipLength":836,"brotliLength":0,"mainUid":"74a1-128"}},"nodeMetas":{"74a1-126":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"74a1-127"},"imported":[],"importedBy":[{"uid":"74a1-128"}]},"74a1-128":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"74a1-129"},"imported":[{"uid":"74a1-130"},{"uid":"74a1-126"}],"importedBy":[],"isEntry":true},"74a1-130":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"74a1-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":"756b-127"},{"name":"react-table/src/index.tsx","uid":"756b-129"}]}]}],"isRoot":true},"nodeParts":{"756b-127":{"renderedLength":137942,"gzipLength":23472,"brotliLength":0,"mainUid":"756b-126"},"756b-129":{"renderedLength":2102,"gzipLength":836,"brotliLength":0,"mainUid":"756b-128"}},"nodeMetas":{"756b-126":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"756b-127"},"imported":[],"importedBy":[{"uid":"756b-128"}]},"756b-128":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"756b-129"},"imported":[{"uid":"756b-130"},{"uid":"756b-126"}],"importedBy":[],"isEntry":true},"756b-130":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"756b-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": "74a1-132"
+                "uid": "756b-132"
               },
               {
                 "name": "react-table/src/index.tsx",
-                "uid": "74a1-134"
+                "uid": "756b-134"
               }
             ]
           }
@@ -25,55 +25,55 @@
     "isRoot": true
   },
   "nodeParts": {
-    "74a1-132": {
-      "renderedLength": 137358,
-      "gzipLength": 23347,
+    "756b-132": {
+      "renderedLength": 137942,
+      "gzipLength": 23472,
       "brotliLength": 0,
-      "mainUid": "74a1-131"
+      "mainUid": "756b-131"
     },
-    "74a1-134": {
+    "756b-134": {
       "renderedLength": 2102,
       "gzipLength": 836,
       "brotliLength": 0,
-      "mainUid": "74a1-133"
+      "mainUid": "756b-133"
     }
   },
   "nodeMetas": {
-    "74a1-131": {
+    "756b-131": {
       "id": "/packages/table-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "74a1-132"
+        "index.production.js": "756b-132"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "74a1-133"
+          "uid": "756b-133"
         }
       ]
     },
-    "74a1-133": {
+    "756b-133": {
       "id": "/packages/react-table/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "74a1-134"
+        "index.production.js": "756b-134"
       },
       "imported": [
         {
-          "uid": "74a1-135"
+          "uid": "756b-135"
         },
         {
-          "uid": "74a1-131"
+          "uid": "756b-131"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "74a1-135": {
+    "756b-135": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "74a1-133"
+          "uid": "756b-133"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -144,7 +144,7 @@
       }
     }
 
-    let column = { ...columnDef,
+    let column = {
       id: "" + id,
       accessorFn,
       parent: parent,
@@ -908,8 +908,12 @@
         getIsAllRowsExpanded: () => {
           const expanded = instance.getState().expanded; // If expanded is true, save some cycles and return true
 
-          if (expanded === true) {
-            return true;
+          if (typeof expanded === 'boolean') {
+            return expanded === true;
+          }
+
+          if (!Object.keys(expanded).length) {
+            return false;
           } // If any row is not expanded, return false
 
 
@@ -2364,21 +2368,54 @@
   }
 
   const reSplitAlphaNumeric = /([0-9]+)/gm;
-  const sortingFns = {
-    alphanumeric,
-    alphanumericCaseSensitive,
-    text,
-    textCaseSensitive,
-    datetime,
-    basic
-  };
 
-  function alphanumeric(rowA, rowB, columnId) {
+  const alphanumeric = (rowA, rowB, columnId) => {
     return compareAlphanumeric(toString(rowA.getValue(columnId)).toLowerCase(), toString(rowB.getValue(columnId)).toLowerCase());
-  }
+  };
 
-  function alphanumericCaseSensitive(rowA, rowB, columnId) {
+  const alphanumericCaseSensitive = (rowA, rowB, columnId) => {
     return compareAlphanumeric(toString(rowA.getValue(columnId)), toString(rowB.getValue(columnId)));
+  }; // The text filter is more basic (less numeric support)
+  // but is much faster
+
+
+  const text = (rowA, rowB, columnId) => {
+    return compareBasic(toString(rowA.getValue(columnId)).toLowerCase(), toString(rowB.getValue(columnId)).toLowerCase());
+  }; // The text filter is more basic (less numeric support)
+  // but is much faster
+
+
+  const textCaseSensitive = (rowA, rowB, columnId) => {
+    return compareBasic(toString(rowA.getValue(columnId)), toString(rowB.getValue(columnId)));
+  };
+
+  const datetime = (rowA, rowB, columnId) => {
+    return compareBasic(rowA.getValue(columnId).getTime(), rowB.getValue(columnId).getTime());
+  };
+
+  const basic = (rowA, rowB, columnId) => {
+    return compareBasic(rowA.getValue(columnId), rowB.getValue(columnId));
+  }; // Utils
+
+
+  function compareBasic(a, b) {
+    return a === b ? 0 : a > b ? 1 : -1;
+  }
+
+  function toString(a) {
+    if (typeof a === 'number') {
+      if (isNaN(a) || a === Infinity || a === -Infinity) {
+        return '';
+      }
+
+      return String(a);
+    }
+
+    if (typeof a === 'string') {
+      return a;
+    }
+
+    return '';
   } // Mixed sorting is slow, but very inclusive of many edge cases.
   // It handles numbers, mixed alphanumeric combinations, and even
   // null, undefined, and Infinity
@@ -2425,48 +2462,17 @@
     }
 
     return a.length - b.length;
-  } // The text filter is more basic (less numeric support)
-  // but is much faster
-
-
-  function text(rowA, rowB, columnId) {
-    return compareBasic(toString(rowA.getValue(columnId)).toLowerCase(), toString(rowB.getValue(columnId)).toLowerCase());
-  } // The text filter is more basic (less numeric support)
-  // but is much faster
-
-
-  function textCaseSensitive(rowA, rowB, columnId) {
-    return compareBasic(toString(rowA.getValue(columnId)), toString(rowB.getValue(columnId)));
-  }
-
-  function datetime(rowA, rowB, columnId) {
-    return compareBasic(rowA.getValue(columnId).getTime(), rowB.getValue(columnId).getTime());
-  }
-
-  function basic(rowA, rowB, columnId) {
-    return compareBasic(rowA.getValue(columnId), rowB.getValue(columnId));
-  } // Utils
-
-
-  function compareBasic(a, b) {
-    return a === b ? 0 : a > b ? 1 : -1;
-  }
+  } // Exports
 
-  function toString(a) {
-    if (typeof a === 'number') {
-      if (isNaN(a) || a === Infinity || a === -Infinity) {
-        return '';
-      }
-
-      return String(a);
-    }
 
-    if (typeof a === 'string') {
-      return a;
-    }
-
-    return '';
-  }
+  const sortingFns = {
+    alphanumeric,
+    alphanumericCaseSensitive,
+    text,
+    textCaseSensitive,
+    datetime,
+    basic
+  };
 
   //
   const Sorting = {
@@ -2547,8 +2553,10 @@
           //   })
           //   return
           // }
+          // this needs to be outside of instance.setSorting to be in sync with rerender
+          const nextSortingOrder = column.getNextSortingOrder();
           instance.setSorting(old => {
-            var _ref2, _column$columnDef$sor, _instance$options$ena, _instance$options$ena2;
+            var _instance$options$ena, _instance$options$ena2;
 
             // Find any existing sorting for this column
             const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
@@ -2573,30 +2581,29 @@
               } else {
                 sortAction = 'replace';
               }
-            }
+            } // Handle toggle states that will remove the sorting
 
-            const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc'; // Handle toggle states that will remove the sorting
 
             if (sortAction === 'toggle' && ( // Must be toggling
             (_instance$options$ena = instance.options.enableSortingRemoval) != null ? _instance$options$ena : true) && // If enableSortRemove, enable in general
             !hasDescDefined && ( // Must not be setting desc
-            multi ? (_instance$options$ena2 = instance.options.enableMultiRemove) != null ? _instance$options$ena2 : true : true) && ( // If multi, don't allow if enableMultiRemove
-            existingSorting != null && existingSorting.desc // Finally, detect if it should indeed be removed
-            ? !sortDescFirst : sortDescFirst)) {
+            multi ? (_instance$options$ena2 = instance.options.enableMultiRemove) != null ? _instance$options$ena2 : true : true) && // If multi, don't allow if enableMultiRemove
+            !nextSortingOrder // Finally, detect if it should indeed be removed
+            ) {
               sortAction = 'remove';
             }
 
             if (sortAction === 'replace') {
               newSorting = [{
                 id: column.id,
-                desc: hasDescDefined ? desc : !!sortDescFirst
+                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
               }];
             } else if (sortAction === 'add' && old != null && old.length) {
               var _instance$options$max;
 
               newSorting = [...old, {
                 id: column.id,
-                desc: hasDescDefined ? desc : !!sortDescFirst
+                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
               }]; // Take latest n columns
 
               newSorting.splice(0, newSorting.length - ((_instance$options$max = instance.options.maxMultiSortColCount) != null ? _instance$options$max : Number.MAX_SAFE_INTEGER));
@@ -2605,7 +2612,7 @@
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                   };
                 }
 
@@ -2618,6 +2625,23 @@
             return newSorting;
           });
         },
+        getNextSortingOrder: () => {
+          var _ref2, _column$columnDef$sor;
+
+          const sortDescFirst = (_ref2 = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : instance.options.sortDescFirst) != null ? _ref2 : column.getAutoSortDir() === 'desc';
+          const firstSortDirection = sortDescFirst ? 'desc' : 'asc';
+          const isSorted = column.getIsSorted();
+
+          if (!isSorted) {
+            return firstSortDirection;
+          }
+
+          if (isSorted === firstSortDirection) {
+            return isSorted === 'desc' ? 'asc' : 'desc';
+          } else {
+            return false;
+          }
+        },
         getCanSort: () => {
           var _column$columnDef$ena, _instance$options$ena3;
 
@@ -2718,8 +2742,8 @@
     },
     createRow: (row, instance) => {
       return {
-        _getAllVisibleCells: memo(() => [row.getAllCells().filter(cell => cell.column.getIsVisible()).map(d => d.id).join('_')], _ => {
-          return row.getAllCells().filter(cell => cell.column.getIsVisible());
+        _getAllVisibleCells: memo(() => [row.getAllCells(), instance.getState().columnVisibility], cells => {
+          return cells.filter(cell => cell.column.getIsVisible());
         }, {
           key: "development" === 'production' ,
           debug: () => {
@@ -3070,13 +3094,15 @@
       row,
       column,
       getValue: () => row.getValue(columnId),
-      renderCell: () => column.columnDef.cell ? instance._render(column.columnDef.cell, {
-        instance,
-        column,
-        row,
-        cell: cell,
-        getValue: cell.getValue
-      }) : null
+      renderCell: () => {
+        return column.columnDef.cell ? instance._render(column.columnDef.cell, {
+          instance,
+          column,
+          row,
+          cell: cell,
+          getValue: cell.getValue
+        }) : null;
+      }
     };
 
     instance._features.forEach(feature => {
@@ -3151,27 +3177,23 @@
         flatRows: [],
         rowsById: {}
       };
-      let rows;
-      let row;
-      let originalRow;
 
       const accessRows = function (originalRows, depth, parent) {
         if (depth === void 0) {
           depth = 0;
         }
 
-        rows = [];
+        const rows = [];
 
         for (let i = 0; i < originalRows.length; i++) {
-          originalRow = originalRows[i]; // This could be an expensive check at scale, so we should move it somewhere else, but where?
+          // This could be an expensive check at scale, so we should move it somewhere else, but where?
           // if (!id) {
           //   if ("development" !== 'production') {
           //     throw new Error(`getRowId expected an ID, but got ${id}`)
           //   }
           // }
           // Make the row
-
-          row = createRow(instance, instance._getRowId(originalRow, i, parent), originalRow, i, depth); // Keep track of every row in a flat array
+          const row = createRow(instance, instance._getRowId(originalRows[i], i, parent), originalRows[i], i, depth); // Keep track of every row in a flat array
 
           rowModel.flatRows.push(row); // Also keep track of every row by its ID
 
@@ -3182,7 +3204,7 @@
           if (instance.options.getSubRows) {
             var _row$originalSubRows;
 
-            row.originalSubRows = instance.options.getSubRows(originalRow, i); // Then recursively access them
+            row.originalSubRows = instance.options.getSubRows(originalRows[i], i); // Then recursively access them
 
             if ((_row$originalSubRows = row.originalSubRows) != null && _row$originalSubRows.length) {
               row.subRows = accessRows(row.originalSubRows, depth + 1, row);