@tanstack/svelte-table 8.0.0-beta.3 → 8.0.0-beta.6

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

@@ -13,7 +13,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var index = require('../../table-core/build/esm/index.js');
-var placeholder = require('./placeholder.svelte.js');
+var placeholder = require('./placeholder.js');
 var internal = require('svelte/internal');
 var store = require('svelte/store');
 var renderComponent = require('./render-component.js');
@@ -23,7 +23,10 @@ function isSvelteServerComponent(component) {
 }
 
 function isSvelteClientComponent(component) {
-  return component.prototype instanceof internal.SvelteComponent;
+  var _component$name, _component$name2;
+
+  let isHMR = ('__SVELTE_HMR' in window);
+  return component.prototype instanceof internal.SvelteComponent || isHMR && ((_component$name = component.name) == null ? void 0 : _component$name.startsWith('Proxy<')) && ((_component$name2 = component.name) == null ? void 0 : _component$name2.endsWith('>'));
 }
 
 function isSvelteComponent(component) {
@@ -77,6 +80,7 @@ function createTableInstance(table, options) {
     onStateChange: () => {},
     // noop
     render,
+    renderFallbackValue: null,
     ...store.get(optionsStore)
   };
   let instance = index.createTableInstance(resolvedOptions);

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  TableOptionsResolved,\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<TableOptions<TGenerics>>\n) {\n  let optionsStore: Readable<TableOptions<TGenerics>>\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptionsResolved<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":"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"}
+{"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  TableOptionsResolved,\n} from '@tanstack/table-core'\nimport Placeholder from './placeholder'\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  let isHMR = '__SVELTE_HMR' in window\n\n  return (\n    component.prototype instanceof SvelteComponent ||\n    (isHMR &&\n      component.name?.startsWith('Proxy<') &&\n      component.name?.endsWith('>'))\n  )\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<TableOptions<TGenerics>>\n) {\n  let optionsStore: Readable<TableOptions<TGenerics>>\n\n  if ('subscribe' in options) {\n    optionsStore = options\n  } else {\n    optionsStore = readable(options)\n  }\n\n  let resolvedOptions: TableOptionsResolved<TGenerics> = {\n    ...table.options,\n    state: {}, // Dummy state\n    onStateChange: () => {}, // noop\n    render,\n    renderFallbackValue: null,\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","isHMR","window","prototype","SvelteComponent","name","startsWith","endsWith","isSvelteComponent","document","wrapInPlaceholder","content","renderComponent","Placeholder","props","result","createTable","createTableFactory","createTableInstance","table","options","optionsStore","readable","resolvedOptions","state","onStateChange","renderFallbackValue","get","instance","coreCreateTableInstance","stateStore","writable","initialState","stateOptionsStore","derived","s","instanceReadable","start","set","unsubscribe","subscribe","setOptions","prev","updater","Function","update","stop"],"mappings":"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"}

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

@@ -0,0 +1,24 @@
+/**
+ * svelte-table
+ *
+ * Copyright (c) TanStack
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var internal = require('svelte/internal');
+var placeholder = require('./placeholder.svelte.js');
+
+const PlaceholderServer = internal.create_ssr_component(($$result, $$props, $$bindings, slots) => {
+  return "" + internal.escape($$props.content);
+});
+var Placeholder = typeof document === 'undefined' ? PlaceholderServer : placeholder["default"];
+
+exports["default"] = Placeholder;
+//# sourceMappingURL=placeholder.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"placeholder.js","sources":["../../../../src/placeholder.ts"],"sourcesContent":["import type { SvelteComponentDev } from 'svelte/internal'\nimport { create_ssr_component, escape } from 'svelte/internal'\nimport PlaceholderClient from './placeholder.svelte'\n\ntype X = typeof PlaceholderClient\n\nconst PlaceholderServer = create_ssr_component(\n  ($$result: any, $$props: any, $$bindings: any, slots: any) => {\n    return `${escape($$props.content)}`\n  }\n) as any as typeof SvelteComponentDev\n\nexport default typeof document === 'undefined'\n  ? PlaceholderServer\n  : PlaceholderClient\n"],"names":["PlaceholderServer","create_ssr_component","$$result","$$props","$$bindings","slots","escape","content","document","PlaceholderClient"],"mappings":";;;;;;;;;;;;;;;;;AAMA,MAAMA,iBAAiB,GAAGC,6BAAoB,CAC5C,CAACC,QAAD,EAAgBC,OAAhB,EAA8BC,UAA9B,EAA+CC,KAA/C,KAA8D;AAC5D,EAAA,OAAA,EAAA,GAAUC,eAAM,CAACH,OAAO,CAACI,OAAT,CAAhB,CAAA;AACD,CAH2C,CAA9C,CAAA;AAMA,kBAAe,OAAOC,QAAP,KAAoB,WAApB,GACXR,iBADW,GAEXS,sBAFJ;;;;"}

package/build/cjs/svelte-table/src/render-component.js

@@ -26,6 +26,10 @@ function create_fragment(ctx, Comp, props) {
       internal.create_component(c.$$.fragment);
     },
 
+    l(nodes) {
+      internal.claim_component(c.$$.fragment, nodes);
+    },
+
     m(target, anchor) {
       // @ts-ignore
       internal.mount_component(c, target, anchor);
@@ -64,7 +68,7 @@ function renderClient(Comp, props) {
 
 function renderServer(Comp, props) {
   const WrapperComp = internal.create_ssr_component(($$result, $$props, $$bindings, slots) => {
-    return "" + internal.validate_component(Comp, 'Comp').$$render($$result, props, {}, {});
+    return "" + internal.validate_component(Comp, 'TableComponent').$$render($$result, props, {}, {});
   });
   return WrapperComp;
 }

package/build/cjs/svelte-table/src/render-component.js.map

@@ -1 +1 @@
-{"version":3,"file":"render-component.js","sources":["../../../../src/render-component.ts"],"sourcesContent":["import {\n  SvelteComponent,\n  create_component,\n  destroy_component,\n  init,\n  mount_component,\n  noop,\n  safe_not_equal,\n  transition_in,\n  transition_out,\n  create_ssr_component,\n  validate_component,\n} from 'svelte/internal'\n\nfunction create_fragment(ctx: any, Comp: any, props: any) {\n  let c: any\n  let current: any\n  c = new Comp({ props, $$inline: true })\n\n  return {\n    c() {\n      create_component(c.$$.fragment)\n    },\n    m(target: any, anchor: any) {\n      // @ts-ignore\n      mount_component(c, target, anchor)\n      current = true\n    },\n    p: noop,\n    i(local: any) {\n      if (current) return\n      transition_in(c.$$.fragment, local)\n      current = true\n    },\n    o(local: any) {\n      transition_out(c.$$.fragment, local)\n      current = false\n    },\n    d(detaching: any) {\n      destroy_component(c, detaching)\n    },\n  }\n}\n\nfunction renderClient(Comp: any, props: any): any {\n  return class WrapperComp extends SvelteComponent {\n    constructor(options: any) {\n      super()\n      init(\n        this,\n        options,\n        null,\n        (ctx: any) => create_fragment(ctx, Comp, props),\n        safe_not_equal,\n        {},\n        undefined\n      )\n    }\n  }\n}\n\nfunction renderServer(Comp: any, props: any) {\n  const WrapperComp = create_ssr_component(\n    ($$result: any, $$props: any, $$bindings: any, slots: any) => {\n      return `${validate_component(Comp, 'Comp').$$render(\n        $$result,\n        props,\n        {},\n        {}\n      )}`\n    }\n  )\n\n  return WrapperComp\n}\n\nexport const renderComponent =\n  typeof window === 'undefined' ? renderServer : renderClient\n"],"names":["create_fragment","ctx","Comp","props","c","current","$$inline","create_component","$$","fragment","m","target","anchor","mount_component","p","noop","i","local","transition_in","o","transition_out","d","detaching","destroy_component","renderClient","WrapperComp","SvelteComponent","constructor","options","init","safe_not_equal","undefined","renderServer","create_ssr_component","$$result","$$props","$$bindings","slots","validate_component","$$render","renderComponent","window"],"mappings":";;;;;;;;;;;;;;;;AAcA,SAASA,eAAT,CAAyBC,GAAzB,EAAmCC,IAAnC,EAA8CC,KAA9C,EAA0D;AACxD,EAAA,IAAIC,CAAJ,CAAA;AACA,EAAA,IAAIC,OAAJ,CAAA;AACAD,EAAAA,CAAC,GAAG,IAAIF,IAAJ,CAAS;AAAEC,IAAAA,KAAF;AAASG,IAAAA,QAAQ,EAAE,IAAA;AAAnB,GAAT,CAAJ,CAAA;AAEA,EAAO,OAAA;AACLF,IAAAA,CAAC,GAAG;AACFG,MAAAA,yBAAgB,CAACH,CAAC,CAACI,EAAF,CAAKC,QAAN,CAAhB,CAAA;AACD,KAHI;;AAILC,IAAAA,CAAC,CAACC,MAAD,EAAcC,MAAd,EAA2B;AAC1B;AACAC,MAAAA,wBAAe,CAACT,CAAD,EAAIO,MAAJ,EAAYC,MAAZ,CAAf,CAAA;AACAP,MAAAA,OAAO,GAAG,IAAV,CAAA;AACD,KARI;;AASLS,IAAAA,CAAC,EAAEC,aATE;;AAULC,IAAAA,CAAC,CAACC,KAAD,EAAa;AACZ,MAAA,IAAIZ,OAAJ,EAAa,OAAA;AACba,MAAAA,sBAAa,CAACd,CAAC,CAACI,EAAF,CAAKC,QAAN,EAAgBQ,KAAhB,CAAb,CAAA;AACAZ,MAAAA,OAAO,GAAG,IAAV,CAAA;AACD,KAdI;;AAeLc,IAAAA,CAAC,CAACF,KAAD,EAAa;AACZG,MAAAA,uBAAc,CAAChB,CAAC,CAACI,EAAF,CAAKC,QAAN,EAAgBQ,KAAhB,CAAd,CAAA;AACAZ,MAAAA,OAAO,GAAG,KAAV,CAAA;AACD,KAlBI;;AAmBLgB,IAAAA,CAAC,CAACC,SAAD,EAAiB;AAChBC,MAAAA,0BAAiB,CAACnB,CAAD,EAAIkB,SAAJ,CAAjB,CAAA;AACD,KAAA;;AArBI,GAAP,CAAA;AAuBD,CAAA;;AAED,SAASE,YAAT,CAAsBtB,IAAtB,EAAiCC,KAAjC,EAAkD;AAChD,EAAA,OAAO,MAAMsB,WAAN,SAA0BC,wBAA1B,CAA0C;AAC/CC,IAAAA,WAAW,CAACC,OAAD,EAAe;AACxB,MAAA,KAAA,EAAA,CAAA;AACAC,MAAAA,aAAI,CACF,IADE,EAEFD,OAFE,EAGF,IAHE,EAID3B,GAAD,IAAcD,eAAe,CAACC,GAAD,EAAMC,IAAN,EAAYC,KAAZ,CAJ3B,EAKF2B,uBALE,EAMF,EANE,EAOFC,SAPE,CAAJ,CAAA;AASD,KAAA;;AAZ8C,GAAjD,CAAA;AAcD,CAAA;;AAED,SAASC,YAAT,CAAsB9B,IAAtB,EAAiCC,KAAjC,EAA6C;AAC3C,EAAA,MAAMsB,WAAW,GAAGQ,6BAAoB,CACtC,CAACC,QAAD,EAAgBC,OAAhB,EAA8BC,UAA9B,EAA+CC,KAA/C,KAA8D;AAC5D,IAAA,OAAA,EAAA,GAAUC,2BAAkB,CAACpC,IAAD,EAAO,MAAP,CAAlB,CAAiCqC,QAAjC,CACRL,QADQ,EAER/B,KAFQ,EAGR,EAHQ,EAIR,EAJQ,CAAV,CAAA;AAMD,GARqC,CAAxC,CAAA;AAWA,EAAA,OAAOsB,WAAP,CAAA;AACD,CAAA;;AAEM,MAAMe,eAAe,GAC1B,OAAOC,MAAP,KAAkB,WAAlB,GAAgCT,YAAhC,GAA+CR;;;;"}
+{"version":3,"file":"render-component.js","sources":["../../../../src/render-component.ts"],"sourcesContent":["import {\n  SvelteComponent,\n  claim_component,\n  create_component,\n  destroy_component,\n  init,\n  mount_component,\n  noop,\n  safe_not_equal,\n  transition_in,\n  transition_out,\n  create_ssr_component,\n  validate_component,\n} from 'svelte/internal'\n\nfunction create_fragment(ctx: any, Comp: any, props: any) {\n  let c: any\n  let current: any\n  c = new Comp({ props, $$inline: true })\n\n  return {\n    c() {\n      create_component(c.$$.fragment)\n    },\n    l(nodes: any) {\n      claim_component(c.$$.fragment, nodes)\n    },\n    m(target: any, anchor: any) {\n      // @ts-ignore\n      mount_component(c, target, anchor)\n      current = true\n    },\n    p: noop,\n    i(local: any) {\n      if (current) return\n      transition_in(c.$$.fragment, local)\n      current = true\n    },\n    o(local: any) {\n      transition_out(c.$$.fragment, local)\n      current = false\n    },\n    d(detaching: any) {\n      destroy_component(c, detaching)\n    },\n  }\n}\n\nfunction renderClient(Comp: any, props: any): any {\n  return class WrapperComp extends SvelteComponent {\n    constructor(options: any) {\n      super()\n      init(\n        this,\n        options,\n        null,\n        (ctx: any) => create_fragment(ctx, Comp, props),\n        safe_not_equal,\n        {},\n        undefined\n      )\n    }\n  }\n}\n\nfunction renderServer(Comp: any, props: any) {\n  const WrapperComp = create_ssr_component(\n    ($$result: any, $$props: any, $$bindings: any, slots: any) => {\n      return `${validate_component(Comp, 'TableComponent').$$render(\n        $$result,\n        props,\n        {},\n        {}\n      )}`\n    }\n  )\n\n  return WrapperComp\n}\n\nexport const renderComponent =\n  typeof window === 'undefined' ? renderServer : renderClient\n"],"names":["create_fragment","ctx","Comp","props","c","current","$$inline","create_component","$$","fragment","l","nodes","claim_component","m","target","anchor","mount_component","p","noop","i","local","transition_in","o","transition_out","d","detaching","destroy_component","renderClient","WrapperComp","SvelteComponent","constructor","options","init","safe_not_equal","undefined","renderServer","create_ssr_component","$$result","$$props","$$bindings","slots","validate_component","$$render","renderComponent","window"],"mappings":";;;;;;;;;;;;;;;;AAeA,SAASA,eAAT,CAAyBC,GAAzB,EAAmCC,IAAnC,EAA8CC,KAA9C,EAA0D;AACxD,EAAA,IAAIC,CAAJ,CAAA;AACA,EAAA,IAAIC,OAAJ,CAAA;AACAD,EAAAA,CAAC,GAAG,IAAIF,IAAJ,CAAS;AAAEC,IAAAA,KAAF;AAASG,IAAAA,QAAQ,EAAE,IAAA;AAAnB,GAAT,CAAJ,CAAA;AAEA,EAAO,OAAA;AACLF,IAAAA,CAAC,GAAG;AACFG,MAAAA,yBAAgB,CAACH,CAAC,CAACI,EAAF,CAAKC,QAAN,CAAhB,CAAA;AACD,KAHI;;AAILC,IAAAA,CAAC,CAACC,KAAD,EAAa;AACZC,MAAAA,wBAAe,CAACR,CAAC,CAACI,EAAF,CAAKC,QAAN,EAAgBE,KAAhB,CAAf,CAAA;AACD,KANI;;AAOLE,IAAAA,CAAC,CAACC,MAAD,EAAcC,MAAd,EAA2B;AAC1B;AACAC,MAAAA,wBAAe,CAACZ,CAAD,EAAIU,MAAJ,EAAYC,MAAZ,CAAf,CAAA;AACAV,MAAAA,OAAO,GAAG,IAAV,CAAA;AACD,KAXI;;AAYLY,IAAAA,CAAC,EAAEC,aAZE;;AAaLC,IAAAA,CAAC,CAACC,KAAD,EAAa;AACZ,MAAA,IAAIf,OAAJ,EAAa,OAAA;AACbgB,MAAAA,sBAAa,CAACjB,CAAC,CAACI,EAAF,CAAKC,QAAN,EAAgBW,KAAhB,CAAb,CAAA;AACAf,MAAAA,OAAO,GAAG,IAAV,CAAA;AACD,KAjBI;;AAkBLiB,IAAAA,CAAC,CAACF,KAAD,EAAa;AACZG,MAAAA,uBAAc,CAACnB,CAAC,CAACI,EAAF,CAAKC,QAAN,EAAgBW,KAAhB,CAAd,CAAA;AACAf,MAAAA,OAAO,GAAG,KAAV,CAAA;AACD,KArBI;;AAsBLmB,IAAAA,CAAC,CAACC,SAAD,EAAiB;AAChBC,MAAAA,0BAAiB,CAACtB,CAAD,EAAIqB,SAAJ,CAAjB,CAAA;AACD,KAAA;;AAxBI,GAAP,CAAA;AA0BD,CAAA;;AAED,SAASE,YAAT,CAAsBzB,IAAtB,EAAiCC,KAAjC,EAAkD;AAChD,EAAA,OAAO,MAAMyB,WAAN,SAA0BC,wBAA1B,CAA0C;AAC/CC,IAAAA,WAAW,CAACC,OAAD,EAAe;AACxB,MAAA,KAAA,EAAA,CAAA;AACAC,MAAAA,aAAI,CACF,IADE,EAEFD,OAFE,EAGF,IAHE,EAID9B,GAAD,IAAcD,eAAe,CAACC,GAAD,EAAMC,IAAN,EAAYC,KAAZ,CAJ3B,EAKF8B,uBALE,EAMF,EANE,EAOFC,SAPE,CAAJ,CAAA;AASD,KAAA;;AAZ8C,GAAjD,CAAA;AAcD,CAAA;;AAED,SAASC,YAAT,CAAsBjC,IAAtB,EAAiCC,KAAjC,EAA6C;AAC3C,EAAA,MAAMyB,WAAW,GAAGQ,6BAAoB,CACtC,CAACC,QAAD,EAAgBC,OAAhB,EAA8BC,UAA9B,EAA+CC,KAA/C,KAA8D;AAC5D,IAAA,OAAA,EAAA,GAAUC,2BAAkB,CAACvC,IAAD,EAAO,gBAAP,CAAlB,CAA2CwC,QAA3C,CACRL,QADQ,EAERlC,KAFQ,EAGR,EAHQ,EAIR,EAJQ,CAAV,CAAA;AAMD,GARqC,CAAxC,CAAA;AAWA,EAAA,OAAOyB,WAAP,CAAA;AACD,CAAA;;AAEM,MAAMe,eAAe,GAC1B,OAAOC,MAAP,KAAkB,WAAlB,GAAgCT,YAAhC,GAA+CR;;;;"}

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

@@ -828,7 +828,6 @@ const Expanding = {
   getDefaultOptions: instance => {
     return {
       onExpandedChange: makeStateUpdater('expanded', instance),
-      autoResetExpanded: true,
       paginateExpandedRows: true
     };
   },
@@ -837,6 +836,8 @@ const Expanding = {
     let queued = false;
     return {
       _autoResetExpanded: () => {
+        var _ref, _instance$options$aut;
+
         if (!registered) {
           instance._queue(() => {
             registered = true;
@@ -845,11 +846,7 @@ const Expanding = {
           return;
         }
 
-        if (instance.options.autoResetAll === false) {
-          return;
-        }
-
-        if (instance.options.autoResetAll === true || instance.options.autoResetExpanded) {
+        if ((_ref = (_instance$options$aut = instance.options.autoResetAll) != null ? _instance$options$aut : instance.options.autoResetExpanded) != null ? _ref : !instance.options.manualExpanding) {
           if (queued) return;
           queued = true;
 
@@ -913,7 +910,7 @@ const Expanding = {
         });
         return maxDepth;
       },
-      getPreExpandedRowModel: () => instance.getGroupedRowModel(),
+      getPreExpandedRowModel: () => instance.getSortedRowModel(),
       getExpandedRowModel: () => {
         if (!instance._getExpandedRowModel && instance.options.getExpandedRowModel) {
           instance._getExpandedRowModel = instance.options.getExpandedRowModel(instance);
@@ -1514,7 +1511,7 @@ const Grouping = {
 
         instance.setGrouping(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.grouping) != null ? _instance$initialStat : []);
       },
-      getPreGroupedRowModel: () => instance.getSortedRowModel(),
+      getPreGroupedRowModel: () => instance.getFilteredRowModel(),
       getGroupedRowModel: () => {
         if (!instance._getGroupedRowModel && instance.options.getGroupedRowModel) {
           instance._getGroupedRowModel = instance.options.getGroupedRowModel(instance);
@@ -1535,6 +1532,12 @@ const Grouping = {
     };
   },
   createCell: (cell, column, row, instance) => {
+    const getRenderValue = () => {
+      var _cell$getValue;
+
+      return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
+    };
+
     return {
       getIsGrouped: () => column.getIsGrouped() && column.id === row.groupingColumnId,
       getIsPlaceholder: () => !cell.getIsGrouped() && column.getIsGrouped(),
@@ -1544,15 +1547,19 @@ const Grouping = {
         return !cell.getIsGrouped() && !cell.getIsPlaceholder() && ((_row$subRows = row.subRows) == null ? void 0 : _row$subRows.length) > 1;
       },
       renderAggregatedCell: () => {
-        var _column$columnDef$agg;
+        if (process.env.NODE_ENV === 'development') {
+          if (!column.columnDef.aggregatedCell) {
+            console.warn('A columnDef.aggregatedCell template is recommended for displaying aggregated values.');
+          }
+        }
 
-        const template = (_column$columnDef$agg = column.columnDef.aggregatedCell) != null ? _column$columnDef$agg : column.columnDef.cell;
+        const template = column.columnDef.aggregatedCell || column.columnDef.cell;
         return template ? instance._render(template, {
           instance,
           column,
           row,
           cell,
-          getValue: cell.getValue
+          getValue: getRenderValue
         }) : null;
       }
     };
@@ -2022,11 +2029,11 @@ const RowSelection = {
         });
       },
       toggleAllPageRowsSelected: value => instance.setRowSelection(old => {
-        typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
+        const resolvedValue = typeof value !== 'undefined' ? value : !instance.getIsAllPageRowsSelected();
         const rowSelection = { ...old
         };
         instance.getRowModel().rows.forEach(row => {
-          mutateRowIsSelected(rowSelection, row.id, value, instance);
+          mutateRowIsSelected(rowSelection, row.id, resolvedValue, instance);
         });
         return rowSelection;
       }),
@@ -2117,7 +2124,7 @@ const RowSelection = {
           return (_instance$options$deb2 = instance.options.debugAll) != null ? _instance$options$deb2 : instance.options.debugTable;
         }
       }),
-      getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getGroupedRowModel()], (rowSelection, rowModel) => {
+      getGroupedSelectedRowModel: memo(() => [instance.getState().rowSelection, instance.getSortedRowModel()], (rowSelection, rowModel) => {
         if (!Object.keys(rowSelection).length) {
           return {
             rows: [],
@@ -2181,7 +2188,7 @@ const RowSelection = {
       },
       getIsSomePageRowsSelected: () => {
         const paginationFlatRows = instance.getPaginationRowModel().flatRows;
-        return instance.getIsAllPageRowsSelected() ? false : !!(paginationFlatRows != null && paginationFlatRows.length);
+        return instance.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
       },
       getToggleAllRowsSelectedHandler: () => {
         return e => {
@@ -2535,8 +2542,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);
@@ -2561,30 +2570,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));
@@ -2593,7 +2601,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'
                 };
               }
 
@@ -2606,6 +2614,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;
 
@@ -2649,7 +2674,7 @@ const Sorting = {
 
         instance.setSorting(defaultState ? [] : (_instance$initialStat = (_instance$initialStat2 = instance.initialState) == null ? void 0 : _instance$initialStat2.sorting) != null ? _instance$initialStat : []);
       },
-      getPreSortedRowModel: () => instance.getFilteredRowModel(),
+      getPreSortedRowModel: () => instance.getGroupedRowModel(),
       getSortedRowModel: () => {
         if (!instance._getSortedRowModel && instance.options.getSortedRowModel) {
           instance._getSortedRowModel = instance.options.getSortedRowModel(instance);
@@ -3055,6 +3080,12 @@ function createTable(_, __, options) {
 }
 
 function createCell(instance, row, column, columnId) {
+  const getRenderValue = () => {
+    var _cell$getValue;
+
+    return (_cell$getValue = cell.getValue()) != null ? _cell$getValue : instance.options.renderFallbackValue;
+  };
+
   const cell = {
     id: row.id + "_" + column.id,
     row,
@@ -3066,7 +3097,7 @@ function createCell(instance, row, column, columnId) {
         column,
         row,
         cell: cell,
-        getValue: cell.getValue
+        getValue: getRenderValue
       }) : null;
     }
   };
@@ -3795,20 +3826,34 @@ function getPaginationRowModel(opts) {
     const pageStart = pageSize * pageIndex;
     const pageEnd = pageStart + pageSize;
     rows = rows.slice(pageStart, pageEnd);
+    let paginatedRowModel;
 
     if (!instance.options.paginateExpandedRows) {
-      return expandRows({
+      paginatedRowModel = expandRows({
         rows,
         flatRows,
         rowsById
       });
+    } else {
+      paginatedRowModel = {
+        rows,
+        flatRows,
+        rowsById
+      };
     }
 
-    return {
-      rows,
-      flatRows,
-      rowsById
+    paginatedRowModel.flatRows = [];
+
+    const handleRow = row => {
+      paginatedRowModel.flatRows.push(row);
+
+      if (row.subRows.length) {
+        row.subRows.forEach(handleRow);
+      }
     };
+
+    paginatedRowModel.rows.forEach(handleRow);
+    return paginatedRowModel;
   }, {
     key: process.env.NODE_ENV === 'development' && 'getPaginationRowModel',
     debug: () => {