@tanstack/table-core 8.0.0-alpha.72 → 8.0.0-alpha.76

package/build/types/core.d.ts

@@ -14,7 +14,6 @@ export declare type CoreOptions<TGenerics extends TableGenerics> = {
     initialState?: InitialTableState;
     autoResetAll?: boolean;
     mergeOptions?: <T>(defaultOptions: T, options: Partial<T>) => T;
-    keepPreviousData?: boolean;
     meta?: TGenerics['TableMeta'];
 };
 export declare type CoreInstance<TGenerics extends TableGenerics> = {
@@ -22,10 +21,10 @@ export declare type CoreInstance<TGenerics extends TableGenerics> = {
     reset: () => void;
     options: RequiredKeys<TableOptions<TGenerics>, 'state'>;
     setOptions: (newOptions: Updater<TableOptions<TGenerics>>) => void;
-    queue: (cb: () => void) => void;
     getState: () => TableState;
     setState: (updater: Updater<TableState>) => void;
-    render: <TProps>(template: Renderable<TGenerics, TProps>, props: TProps) => string | null | TGenerics['Rendered'];
+    _queue: (cb: () => void) => void;
+    _render: <TProps>(template: Renderable<TGenerics, TProps>, props: TProps) => string | null | TGenerics['Rendered'];
     _features: readonly TableFeature[];
 };
 export declare function createTableInstance<TGenerics extends TableGenerics>(options: TableOptions<TGenerics>): TableInstance<TGenerics>;

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

@@ -18,7 +18,6 @@ export declare type PaginationOptions<TGenerics extends TableGenerics> = {
 };
 export declare type PaginationDefaultOptions = {
     onPaginationChange: OnChangeFn<PaginationState>;
-    autoResetPageIndex: boolean;
 };
 export declare type PaginationInstance<TGenerics extends TableGenerics> = {
     _autoResetPageIndex: () => void;

package/build/umd/index.development.js

@@ -375,7 +375,7 @@
             row,
             column,
             getValue: () => row.getValue(columnId),
-            renderCell: () => column.cell ? instance.render(column.cell, {
+            renderCell: () => column.cell ? instance._render(column.cell, {
               instance,
               column,
               row,
@@ -699,9 +699,10 @@
       return {
         _autoResetExpanded: () => {
           if (!registered) {
-            instance.queue(() => {
+            instance._queue(() => {
               registered = true;
             });
+
             return;
           }
 
@@ -712,7 +713,8 @@
           if (instance.options.autoResetAll === true || instance.options.autoResetExpanded) {
             if (queued) return;
             queued = true;
-            instance.queue(() => {
+
+            instance._queue(() => {
               instance.resetExpanded();
               queued = false;
             });
@@ -1396,7 +1398,7 @@
           var _column$aggregatedCel;
 
           const template = (_column$aggregatedCel = column.aggregatedCell) != null ? _column$aggregatedCel : column.cell;
-          return template ? instance.render(template, {
+          return template ? instance._render(template, {
             instance,
             column,
             row,
@@ -1497,8 +1499,7 @@
     },
     getDefaultOptions: instance => {
       return {
-        onPaginationChange: makeStateUpdater('pagination', instance),
-        autoResetPageIndex: true
+        onPaginationChange: makeStateUpdater('pagination', instance)
       };
     },
     createInstance: instance => {
@@ -1506,21 +1507,21 @@
       let queued = false;
       return {
         _autoResetPageIndex: () => {
+          var _ref, _instance$options$aut;
+
           if (!registered) {
-            instance.queue(() => {
+            instance._queue(() => {
               registered = true;
             });
-            return;
-          }
 
-          if (instance.options.autoResetAll === false) {
             return;
           }
 
-          if (instance.options.autoResetAll === true || instance.options.autoResetPageIndex) {
+          if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetPageIndex) != null ? _ref : !instance.options.manualPagination) {
             if (queued) return;
             queued = true;
-            instance.queue(() => {
+
+            instance._queue(() => {
               instance.resetPageIndex();
               queued = false;
             });
@@ -1542,7 +1543,7 @@
         setPageIndex: updater => {
           instance.setPagination(old => {
             let pageIndex = functionalUpdate(updater, old.pageIndex);
-            const maxPageIndex = old.pageCount && old.pageCount > 0 ? old.pageCount - 1 : Number.MAX_SAFE_INTEGER;
+            const maxPageIndex = typeof old.pageCount !== 'undefined' ? old.pageCount - 1 : Number.MAX_SAFE_INTEGER;
             pageIndex = Math.min(Math.max(0, pageIndex), maxPageIndex);
             return { ...old,
               pageIndex
@@ -2653,12 +2654,12 @@
               recurseHeader(header);
               return leafHeaders;
             },
-            renderHeader: () => column.header ? instance.render(column.header, {
+            renderHeader: () => column.header ? instance._render(column.header, {
               instance,
               header: header,
               column
             }) : null,
-            renderFooter: () => column.footer ? instance.render(column.footer, {
+            renderFooter: () => column.footer ? instance._render(column.footer, {
               instance,
               header: header,
               column
@@ -2698,8 +2699,10 @@
           }
         }),
         getLeftHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.left], (allColumns, leafColumns, left) => {
-          leafColumns = leafColumns.filter(column => left == null ? void 0 : left.includes(column.id));
-          return buildHeaderGroups(allColumns, leafColumns, instance, 'left');
+          var _left$map$filter;
+
+          const orderedLeafColumns = (_left$map$filter = left == null ? void 0 : left.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter : [];
+          return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'left');
         }, {
           key: 'getLeftHeaderGroups',
           debug: () => {
@@ -2709,8 +2712,10 @@
           }
         }),
         getRightHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.right], (allColumns, leafColumns, right) => {
-          leafColumns = leafColumns.filter(column => right == null ? void 0 : right.includes(column.id));
-          return buildHeaderGroups(allColumns, leafColumns, instance, 'right');
+          var _right$map$filter;
+
+          const orderedLeafColumns = (_right$map$filter = right == null ? void 0 : right.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter : [];
+          return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'right');
         }, {
           key: 'getRightHeaderGroups',
           debug: () => {
@@ -3021,7 +3026,6 @@
   //   data: Batch[]
   //   facets: Batch[]
   // }
-  // export type TaskPriority = keyof CoreBatches
   function createTableInstance(options) {
     var _options$initialState;
 
@@ -3060,64 +3064,7 @@
     });
 
     const queued = [];
-    let queuedTimeout = false; // let workScheduled = false
-    // let working = false
-    // let latestCallback: ReturnType<typeof requestIdleCallback>
-    // let batchUid = 0
-    // const onProgress = () => {}
-    // const getBatch = () => {
-    //   instance.batches.data = instance.batches.data.filter(d => d.tasks.length)
-    //   instance.batches.facets = instance.batches.facets.filter(
-    //     d => d.tasks.length
-    //   )
-    //   return (
-    //     instance.batches.data.find(d => d.tasks.length) ??
-    //     instance.batches.facets.find(d => d.tasks.length)
-    //   )
-    // }
-    // const startWorkLoop = () => {
-    //   working = true
-    //   const workLoop = (deadline: IdleDeadline) => {
-    //     const batch = getBatch()
-    //     if (!batch) {
-    //       working = false
-    //       return
-    //     }
-    //     // Prioritize tasks
-    //     while (deadline.timeRemaining() > 0 && batch.tasks.length) {
-    //       batch.tasks.shift()!()
-    //     }
-    //     onProgress()
-    //     if (working) {
-    //       latestCallback = requestIdleCallback(workLoop, { timeout: 10000 })
-    //     }
-    //   }
-    //   latestCallback = requestIdleCallback(workLoop, { timeout: 10000 })
-    // }
-    // const startWork = () => {
-    //   if (getBatch() && !working) {
-    //     if (
-    //       ("development" === 'development' && instance.options.debugAll) ??
-    //       instance.options.debugTable
-    //     ) {
-    //       console.info('Starting work...')
-    //     }
-    //     startWorkLoop()
-    //   }
-    // }
-    // const stopWork = () => {
-    //   if (working) {
-    //     if (
-    //       ("development" === 'development' && instance.options.debugAll) ??
-    //       instance.options.debugTable
-    //     ) {
-    //       console.info('Stopping work...')
-    //     }
-    //     working = false
-    //     cancelIdleCallback(latestCallback)
-    //   }
-    // }
-
+    let queuedTimeout = false;
     const midInstance = { ...instance,
       // init: () => {
       //   startWork()
@@ -3132,7 +3079,7 @@
         ...options
       },
       initialState,
-      queue: cb => {
+      _queue: cb => {
         queued.push(cb);
 
         if (!queuedTimeout) {
@@ -3150,39 +3097,6 @@
           }));
         }
       },
-      // batches: {
-      //   data: [],
-      //   facets: [],
-      // },
-      // createBatch: priority => {
-      //   const batchId = batchUid++
-      //   let canceled: boolean
-      //   const batch: Batch = {
-      //     id: batchId,
-      //     priority,
-      //     tasks: [],
-      //     schedule: cb => {
-      //       if (canceled) return
-      //       batch.tasks.push(cb)
-      //       if (!working && !workScheduled) {
-      //         workScheduled = true
-      //         instance.queue(() => {
-      //           workScheduled = false
-      //           instance.setState(old => ({ ...old }))
-      //         })
-      //       }
-      //     },
-      //     cancel: () => {
-      //       canceled = true
-      //       batch.tasks = []
-      //       instance.batches[priority] = instance.batches[priority].filter(
-      //         b => b.id !== batchId
-      //       )
-      //     },
-      //   }
-      //   instance.batches[priority].push(batch)
-      //   return batch
-      // },
       reset: () => {
         instance.setState(instance.initialState);
       },
@@ -3190,7 +3104,7 @@
         const newOptions = functionalUpdate(updater, instance.options);
         instance.options = mergeOptions(newOptions);
       },
-      render: (template, props) => {
+      _render: (template, props) => {
         if (typeof instance.options.render === 'function') {
           return instance.options.render(template, props);
         }
@@ -3293,69 +3207,55 @@
 
   function getCoreRowModel() {
     return instance => memo(() => [instance.options.data], data => {
-      // Access the row model using initial columns
-      const rows = [];
-      const flatRows = [];
-      const rowsById = {};
-      const leafColumns = instance.getAllLeafColumns();
+      const rowModel = {
+        rows: [],
+        flatRows: [],
+        rowsById: {}
+      };
+      let rows;
+      let row;
+      let originalRow;
 
-      const accessRow = function (originalRow, rowIndex, depth, parentRows, parent) {
+      const accessRows = function (originalRows, depth, parent) {
         if (depth === void 0) {
           depth = 0;
         }
 
-        const id = instance.getRowId(originalRow, rowIndex, parent);
-
-        if (!id) {
-          {
-            throw new Error("getRowId expected an ID, but got " + id);
-          }
-        }
-
-        const values = {};
-
-        for (let i = 0; i < leafColumns.length; i++) {
-          const column = leafColumns[i];
-
-          if (column && column.accessorFn) {
-            values[column.id] = column.accessorFn(originalRow, rowIndex);
-          }
-        } // Make the row
+        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?
+          // if (!id) {
+          //   if ("development" !== 'production') {
+          //     throw new Error(`getRowId expected an ID, but got ${id}`)
+          //   }
+          // }
+          // Make the row
 
-        const row = instance.createRow(id, originalRow, rowIndex, depth); // Push instance row into the parentRows array
+          row = instance.createRow(instance.getRowId(originalRow, i, parent), originalRow, i, depth); // Keep track of every row in a flat array
 
-        parentRows.push(row); // Keep track of every row in a flat array
+          rowModel.flatRows.push(row); // Also keep track of every row by its ID
 
-        flatRows.push(row); // Also keep track of every row by its ID
+          rowModel.rowsById[row.id] = row; // Push instance row into parent
 
-        rowsById[id] = row; // Get the original subrows
+          rows.push(row); // Get the original subrows
 
-        if (instance.options.getSubRows) {
-          const originalSubRows = instance.options.getSubRows(originalRow, rowIndex); // Then recursively access them
+          if (instance.options.getSubRows) {
+            var _row$originalSubRows;
 
-          if (originalSubRows != null && originalSubRows.length) {
-            row.originalSubRows = originalSubRows;
-            const subRows = [];
+            row.originalSubRows = instance.options.getSubRows(originalRow, i); // Then recursively access them
 
-            for (let i = 0; i < row.originalSubRows.length; i++) {
-              accessRow(row.originalSubRows[i], i, depth + 1, subRows, row);
+            if ((_row$originalSubRows = row.originalSubRows) != null && _row$originalSubRows.length) {
+              row.subRows = accessRows(row.originalSubRows, depth + 1, row);
             }
-
-            row.subRows = subRows;
           }
         }
-      };
-
-      for (let i = 0; i < data.length; i++) {
-        accessRow(data[i], i, 0, rows);
-      }
 
-      return {
-        rows,
-        flatRows,
-        rowsById
+        return rows;
       };
+
+      rowModel.rows = accessRows(data);
+      return rowModel;
     }, {
       key: 'getRowModel',
       debug: () => {
@@ -3889,7 +3789,7 @@
         return (_instance$options$deb = instance.options.debugAll) != null ? _instance$options$deb : instance.options.debugTable;
       },
       onChange: () => {
-        instance.queue(() => {
+        instance._queue(() => {
           instance._autoResetExpanded();
 
           instance._autoResetPageIndex();