@tanstack/svelte-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-163"},{"name":"svelte-table/src","children":[{"uid":"8ad0-165","name":"placeholder.svelte"},{"uid":"8ad0-167","name":"render-component.ts"},{"uid":"8ad0-169","name":"index.ts"}]}]}]}],"isRoot":true},"nodeParts":{"8ad0-163":{"renderedLength":137432,"gzipLength":23367,"brotliLength":0,"mainUid":"8ad0-162"},"8ad0-165":{"renderedLength":925,"gzipLength":444,"brotliLength":0,"mainUid":"8ad0-164"},"8ad0-167":{"renderedLength":1365,"gzipLength":519,"brotliLength":0,"mainUid":"8ad0-166"},"8ad0-169":{"renderedLength":2729,"gzipLength":868,"brotliLength":0,"mainUid":"8ad0-168"}},"nodeMetas":{"8ad0-162":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"8ad0-163"},"imported":[],"importedBy":[{"uid":"8ad0-168"}]},"8ad0-164":{"id":"/packages/svelte-table/src/placeholder.svelte","moduleParts":{"index.production.js":"8ad0-165"},"imported":[{"uid":"8ad0-170"}],"importedBy":[{"uid":"8ad0-168"}]},"8ad0-166":{"id":"/packages/svelte-table/src/render-component.ts","moduleParts":{"index.production.js":"8ad0-167"},"imported":[{"uid":"8ad0-170"}],"importedBy":[{"uid":"8ad0-168"}]},"8ad0-168":{"id":"/packages/svelte-table/src/index.ts","moduleParts":{"index.production.js":"8ad0-169"},"imported":[{"uid":"8ad0-162"},{"uid":"8ad0-164"},{"uid":"8ad0-170"},{"uid":"8ad0-171"},{"uid":"8ad0-166"}],"importedBy":[],"isEntry":true},"8ad0-170":{"id":"svelte/internal","moduleParts":{},"imported":[],"importedBy":[{"uid":"8ad0-168"},{"uid":"8ad0-164"},{"uid":"8ad0-166"}],"isExternal":true},"8ad0-171":{"id":"svelte/store","moduleParts":{},"imported":[],"importedBy":[{"uid":"8ad0-168"}],"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-163"},{"name":"svelte-table/src","children":[{"uid":"756b-165","name":"placeholder.svelte"},{"uid":"756b-167","name":"render-component.ts"},{"uid":"756b-169","name":"index.ts"}]}]}]}],"isRoot":true},"nodeParts":{"756b-163":{"renderedLength":137944,"gzipLength":23474,"brotliLength":0,"mainUid":"756b-162"},"756b-165":{"renderedLength":925,"gzipLength":444,"brotliLength":0,"mainUid":"756b-164"},"756b-167":{"renderedLength":1365,"gzipLength":519,"brotliLength":0,"mainUid":"756b-166"},"756b-169":{"renderedLength":2729,"gzipLength":868,"brotliLength":0,"mainUid":"756b-168"}},"nodeMetas":{"756b-162":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"756b-163"},"imported":[],"importedBy":[{"uid":"756b-168"}]},"756b-164":{"id":"/packages/svelte-table/src/placeholder.svelte","moduleParts":{"index.production.js":"756b-165"},"imported":[{"uid":"756b-170"}],"importedBy":[{"uid":"756b-168"}]},"756b-166":{"id":"/packages/svelte-table/src/render-component.ts","moduleParts":{"index.production.js":"756b-167"},"imported":[{"uid":"756b-170"}],"importedBy":[{"uid":"756b-168"}]},"756b-168":{"id":"/packages/svelte-table/src/index.ts","moduleParts":{"index.production.js":"756b-169"},"imported":[{"uid":"756b-162"},{"uid":"756b-164"},{"uid":"756b-170"},{"uid":"756b-171"},{"uid":"756b-166"}],"importedBy":[],"isEntry":true},"756b-170":{"id":"svelte/internal","moduleParts":{},"imported":[],"importedBy":[{"uid":"756b-168"},{"uid":"756b-164"},{"uid":"756b-166"}],"isExternal":true},"756b-171":{"id":"svelte/store","moduleParts":{},"imported":[],"importedBy":[{"uid":"756b-168"}],"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,21 +11,21 @@
             "children": [
               {
                 "name": "table-core/build/esm/index.js",
-                "uid": "8ad0-173"
+                "uid": "756b-173"
               },
               {
                 "name": "svelte-table/src",
                 "children": [
                   {
-                    "uid": "8ad0-175",
+                    "uid": "756b-175",
                     "name": "placeholder.svelte"
                   },
                   {
-                    "uid": "8ad0-177",
+                    "uid": "756b-177",
                     "name": "render-component.ts"
                   },
                   {
-                    "uid": "8ad0-179",
+                    "uid": "756b-179",
                     "name": "index.ts"
                   }
                 ]
@@ -38,125 +38,125 @@
     "isRoot": true
   },
   "nodeParts": {
-    "8ad0-173": {
-      "renderedLength": 137432,
-      "gzipLength": 23367,
+    "756b-173": {
+      "renderedLength": 137944,
+      "gzipLength": 23474,
       "brotliLength": 0,
-      "mainUid": "8ad0-172"
+      "mainUid": "756b-172"
     },
-    "8ad0-175": {
+    "756b-175": {
       "renderedLength": 925,
       "gzipLength": 444,
       "brotliLength": 0,
-      "mainUid": "8ad0-174"
+      "mainUid": "756b-174"
     },
-    "8ad0-177": {
+    "756b-177": {
       "renderedLength": 1365,
       "gzipLength": 519,
       "brotliLength": 0,
-      "mainUid": "8ad0-176"
+      "mainUid": "756b-176"
     },
-    "8ad0-179": {
+    "756b-179": {
       "renderedLength": 2729,
       "gzipLength": 868,
       "brotliLength": 0,
-      "mainUid": "8ad0-178"
+      "mainUid": "756b-178"
     }
   },
   "nodeMetas": {
-    "8ad0-172": {
+    "756b-172": {
       "id": "/packages/table-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "8ad0-173"
+        "index.production.js": "756b-173"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "8ad0-178"
+          "uid": "756b-178"
         }
       ]
     },
-    "8ad0-174": {
+    "756b-174": {
       "id": "/packages/svelte-table/src/placeholder.svelte",
       "moduleParts": {
-        "index.production.js": "8ad0-175"
+        "index.production.js": "756b-175"
       },
       "imported": [
         {
-          "uid": "8ad0-180"
+          "uid": "756b-180"
         }
       ],
       "importedBy": [
         {
-          "uid": "8ad0-178"
+          "uid": "756b-178"
         }
       ]
     },
-    "8ad0-176": {
+    "756b-176": {
       "id": "/packages/svelte-table/src/render-component.ts",
       "moduleParts": {
-        "index.production.js": "8ad0-177"
+        "index.production.js": "756b-177"
       },
       "imported": [
         {
-          "uid": "8ad0-180"
+          "uid": "756b-180"
         }
       ],
       "importedBy": [
         {
-          "uid": "8ad0-178"
+          "uid": "756b-178"
         }
       ]
     },
-    "8ad0-178": {
+    "756b-178": {
       "id": "/packages/svelte-table/src/index.ts",
       "moduleParts": {
-        "index.production.js": "8ad0-179"
+        "index.production.js": "756b-179"
       },
       "imported": [
         {
-          "uid": "8ad0-172"
+          "uid": "756b-172"
         },
         {
-          "uid": "8ad0-174"
+          "uid": "756b-174"
         },
         {
-          "uid": "8ad0-180"
+          "uid": "756b-180"
         },
         {
-          "uid": "8ad0-181"
+          "uid": "756b-181"
         },
         {
-          "uid": "8ad0-176"
+          "uid": "756b-176"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "8ad0-180": {
+    "756b-180": {
       "id": "svelte/internal",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "8ad0-178"
+          "uid": "756b-178"
         },
         {
-          "uid": "8ad0-174"
+          "uid": "756b-174"
         },
         {
-          "uid": "8ad0-176"
+          "uid": "756b-176"
         }
       ],
       "isExternal": true
     },
-    "8ad0-181": {
+    "756b-181": {
       "id": "svelte/store",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "8ad0-178"
+          "uid": "756b-178"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -2533,8 +2533,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);
@@ -2559,30 +2561,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));
@@ -2591,7 +2592,7 @@
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                   };
                 }
 
@@ -2604,6 +2605,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;