@tanstack/svelte-table 8.0.0-alpha.73 → 8.0.0-alpha.77

package/build/cjs/svelte-table/src/index.js

@@ -14,21 +14,50 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('../../table-core/build/esm/index.js');
 var placeholder = require('./placeholder.svelte.js');
+var internal = require('svelte/internal');
 var store = require('svelte/store');
 var renderComponent = require('./render-component.js');
 
-function render(Comp, props) {
-  if (!Comp) return null;
+function isSvelteServerComponent(component) {
+  return typeof component === 'object' && typeof component.$$render === 'function' && typeof component.render === 'function';
+}
+
+function isSvelteClientComponent(component) {
+  return component.prototype instanceof internal.SvelteComponent;
+}
 
-  if (Comp instanceof Function) {
-    let res = Comp(props);
-    return res;
+function isSvelteComponent(component) {
+  if (typeof document === 'undefined') {
+    return isSvelteServerComponent(component);
   } else {
-    return renderComponent.renderComponent(placeholder["default"], {
-      content: Comp
-    });
-  } // return Comp
+    return isSvelteClientComponent(component);
+  }
+}
+
+function wrapInPlaceholder(content) {
+  return renderComponent.renderComponent(placeholder["default"], {
+    content
+  });
+}
+
+function render(component, props) {
+  if (!component) return null;
+
+  if (isSvelteComponent(component)) {
+    return renderComponent.renderComponent(component, props);
+  }
+
+  if (typeof component === 'function') {
+    const result = component(props);
+
+    if (isSvelteComponent(result)) {
+      return result;
+    }
+
+    return wrapInPlaceholder(result);
+  }
 
+  return wrapInPlaceholder(component);
 }
 const createTable = index.createTableFactory({
   render

package/build/cjs/svelte-table/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/index.ts"],"sourcesContent":["import {\n  createTableFactory,\n  createTableInstance as coreCreateTableInstance,\n  PartialKeys,\n  Table,\n  TableGenerics,\n  TableOptions,\n} from '@tanstack/table-core'\nimport Placeholder from './placeholder.svelte'\nimport { readable, writable, derived, Readable, get } from 'svelte/store'\nimport { renderComponent } from './render-component'\n\nexport { renderComponent } from './render-component'\n\nexport * from '@tanstack/table-core'\n\nexport function render(Comp: any, props: any) {\n  if (!Comp) return null\n\n  if (Comp instanceof Function) {\n    let res = Comp(props)\n    return res\n  } else {\n    return renderComponent(Placeholder, { content: Comp })\n  }\n\n  // return Comp\n}\n\nexport const createTable = createTableFactory({ render })\n\ntype ReadableOrVal<T> = T | Readable<T>\n\nexport function createTableInstance<TGenerics extends TableGenerics>(\n  table: Table<TGenerics>,\n  options: ReadableOrVal<\n    PartialKeys<\n      Omit<TableOptions<TGenerics>, 'render'>,\n      'state' | 'onStateChange'\n    >\n  >\n) {\n  let optionsStore: Readable<\n    PartialKeys<\n      Omit<TableOptions<TGenerics>, 'render'>,\n      'state' | 'onStateChange'\n    >\n  >\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptions<TGenerics> = {\n    ...table.options,\n    state: {}, // Dummy state\n    onStateChange: () => {}, // noop\n    render,\n    ...get(optionsStore),\n  }\n\n  let instance = coreCreateTableInstance(resolvedOptions)\n\n  let stateStore = writable(/** @type {number} */ instance.initialState)\n  // combine stores\n  let stateOptionsStore = derived([stateStore, optionsStore], s => s)\n  const instanceReadable = readable(instance, function start(set) {\n    const unsubscribe = stateOptionsStore.subscribe(([state, options]) => {\n      instance.setOptions(prev => {\n        return {\n          ...prev,\n          ...options,\n          state: { ...state, ...options.state },\n          // Similarly, we'll maintain both our internal state and any user-provided\n          // state.\n          onStateChange: updater => {\n            if (updater instanceof Function) {\n              stateStore.update(updater)\n            } else {\n              stateStore.set(updater)\n            }\n\n            resolvedOptions.onStateChange?.(updater)\n          },\n        }\n      })\n\n      // it didn't seem to rerender without setting the instance\n      set(instance)\n    })\n\n    return function stop() {\n      unsubscribe()\n    }\n  })\n\n  return instanceReadable\n}\n"],"names":["render","Comp","props","Function","res","renderComponent","Placeholder","content","createTable","createTableFactory","createTableInstance","table","options","optionsStore","readable","resolvedOptions","state","onStateChange","get","instance","coreCreateTableInstance","stateStore","writable","initialState","stateOptionsStore","derived","s","instanceReadable","start","set","unsubscribe","subscribe","setOptions","prev","updater","update","stop"],"mappings":";;;;;;;;;;;;;;;;;;;AAgBO,SAASA,MAAT,CAAgBC,IAAhB,EAA2BC,KAA3B,EAAuC;AAC5C,EAAA,IAAI,CAACD,IAAL,EAAW,OAAO,IAAP,CAAA;;AAEX,EAAIA,IAAAA,IAAI,YAAYE,QAApB,EAA8B;AAC5B,IAAA,IAAIC,GAAG,GAAGH,IAAI,CAACC,KAAD,CAAd,CAAA;AACA,IAAA,OAAOE,GAAP,CAAA;AACD,GAHD,MAGO;AACL,IAAOC,OAAAA,+BAAe,CAACC,sBAAD,EAAc;AAAEC,MAAAA,OAAO,EAAEN,IAAAA;AAAX,KAAd,CAAtB,CAAA;AACD,GAR2C;;AAW7C,CAAA;AAEYO,MAAAA,WAAW,GAAGC,wBAAkB,CAAC;AAAET,EAAAA,MAAAA;AAAF,CAAD,EAAtC;AAIA,SAASU,mBAAT,CACLC,KADK,EAELC,OAFK,EAQL;AACA,EAAA,IAAIC,YAAJ,CAAA;;AAOA,EAAI,IAAA,WAAA,IAAeD,OAAnB,EAA4B;AAC1BC,IAAAA,YAAY,GAAGD,OAAf,CAAA;AACD,GAFD,MAEO;AACLC,IAAAA,YAAY,GAAGC,cAAQ,CAACF,OAAD,CAAvB,CAAA;AACD,GAAA;;AAED,EAAA,IAAIG,eAAwC,GAAG,EAC7C,GAAGJ,KAAK,CAACC,OADoC;AAE7CI,IAAAA,KAAK,EAAE,EAFsC;AAElC;AACXC,IAAAA,aAAa,EAAE,MAAM,EAHwB;AAGpB;AACzBjB,IAAAA,MAJ6C;AAK7C,IAAGkB,GAAAA,SAAG,CAACL,YAAD,CAAA;AALuC,GAA/C,CAAA;AAQA,EAAA,IAAIM,QAAQ,GAAGC,yBAAuB,CAACL,eAAD,CAAtC,CAAA;AAEA,EAAIM,IAAAA,UAAU,GAAGC,cAAQ;AAAC;AAAsBH,EAAAA,QAAQ,CAACI,YAAhC,CAAzB,CAxBA;;AA0BA,EAAA,IAAIC,iBAAiB,GAAGC,aAAO,CAAC,CAACJ,UAAD,EAAaR,YAAb,CAAD,EAA6Ba,CAAC,IAAIA,CAAlC,CAA/B,CAAA;AACA,EAAMC,MAAAA,gBAAgB,GAAGb,cAAQ,CAACK,QAAD,EAAW,SAASS,KAAT,CAAeC,GAAf,EAAoB;AAC9D,IAAA,MAAMC,WAAW,GAAGN,iBAAiB,CAACO,SAAlB,CAA4B,IAAsB,IAAA;AAAA,MAAA,IAArB,CAACf,KAAD,EAAQJ,OAAR,CAAqB,GAAA,IAAA,CAAA;AACpEO,MAAAA,QAAQ,CAACa,UAAT,CAAoBC,IAAI,IAAI;AAC1B,QAAO,OAAA,EACL,GAAGA,IADE;AAEL,UAAA,GAAGrB,OAFE;AAGLI,UAAAA,KAAK,EAAE,EAAE,GAAGA,KAAL;AAAY,YAAA,GAAGJ,OAAO,CAACI,KAAAA;AAAvB,WAHF;AAIL;AACA;AACAC,UAAAA,aAAa,EAAEiB,OAAO,IAAI;AACxB,YAAIA,IAAAA,OAAO,YAAY/B,QAAvB,EAAiC;AAC/BkB,cAAAA,UAAU,CAACc,MAAX,CAAkBD,OAAlB,CAAA,CAAA;AACD,aAFD,MAEO;AACLb,cAAAA,UAAU,CAACQ,GAAX,CAAeK,OAAf,CAAA,CAAA;AACD,aAAA;;AAEDnB,YAAAA,eAAe,CAACE,aAAhB,IAAA,IAAA,GAAA,KAAA,CAAA,GAAAF,eAAe,CAACE,aAAhB,CAAgCiB,OAAhC,CAAA,CAAA;AACD,WAAA;AAdI,SAAP,CAAA;AAgBD,OAjBD,EADoE;;AAqBpEL,MAAAA,GAAG,CAACV,QAAD,CAAH,CAAA;AACD,KAtBmB,CAApB,CAAA;AAwBA,IAAO,OAAA,SAASiB,IAAT,GAAgB;AACrBN,MAAAA,WAAW,EAAA,CAAA;AACZ,KAFD,CAAA;AAGD,GA5BgC,CAAjC,CAAA;AA8BA,EAAA,OAAOH,gBAAP,CAAA;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":["../../../../src/index.ts"],"sourcesContent":["import {\n  createTableFactory,\n  createTableInstance as coreCreateTableInstance,\n  PartialKeys,\n  Table,\n  TableGenerics,\n  TableOptions,\n} from '@tanstack/table-core'\nimport Placeholder from './placeholder.svelte'\nimport { SvelteComponent } from 'svelte/internal'\nimport { readable, writable, derived, Readable, get } from 'svelte/store'\nimport { renderComponent } from './render-component'\n\nexport { renderComponent } from './render-component'\n\nexport * from '@tanstack/table-core'\n\nfunction isSvelteServerComponent(component: any) {\n  return (\n    typeof component === 'object' &&\n    typeof component.$$render === 'function' &&\n    typeof component.render === 'function'\n  )\n}\n\nfunction isSvelteClientComponent(component: any) {\n  return component.prototype instanceof SvelteComponent\n}\n\nfunction isSvelteComponent(component: any) {\n  if (typeof document === 'undefined') {\n    return isSvelteServerComponent(component)\n  } else {\n    return isSvelteClientComponent(component)\n  }\n}\n\nfunction wrapInPlaceholder(content: any) {\n  return renderComponent(Placeholder, { content })\n}\n\nexport function render(component: any, props: any) {\n  if (!component) return null\n\n  if (isSvelteComponent(component)) {\n    return renderComponent(component, props)\n  }\n\n  if (typeof component === 'function') {\n    const result = component(props)\n\n    if (isSvelteComponent(result)) {\n      return result\n    }\n\n    return wrapInPlaceholder(result)\n  }\n\n  return wrapInPlaceholder(component)\n}\n\nexport const createTable = createTableFactory({ render })\n\ntype ReadableOrVal<T> = T | Readable<T>\n\nexport function createTableInstance<TGenerics extends TableGenerics>(\n  table: Table<TGenerics>,\n  options: ReadableOrVal<\n    PartialKeys<\n      Omit<TableOptions<TGenerics>, 'render'>,\n      'state' | 'onStateChange'\n    >\n  >\n) {\n  let optionsStore: Readable<\n    PartialKeys<\n      Omit<TableOptions<TGenerics>, 'render'>,\n      'state' | 'onStateChange'\n    >\n  >\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptions<TGenerics> = {\n    ...table.options,\n    state: {}, // Dummy state\n    onStateChange: () => {}, // noop\n    render,\n    ...get(optionsStore),\n  }\n\n  let instance = coreCreateTableInstance(resolvedOptions)\n\n  let stateStore = writable(/** @type {number} */ instance.initialState)\n  // combine stores\n  let stateOptionsStore = derived([stateStore, optionsStore], s => s)\n  const instanceReadable = readable(instance, function start(set) {\n    const unsubscribe = stateOptionsStore.subscribe(([state, options]) => {\n      instance.setOptions(prev => {\n        return {\n          ...prev,\n          ...options,\n          state: { ...state, ...options.state },\n          // Similarly, we'll maintain both our internal state and any user-provided\n          // state.\n          onStateChange: updater => {\n            if (updater instanceof Function) {\n              stateStore.update(updater)\n            } else {\n              stateStore.set(updater)\n            }\n\n            resolvedOptions.onStateChange?.(updater)\n          },\n        }\n      })\n\n      // it didn't seem to rerender without setting the instance\n      set(instance)\n    })\n\n    return function stop() {\n      unsubscribe()\n    }\n  })\n\n  return instanceReadable\n}\n"],"names":["isSvelteServerComponent","component","$$render","render","isSvelteClientComponent","prototype","SvelteComponent","isSvelteComponent","document","wrapInPlaceholder","content","renderComponent","Placeholder","props","result","createTable","createTableFactory","createTableInstance","table","options","optionsStore","readable","resolvedOptions","state","onStateChange","get","instance","coreCreateTableInstance","stateStore","writable","initialState","stateOptionsStore","derived","s","instanceReadable","start","set","unsubscribe","subscribe","setOptions","prev","updater","Function","update","stop"],"mappings":";;;;;;;;;;;;;;;;;;;;AAiBA,SAASA,uBAAT,CAAiCC,SAAjC,EAAiD;AAC/C,EAAA,OACE,OAAOA,SAAP,KAAqB,QAArB,IACA,OAAOA,SAAS,CAACC,QAAjB,KAA8B,UAD9B,IAEA,OAAOD,SAAS,CAACE,MAAjB,KAA4B,UAH9B,CAAA;AAKD,CAAA;;AAED,SAASC,uBAAT,CAAiCH,SAAjC,EAAiD;AAC/C,EAAA,OAAOA,SAAS,CAACI,SAAV,YAA+BC,wBAAtC,CAAA;AACD,CAAA;;AAED,SAASC,iBAAT,CAA2BN,SAA3B,EAA2C;AACzC,EAAA,IAAI,OAAOO,QAAP,KAAoB,WAAxB,EAAqC;AACnC,IAAOR,OAAAA,uBAAuB,CAACC,SAAD,CAA9B,CAAA;AACD,GAFD,MAEO;AACL,IAAOG,OAAAA,uBAAuB,CAACH,SAAD,CAA9B,CAAA;AACD,GAAA;AACF,CAAA;;AAED,SAASQ,iBAAT,CAA2BC,OAA3B,EAAyC;AACvC,EAAOC,OAAAA,+BAAe,CAACC,sBAAD,EAAc;AAAEF,IAAAA,OAAAA;AAAF,GAAd,CAAtB,CAAA;AACD,CAAA;;AAEM,SAASP,MAAT,CAAgBF,SAAhB,EAAgCY,KAAhC,EAA4C;AACjD,EAAA,IAAI,CAACZ,SAAL,EAAgB,OAAO,IAAP,CAAA;;AAEhB,EAAA,IAAIM,iBAAiB,CAACN,SAAD,CAArB,EAAkC;AAChC,IAAA,OAAOU,+BAAe,CAACV,SAAD,EAAYY,KAAZ,CAAtB,CAAA;AACD,GAAA;;AAED,EAAA,IAAI,OAAOZ,SAAP,KAAqB,UAAzB,EAAqC;AACnC,IAAA,MAAMa,MAAM,GAAGb,SAAS,CAACY,KAAD,CAAxB,CAAA;;AAEA,IAAA,IAAIN,iBAAiB,CAACO,MAAD,CAArB,EAA+B;AAC7B,MAAA,OAAOA,MAAP,CAAA;AACD,KAAA;;AAED,IAAOL,OAAAA,iBAAiB,CAACK,MAAD,CAAxB,CAAA;AACD,GAAA;;AAED,EAAOL,OAAAA,iBAAiB,CAACR,SAAD,CAAxB,CAAA;AACD,CAAA;AAEYc,MAAAA,WAAW,GAAGC,wBAAkB,CAAC;AAAEb,EAAAA,MAAAA;AAAF,CAAD,EAAtC;AAIA,SAASc,mBAAT,CACLC,KADK,EAELC,OAFK,EAQL;AACA,EAAA,IAAIC,YAAJ,CAAA;;AAOA,EAAI,IAAA,WAAA,IAAeD,OAAnB,EAA4B;AAC1BC,IAAAA,YAAY,GAAGD,OAAf,CAAA;AACD,GAFD,MAEO;AACLC,IAAAA,YAAY,GAAGC,cAAQ,CAACF,OAAD,CAAvB,CAAA;AACD,GAAA;;AAED,EAAA,IAAIG,eAAwC,GAAG,EAC7C,GAAGJ,KAAK,CAACC,OADoC;AAE7CI,IAAAA,KAAK,EAAE,EAFsC;AAElC;AACXC,IAAAA,aAAa,EAAE,MAAM,EAHwB;AAGpB;AACzBrB,IAAAA,MAJ6C;AAK7C,IAAGsB,GAAAA,SAAG,CAACL,YAAD,CAAA;AALuC,GAA/C,CAAA;AAQA,EAAA,IAAIM,QAAQ,GAAGC,yBAAuB,CAACL,eAAD,CAAtC,CAAA;AAEA,EAAIM,IAAAA,UAAU,GAAGC,cAAQ;AAAC;AAAsBH,EAAAA,QAAQ,CAACI,YAAhC,CAAzB,CAxBA;;AA0BA,EAAA,IAAIC,iBAAiB,GAAGC,aAAO,CAAC,CAACJ,UAAD,EAAaR,YAAb,CAAD,EAA6Ba,CAAC,IAAIA,CAAlC,CAA/B,CAAA;AACA,EAAMC,MAAAA,gBAAgB,GAAGb,cAAQ,CAACK,QAAD,EAAW,SAASS,KAAT,CAAeC,GAAf,EAAoB;AAC9D,IAAA,MAAMC,WAAW,GAAGN,iBAAiB,CAACO,SAAlB,CAA4B,IAAsB,IAAA;AAAA,MAAA,IAArB,CAACf,KAAD,EAAQJ,OAAR,CAAqB,GAAA,IAAA,CAAA;AACpEO,MAAAA,QAAQ,CAACa,UAAT,CAAoBC,IAAI,IAAI;AAC1B,QAAO,OAAA,EACL,GAAGA,IADE;AAEL,UAAA,GAAGrB,OAFE;AAGLI,UAAAA,KAAK,EAAE,EAAE,GAAGA,KAAL;AAAY,YAAA,GAAGJ,OAAO,CAACI,KAAAA;AAAvB,WAHF;AAIL;AACA;AACAC,UAAAA,aAAa,EAAEiB,OAAO,IAAI;AACxB,YAAIA,IAAAA,OAAO,YAAYC,QAAvB,EAAiC;AAC/Bd,cAAAA,UAAU,CAACe,MAAX,CAAkBF,OAAlB,CAAA,CAAA;AACD,aAFD,MAEO;AACLb,cAAAA,UAAU,CAACQ,GAAX,CAAeK,OAAf,CAAA,CAAA;AACD,aAAA;;AAEDnB,YAAAA,eAAe,CAACE,aAAhB,IAAA,IAAA,GAAA,KAAA,CAAA,GAAAF,eAAe,CAACE,aAAhB,CAAgCiB,OAAhC,CAAA,CAAA;AACD,WAAA;AAdI,SAAP,CAAA;AAgBD,OAjBD,EADoE;;AAqBpEL,MAAAA,GAAG,CAACV,QAAD,CAAH,CAAA;AACD,KAtBmB,CAApB,CAAA;AAwBA,IAAO,OAAA,SAASkB,IAAT,GAAgB;AACrBP,MAAAA,WAAW,EAAA,CAAA;AACZ,KAFD,CAAA;AAGD,GA5BgC,CAAjC,CAAA;AA8BA,EAAA,OAAOH,gBAAP,CAAA;AACD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -2715,8 +2715,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$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: process.env.NODE_ENV === 'development' && 'getLeftHeaderGroups',
         debug: () => {
@@ -2726,8 +2728,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$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: process.env.NODE_ENV === 'development' && 'getRightHeaderGroups',
         debug: () => {
@@ -3038,7 +3042,6 @@ function buildHeaderGroups(allColumns, columnsToGroup, instance, headerFamily) {
 //   data: Batch[]
 //   facets: Batch[]
 // }
-// export type TaskPriority = keyof CoreBatches
 function createTableInstance(options) {
   var _options$initialState;
 
@@ -3077,64 +3080,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 +3113,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 +3223,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: () => {