@tanstack/react-table 8.0.0-alpha.73 → 8.0.0-alpha.78

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

@@ -2690,8 +2690,10 @@ const Headers = {
       },
       // Header Groups
       getHeaderGroups: memo(() => [instance.getAllColumns(), instance.getVisibleLeafColumns(), instance.getState().columnPinning.left, instance.getState().columnPinning.right], (allColumns, leafColumns, left, right) => {
-        const leftColumns = leafColumns.filter(column => left == null ? void 0 : left.includes(column.id));
-        const rightColumns = leafColumns.filter(column => right == null ? void 0 : right.includes(column.id));
+        var _left$map$filter, _right$map$filter;
+
+        const leftColumns = (_left$map$filter = left == null ? void 0 : left.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter : [];
+        const rightColumns = (_right$map$filter = right == null ? void 0 : right.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter : [];
         const centerColumns = leafColumns.filter(column => !(left != null && left.includes(column.id)) && !(right != null && right.includes(column.id)));
         const headerGroups = buildHeaderGroups(allColumns, [...leftColumns, ...centerColumns, ...rightColumns], instance);
         return headerGroups;
@@ -2715,8 +2717,10 @@ const Headers = {
         }
       }),
       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$filter2;
+
+        const orderedLeafColumns = (_left$map$filter2 = left == null ? void 0 : left.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _left$map$filter2 : [];
+        return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'left');
       }, {
         key: process.env.NODE_ENV === 'development' && 'getLeftHeaderGroups',
         debug: () => {
@@ -2726,8 +2730,10 @@ const Headers = {
         }
       }),
       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$filter2;
+
+        const orderedLeafColumns = (_right$map$filter2 = right == null ? void 0 : right.map(columnId => leafColumns.find(d => d.id === columnId)).filter(Boolean)) != null ? _right$map$filter2 : [];
+        return buildHeaderGroups(allColumns, orderedLeafColumns, instance, 'right');
       }, {
         key: process.env.NODE_ENV === 'development' && 'getRightHeaderGroups',
         debug: () => {
@@ -3038,7 +3044,6 @@ function buildHeaderGroups(allColumns, columnsToGroup, instance, headerFamily) {
 //   data: Batch[]
 //   facets: Batch[]
 // }
-// export type TaskPriority = keyof CoreBatches
 function createTableInstance(options) {
   var _options$initialState;
 
@@ -3077,64 +3082,7 @@ function createTableInstance(options) {
   });
 
   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 (
-  //       (process.env.NODE_ENV === 'development' && instance.options.debugAll) ??
-  //       instance.options.debugTable
-  //     ) {
-  //       console.info('Starting work...')
-  //     }
-  //     startWorkLoop()
-  //   }
-  // }
-  // const stopWork = () => {
-  //   if (working) {
-  //     if (
-  //       (process.env.NODE_ENV === 'development' && instance.options.debugAll) ??
-  //       instance.options.debugTable
-  //     ) {
-  //       console.info('Stopping work...')
-  //     }
-  //     working = false
-  //     cancelIdleCallback(latestCallback)
-  //   }
-  // }
-
+  let queuedTimeout = false;
   const midInstance = { ...instance,
     // init: () => {
     //   startWork()
@@ -3167,39 +3115,6 @@ function createTableInstance(options) {
         }));
       }
     },
-    // 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);
     },
@@ -3310,69 +3225,55 @@ function createTable(_, __, options) {
 
 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) {
-        if (process.env.NODE_ENV !== 'production') {
-          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 (process.env.NODE_ENV !== '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: process.env.NODE_ENV === 'development' && 'getRowModel',
     debug: () => {