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

package/build/umd/index.development.js

@@ -2553,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);
@@ -2579,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));
@@ -2611,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'
                   };
                 }
 
@@ -2624,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;