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

package/build/esm/index.js

@@ -2531,8 +2531,10 @@ const Sorting = {
         //   })
         //   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);
@@ -2557,30 +2559,29 @@ const Sorting = {
             } 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));
@@ -2589,7 +2590,7 @@ const Sorting = {
             newSorting = old.map(d => {
               if (d.id === column.id) {
                 return { ...d,
-                  desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                  desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                 };
               }
 
@@ -2602,6 +2603,23 @@ const Sorting = {
           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;