@tanstack/react-table 8.1.4 → 8.2.2

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":"8281-123"},{"name":"react-table/src/index.tsx","uid":"8281-125"}]}]}],"isRoot":true},"nodeParts":{"8281-123":{"renderedLength":134456,"gzipLength":23088,"brotliLength":0,"mainUid":"8281-122"},"8281-125":{"renderedLength":1900,"gzipLength":752,"brotliLength":0,"mainUid":"8281-124"}},"nodeMetas":{"8281-122":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"8281-123"},"imported":[],"importedBy":[{"uid":"8281-124"}]},"8281-124":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"8281-125"},"imported":[{"uid":"8281-126"},{"uid":"8281-122"}],"importedBy":[],"isEntry":true},"8281-126":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"8281-124"}],"isExternal":true}},"env":{"rollup":"2.75.7"},"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":"a9b1-123"},{"name":"react-table/src/index.tsx","uid":"a9b1-125"}]}]}],"isRoot":true},"nodeParts":{"a9b1-123":{"renderedLength":134594,"gzipLength":23188,"brotliLength":0,"mainUid":"a9b1-122"},"a9b1-125":{"renderedLength":1900,"gzipLength":752,"brotliLength":0,"mainUid":"a9b1-124"}},"nodeMetas":{"a9b1-122":{"id":"/packages/table-core/build/esm/index.js","moduleParts":{"index.production.js":"a9b1-123"},"imported":[],"importedBy":[{"uid":"a9b1-124"}]},"a9b1-124":{"id":"/packages/react-table/src/index.tsx","moduleParts":{"index.production.js":"a9b1-125"},"imported":[{"uid":"a9b1-126"},{"uid":"a9b1-122"}],"importedBy":[],"isEntry":true},"a9b1-126":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"a9b1-124"}],"isExternal":true}},"env":{"rollup":"2.76.0"},"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": "8281-128"
+                "uid": "a9b1-128"
               },
               {
                 "name": "react-table/src/index.tsx",
-                "uid": "8281-130"
+                "uid": "a9b1-130"
               }
             ]
           }
@@ -25,62 +25,62 @@
     "isRoot": true
   },
   "nodeParts": {
-    "8281-128": {
-      "renderedLength": 134456,
-      "gzipLength": 23088,
+    "a9b1-128": {
+      "renderedLength": 134594,
+      "gzipLength": 23188,
       "brotliLength": 0,
-      "mainUid": "8281-127"
+      "mainUid": "a9b1-127"
     },
-    "8281-130": {
+    "a9b1-130": {
       "renderedLength": 1900,
       "gzipLength": 752,
       "brotliLength": 0,
-      "mainUid": "8281-129"
+      "mainUid": "a9b1-129"
     }
   },
   "nodeMetas": {
-    "8281-127": {
+    "a9b1-127": {
       "id": "/packages/table-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "8281-128"
+        "index.production.js": "a9b1-128"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "8281-129"
+          "uid": "a9b1-129"
         }
       ]
     },
-    "8281-129": {
+    "a9b1-129": {
       "id": "/packages/react-table/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "8281-130"
+        "index.production.js": "a9b1-130"
       },
       "imported": [
         {
-          "uid": "8281-131"
+          "uid": "a9b1-131"
         },
         {
-          "uid": "8281-127"
+          "uid": "a9b1-127"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "8281-131": {
+    "a9b1-131": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "8281-129"
+          "uid": "a9b1-129"
         }
       ],
       "isExternal": true
     }
   },
   "env": {
-    "rollup": "2.75.7"
+    "rollup": "2.76.0"
   },
   "options": {
     "gzip": true,

package/build/umd/index.development.js

@@ -2383,7 +2383,12 @@
   };
 
   const datetime = (rowA, rowB, columnId) => {
-    return compareBasic(rowA.getValue(columnId).getTime(), rowB.getValue(columnId).getTime());
+    const a = rowA.getValue(columnId);
+    const b = rowB.getValue(columnId); // Can handle nullish values
+    // Use > and < because == (and ===) doesn't work with
+    // Date objects (would require calling getTime()).
+
+    return a > b ? 1 : a < b ? -1 : 0;
   };
 
   const basic = (rowA, rowB, columnId) => {
@@ -2544,18 +2549,17 @@
           // }
           // this needs to be outside of table.setSorting to be in sync with rerender
           const nextSortingOrder = column.getNextSortingOrder();
+          const hasManualValue = typeof desc !== 'undefined' && desc !== null;
           table.setSorting(old => {
-            var _table$options$enable, _table$options$enable2;
-
             // Find any existing sorting for this column
             const existingSorting = old == null ? void 0 : old.find(d => d.id === column.id);
             const existingIndex = old == null ? void 0 : old.findIndex(d => d.id === column.id);
-            const hasDescDefined = typeof desc !== 'undefined' && desc !== null;
             let newSorting = []; // What should we do with this sort action?
 
             let sortAction;
+            let nextDesc = hasManualValue ? desc : nextSortingOrder === 'desc'; // Multi-mode
 
-            if (column.getCanMultiSort() && multi) {
+            if (old != null && old.length && column.getCanMultiSort() && multi) {
               if (existingSorting) {
                 sortAction = 'toggle';
               } else {
@@ -2573,63 +2577,71 @@
             } // Handle toggle states that will remove the sorting
 
 
-            if (sortAction === 'toggle' && ( // Must be toggling
-            (_table$options$enable = table.options.enableSortingRemoval) != null ? _table$options$enable : true) && // If enableSortRemove, enable in general
-            !hasDescDefined && ( // Must not be setting desc
-            multi ? (_table$options$enable2 = table.options.enableMultiRemove) != null ? _table$options$enable2 : true : true) && // If multi, don't allow if enableMultiRemove
-            !nextSortingOrder // Finally, detect if it should indeed be removed
-            ) {
-              sortAction = 'remove';
+            if (sortAction === 'toggle') {
+              // If we are "actually" toggling (not a manual set value), should we remove the sorting?
+              if (!hasManualValue) {
+                // Is our intention to remove?
+                if (!nextSortingOrder) {
+                  sortAction = 'remove';
+                }
+              }
             }
 
-            if (sortAction === 'replace') {
-              newSorting = [{
-                id: column.id,
-                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
-              }];
-            } else if (sortAction === 'add' && old != null && old.length) {
+            if (sortAction === 'add') {
               var _table$options$maxMul;
 
               newSorting = [...old, {
                 id: column.id,
-                desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
+                desc: nextDesc
               }]; // Take latest n columns
 
               newSorting.splice(0, newSorting.length - ((_table$options$maxMul = table.options.maxMultiSortColCount) != null ? _table$options$maxMul : Number.MAX_SAFE_INTEGER));
-            } else if (sortAction === 'toggle' && old != null && old.length) {
+            } else if (sortAction === 'toggle') {
               // This flips (or sets) the
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
+                    desc: nextDesc
                   };
                 }
 
                 return d;
               });
-            } else if (sortAction === 'remove' && old != null && old.length) {
+            } else if (sortAction === 'remove') {
               newSorting = old.filter(d => d.id !== column.id);
+            } else {
+              newSorting = [{
+                id: column.id,
+                desc: nextDesc
+              }];
             }
 
             return newSorting;
           });
         },
-        getNextSortingOrder: () => {
+        getFirstSortDir: () => {
           var _ref, _column$columnDef$sor;
 
           const sortDescFirst = (_ref = (_column$columnDef$sor = column.columnDef.sortDescFirst) != null ? _column$columnDef$sor : table.options.sortDescFirst) != null ? _ref : column.getAutoSortDir() === 'desc';
-          const firstSortDirection = sortDescFirst ? 'desc' : 'asc';
+          return sortDescFirst ? 'desc' : 'asc';
+        },
+        getNextSortingOrder: multi => {
+          var _table$options$enable, _table$options$enable2;
+
+          const firstSortDirection = column.getFirstSortDir();
           const isSorted = column.getIsSorted();
 
           if (!isSorted) {
             return firstSortDirection;
           }
 
-          if (isSorted === firstSortDirection) {
-            return isSorted === 'desc' ? 'asc' : 'desc';
-          } else {
+          if (isSorted !== firstSortDirection && ((_table$options$enable = table.options.enableSortingRemoval) != null ? _table$options$enable : true) && ( // If enableSortRemove, enable in general
+          multi ? (_table$options$enable2 = table.options.enableMultiRemove) != null ? _table$options$enable2 : true : true) // If multi, don't allow if enableMultiRemove))
+          ) {
             return false;
           }
+
+          return isSorted === 'desc' ? 'asc' : 'desc';
         },
         getCanSort: () => {
           var _column$columnDef$ena, _table$options$enable3;
@@ -2911,9 +2923,9 @@
           header: props => props.header.column.id,
           footer: props => props.header.column.id,
           cell: props => {
-            var _toString, _props$renderValue;
+            var _props$renderValue$to, _props$renderValue;
 
-            return (_toString = (_props$renderValue = props.renderValue()) == null ? void 0 : _props$renderValue.toString == null ? void 0 : _props$renderValue.toString()) != null ? _toString : null;
+            return (_props$renderValue$to = (_props$renderValue = props.renderValue()) == null ? void 0 : _props$renderValue.toString == null ? void 0 : _props$renderValue.toString()) != null ? _props$renderValue$to : null;
           },
           ...table._features.reduce((obj, feature) => {
             return Object.assign(obj, feature.getDefaultColumnDef == null ? void 0 : feature.getDefaultColumnDef());
@@ -3443,9 +3455,7 @@
       let facetedMinMaxValues = [firstValue, firstValue];
 
       for (let i = 0; i < facetedRowModel.flatRows.length; i++) {
-        var _facetedRowModel$flat2;
-
-        const value = (_facetedRowModel$flat2 = facetedRowModel.flatRows[i]) == null ? void 0 : _facetedRowModel$flat2.getValue(columnId);
+        const value = facetedRowModel.flatRows[i].getValue(columnId);
 
         if (value < facetedMinMaxValues[0]) {
           facetedMinMaxValues[0] = value;
@@ -3595,7 +3605,7 @@
           const subRows = groupUpRecursively(groupedRows, depth + 1, id); // Flatten the leaf rows of the rows in this group
 
           const leafRows = depth ? flattenBy(groupedRows, row => row.subRows) : groupedRows;
-          const row = createRow(table, id, undefined, index, depth);
+          const row = createRow(table, id, leafRows[0].original, index, depth);
           Object.assign(row, {
             groupingColumnId: columnId,
             groupingValue,