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

package/build/types/features/Sorting.d.ts

@@ -9,13 +9,13 @@ export declare type ColumnSort = {
     desc: boolean;
 };
 export declare type SortingState = ColumnSort[];
+export declare type SortingTableState = {
+    sorting: SortingState;
+};
 export declare type SortingFn<TGenerics extends TableGenerics> = {
     (rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): number;
 };
 export declare type CustomSortingFns<TGenerics extends TableGenerics> = Record<string, SortingFn<TGenerics>>;
-export declare type SortingTableState = {
-    sorting: SortingState;
-};
 export declare type SortingFnOption<TGenerics extends TableGenerics> = 'auto' | BuiltInSortingFn | keyof TGenerics['SortingFns'] | SortingFn<TGenerics>;
 export declare type SortingColumnDef<TGenerics extends TableGenerics> = {
     sortingFn?: SortingFnOption<Overwrite<TGenerics, {
@@ -31,6 +31,7 @@ export declare type SortingColumn<TGenerics extends TableGenerics> = {
     getAutoSortingFn: () => SortingFn<TGenerics>;
     getAutoSortDir: () => SortDirection;
     getSortingFn: () => SortingFn<TGenerics>;
+    getNextSortingOrder: () => SortDirection | false;
     getCanSort: () => boolean;
     getCanMultiSort: () => boolean;
     getSortIndex: () => number;

package/build/types/index.d.ts

@@ -5,7 +5,6 @@ export * from './core/column';
 export * from './core/headers';
 export * from './core/row';
 export * from './features/ColumnSizing';
-export * from './features/ColumnSizing';
 export * from './features/Expanding';
 export * from './features/Filters';
 export * from './features/Grouping';
@@ -15,7 +14,6 @@ export * from './features/Pinning';
 export * from './features/RowSelection';
 export * from './features/Sorting';
 export * from './features/Visibility';
-export * from './features/Expanding';
 export * from './filterFns';
 export * from './sortingFns';
 export * from './aggregationFns';

package/build/types/sortingFns.d.ts

@@ -1,18 +1,11 @@
-import { TableGenerics, Row } from './types';
+import { SortingFn } from './features/Sorting';
 export declare const reSplitAlphaNumeric: RegExp;
 export declare const sortingFns: {
-    alphanumeric: typeof alphanumeric;
-    alphanumericCaseSensitive: typeof alphanumericCaseSensitive;
-    text: typeof text;
-    textCaseSensitive: typeof textCaseSensitive;
-    datetime: typeof datetime;
-    basic: typeof basic;
+    alphanumeric: SortingFn<any>;
+    alphanumericCaseSensitive: SortingFn<any>;
+    text: SortingFn<any>;
+    textCaseSensitive: SortingFn<any>;
+    datetime: SortingFn<any>;
+    basic: SortingFn<any>;
 };
 export declare type BuiltInSortingFn = keyof typeof sortingFns;
-declare function alphanumeric<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): number;
-declare function alphanumericCaseSensitive<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): number;
-declare function text<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): 1 | -1 | 0;
-declare function textCaseSensitive<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): 1 | -1 | 0;
-declare function datetime<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): 1 | -1 | 0;
-declare function basic<TGenerics extends TableGenerics>(rowA: Row<TGenerics>, rowB: Row<TGenerics>, columnId: string): 1 | -1 | 0;
-export {};

package/build/umd/index.development.js

@@ -114,7 +114,7 @@
       }
     }
 
-    let column = { ...columnDef,
+    let column = {
       id: "" + id,
       accessorFn,
       parent: parent,
@@ -878,8 +878,12 @@
         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
 
 
@@ -2334,21 +2338,54 @@
   }
 
   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
@@ -2395,48 +2432,17 @@
     }
 
     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 = {
@@ -2517,8 +2523,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);
@@ -2543,30 +2551,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));
@@ -2575,7 +2582,7 @@
               newSorting = old.map(d => {
                 if (d.id === column.id) {
                   return { ...d,
-                    desc: hasDescDefined ? desc : !(existingSorting != null && existingSorting.desc)
+                    desc: hasDescDefined ? desc : nextSortingOrder === 'desc'
                   };
                 }
 
@@ -2588,6 +2595,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;
 
@@ -2688,8 +2712,8 @@
     },
     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: "development" === 'production' ,
           debug: () => {
@@ -3040,13 +3064,15 @@
       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 => {
@@ -3121,27 +3147,23 @@
         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 ("development" !== '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
 
@@ -3152,7 +3174,7 @@
           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);