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

package/build/cjs/table-core/build/esm/index.js

@@ -124,7 +124,7 @@ function createColumn(instance, columnDef, depth, parent) {
     throw new Error();
   }
 
-  let column = { ...columnDef,
+  let column = {
     id: "" + id,
     accessorFn,
     parent: parent,
@@ -888,8 +888,12 @@ const Expanding = {
       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
 
 
@@ -2344,21 +2348,54 @@ function isRowSelected(row, selection, instance) {
 }
 
 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
@@ -2405,48 +2442,17 @@ function compareAlphanumeric(aStr, bStr) {
   }
 
   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 = {
@@ -2527,8 +2533,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);
@@ -2553,30 +2561,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));
@@ -2585,7 +2592,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'
                 };
               }
 
@@ -2598,6 +2605,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;
 
@@ -2698,8 +2722,8 @@ const Visibility = {
   },
   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: process.env.NODE_ENV === 'production' && 'row._getAllVisibleCells',
         debug: () => {
@@ -3052,13 +3076,15 @@ function createCell(instance, row, column, columnId) {
     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 => {
@@ -3133,27 +3159,23 @@ function getCoreRowModel() {
       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 (process.env.NODE_ENV !== '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
 
@@ -3164,7 +3186,7 @@ function getCoreRowModel() {
         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);