react-hook-tanstack-table 0.0.1 → 0.0.3

package/dist/useTable.cjs

@@ -1,44 +1 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_isShallowEqual = require("./isShallowEqual-D6PQ041u.cjs");
-const require_useTableWithSelector = require("./useTableWithSelector-Bdsf6Zxk.cjs");
-const require_runGetters = require("./runGetters-Q-UsPG2j.cjs");
-let react = require("react");
-//#region src/hooks/useTable.ts
-const tableValuesCache = /* @__PURE__ */ new WeakMap();
-const tableHandlersCache = /* @__PURE__ */ new WeakMap();
-const getTableValues = (table) => {
-	let cached = tableValuesCache.get(table.options);
-	if (!cached) {
-		let cachedHandlers = tableHandlersCache.get(table);
-		if (!cachedHandlers) {
-			cachedHandlers = {
-				toggleAllColumnsVisibilityHandler: table.getToggleAllColumnsVisibilityHandler(),
-				toggleAllPageRowsSelectedHandler: table.getToggleAllPageRowsSelectedHandler(),
-				toggleAllRowsExpandedHandler: table.getToggleAllRowsExpandedHandler(),
-				toggleAllRowsSelectedHandler: table.getToggleAllRowsSelectedHandler()
-			};
-			tableHandlersCache.set(table, cachedHandlers);
-		}
-		const { toggleAllColumnsVisibilityHandler, toggleAllPageRowsSelectedHandler, toggleAllRowsExpandedHandler, toggleAllRowsSelectedHandler } = cachedHandlers;
-		const { getColumn, getRow, ...rest } = table;
-		cached = {
-			...require_runGetters.runGetters(rest),
-			getColumn,
-			getRow,
-			toggleAllColumnsVisibilityHandler,
-			toggleAllPageRowsSelectedHandler,
-			toggleAllRowsExpandedHandler,
-			toggleAllRowsSelectedHandler
-		};
-		tableValuesCache.set(table.options, cached);
-	}
-	return cached;
-};
-const useTable = (table, selector = require_useTableWithSelector.identity, isEqual = require_isShallowEqual.isShallowEqual) => {
-	return require_useTableWithSelector.useTableWithSelector(table, (0, react.useCallback)((table) => selector(getTableValues(table)), [selector]), isEqual);
-};
-const tableHook = useTable;
-const tableHookʹ = (table) => (selector = require_useTableWithSelector.identity, isEqual = require_isShallowEqual.isShallowEqual) => tableHook(table, selector, isEqual);
-//#endregion
-exports.useTable = useTable;
-exports.useTableʹ = tableHookʹ;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("./invariant-BzSvgtnX.cjs"),t=require("./useTableBase-BLBisaqE.cjs");let n=require("react");const r=new WeakMap,i=new WeakMap,a=e=>{let n=r.get(e.options);if(!n){let a=i.get(e);a||(a={toggleAllColumnsVisibilityHandler:e.getToggleAllColumnsVisibilityHandler(),toggleAllPageRowsSelectedHandler:e.getToggleAllPageRowsSelectedHandler(),toggleAllRowsExpandedHandler:e.getToggleAllRowsExpandedHandler(),toggleAllRowsSelectedHandler:e.getToggleAllRowsSelectedHandler()},i.set(e,a));let{toggleAllColumnsVisibilityHandler:o,toggleAllPageRowsSelectedHandler:s,toggleAllRowsExpandedHandler:c,toggleAllRowsSelectedHandler:l}=a,{getColumn:u,getRow:d,...f}=e;n={...t.r(f),getColumn:u,getRow:d,toggleAllColumnsVisibilityHandler:o,toggleAllPageRowsSelectedHandler:s,toggleAllRowsExpandedHandler:c,toggleAllRowsSelectedHandler:l},r.set(e.options,n)}return n},o=(...r)=>{let[i,o=t.i,s=e.r]=t.n(r)?r:[void 0,...r];return t.t(i,(0,n.useCallback)(e=>o(a(e),e),[o]),s)},s=o,c=e=>(t,n)=>s(e,t,n);exports.useTable=o,exports.useTableʹ=c;

package/dist/useTable.d.cts

@@ -2,10 +2,10 @@ import { n as RunGetters, t as IsEqual } from "./types-DIWB6wdO.cjs";
 import { RowData, Table } from "@tanstack/table-core";
 
 //#region src/hooks/useTable.d.ts
-interface TableValues<TData extends RowData> extends RunGetters<Table<TData>> {}
-type Selector<TData extends RowData, Selection> = (tableValues: TableValues<TData>) => Selection;
-declare const useTable: <TData extends RowData, Selection = TableValues<TData>>(table?: Table<TData> | undefined, selector?: Selector<TData, Selection>, isEqual?: IsEqual<NoInfer<Selection>>) => Selection;
-declare const tableHookʹ: <TData extends RowData>(table?: Table<TData> | undefined) => <Selection = TableValues<TData>>(selector?: Selector<TData, Selection>, isEqual?: IsEqual<NoInfer<Selection>>) => Selection;
+interface TableSnapshot<TData extends RowData> extends RunGetters<Table<TData>> {}
+type Selector<TData extends RowData, Selection> = (tableSnapshot: TableSnapshot<TData>, table: Table<TData>) => Selection;
+declare const useTable: <TData extends RowData, Selection = TableSnapshot<TData>>(...args: [table: Table<TData> | undefined, selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined] | [selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined]) => Selection;
+declare const tableHookʹ: <TData extends RowData>(table?: Table<TData> | undefined) => <Selection = TableSnapshot<TData>>(selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined) => Selection;
 //#endregion
-export { TableValues, useTable, tableHookʹ as useTableʹ };
+export { TableSnapshot, useTable, tableHookʹ as useTableʹ };
 //# sourceMappingURL=useTable.d.cts.map

package/dist/useTable.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.d.cts","names":[],"sources":["../src/hooks/useTable.ts"],"mappings":";;;;UAiBiB,WAAA,eAA0B,OAAA,UAAiB,UAAA,CAC1D,KAAA,CAAM,KAAA;AAAA,KAmEH,QAAA,eAAuB,OAAA,gBAC1B,WAAA,EAAa,WAAA,CAAY,KAAA,MACtB,SAAA;AAAA,cAEQ,QAAA,iBAA0B,OAAA,cAAqB,WAAA,CAAY,KAAA,GACtE,KAAA,GAAQ,KAAA,CAAM,KAAA,eACd,QAAA,GAAU,QAAA,CAAS,KAAA,EAAO,SAAA,GAC1B,OAAA,GAAS,OAAA,CAAQ,OAAA,CAAQ,SAAA,OACxB,SAAA;AAAA,cAWG,UAAA,iBACW,OAAA,EAAS,KAAA,GAAQ,KAAA,CAAM,KAAA,+BACzB,WAAA,CAAY,KAAA,GACvB,QAAA,GAAU,QAAA,CAAS,KAAA,EAAO,SAAA,GAC1B,OAAA,GAAS,OAAA,CAAQ,OAAA,CAAQ,SAAA,OACxB,SAAA"}
+{"version":3,"file":"useTable.d.cts","names":[],"sources":["../src/hooks/useTable.ts"],"mappings":";;;;UAkBiB,aAAA,eAA4B,OAAA,UAAiB,UAAA,CAC5D,KAAA,CAAM,KAAA;AAAA,KAmEH,QAAA,eAAuB,OAAA,gBAC1B,aAAA,EAAe,aAAA,CAAc,KAAA,GAC9B,KAAA,EAAO,KAAA,CAAM,KAAA,MACT,SAAA;AAAA,cAEQ,QAAA,iBAA0B,OAAA,cAAqB,aAAA,CAAc,KAAA,MACrE,IAAA,GAEG,KAAA,EAAO,KAAA,CAAM,KAAA,eACb,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,mBAG1B,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,oBAE/B,SAAA;AAAA,cAiBG,UAAA,iBACW,OAAA,EAAS,KAAA,GAAQ,KAAA,CAAM,KAAA,+BACzB,aAAA,CAAc,KAAA,GACzB,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,mBACzB,SAAA"}

package/dist/useTable.d.ts

@@ -2,10 +2,10 @@ import { n as RunGetters, t as IsEqual } from "./types-DIWB6wdO.js";
 import { RowData, Table } from "@tanstack/table-core";
 
 //#region src/hooks/useTable.d.ts
-interface TableValues<TData extends RowData> extends RunGetters<Table<TData>> {}
-type Selector<TData extends RowData, Selection> = (tableValues: TableValues<TData>) => Selection;
-declare const useTable: <TData extends RowData, Selection = TableValues<TData>>(table?: Table<TData> | undefined, selector?: Selector<TData, Selection>, isEqual?: IsEqual<NoInfer<Selection>>) => Selection;
-declare const tableHookʹ: <TData extends RowData>(table?: Table<TData> | undefined) => <Selection = TableValues<TData>>(selector?: Selector<TData, Selection>, isEqual?: IsEqual<NoInfer<Selection>>) => Selection;
+interface TableSnapshot<TData extends RowData> extends RunGetters<Table<TData>> {}
+type Selector<TData extends RowData, Selection> = (tableSnapshot: TableSnapshot<TData>, table: Table<TData>) => Selection;
+declare const useTable: <TData extends RowData, Selection = TableSnapshot<TData>>(...args: [table: Table<TData> | undefined, selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined] | [selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined]) => Selection;
+declare const tableHookʹ: <TData extends RowData>(table?: Table<TData> | undefined) => <Selection = TableSnapshot<TData>>(selector?: Selector<TData, Selection> | undefined, isEqual?: IsEqual<NoInfer<Selection>> | undefined) => Selection;
 //#endregion
-export { TableValues, useTable, tableHookʹ as useTableʹ };
+export { TableSnapshot, useTable, tableHookʹ as useTableʹ };
 //# sourceMappingURL=useTable.d.ts.map

package/dist/useTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.d.ts","names":[],"sources":["../src/hooks/useTable.ts"],"mappings":";;;;UAiBiB,WAAA,eAA0B,OAAA,UAAiB,UAAA,CAC1D,KAAA,CAAM,KAAA;AAAA,KAmEH,QAAA,eAAuB,OAAA,gBAC1B,WAAA,EAAa,WAAA,CAAY,KAAA,MACtB,SAAA;AAAA,cAEQ,QAAA,iBAA0B,OAAA,cAAqB,WAAA,CAAY,KAAA,GACtE,KAAA,GAAQ,KAAA,CAAM,KAAA,eACd,QAAA,GAAU,QAAA,CAAS,KAAA,EAAO,SAAA,GAC1B,OAAA,GAAS,OAAA,CAAQ,OAAA,CAAQ,SAAA,OACxB,SAAA;AAAA,cAWG,UAAA,iBACW,OAAA,EAAS,KAAA,GAAQ,KAAA,CAAM,KAAA,+BACzB,WAAA,CAAY,KAAA,GACvB,QAAA,GAAU,QAAA,CAAS,KAAA,EAAO,SAAA,GAC1B,OAAA,GAAS,OAAA,CAAQ,OAAA,CAAQ,SAAA,OACxB,SAAA"}
+{"version":3,"file":"useTable.d.ts","names":[],"sources":["../src/hooks/useTable.ts"],"mappings":";;;;UAkBiB,aAAA,eAA4B,OAAA,UAAiB,UAAA,CAC5D,KAAA,CAAM,KAAA;AAAA,KAmEH,QAAA,eAAuB,OAAA,gBAC1B,aAAA,EAAe,aAAA,CAAc,KAAA,GAC9B,KAAA,EAAO,KAAA,CAAM,KAAA,MACT,SAAA;AAAA,cAEQ,QAAA,iBAA0B,OAAA,cAAqB,aAAA,CAAc,KAAA,MACrE,IAAA,GAEG,KAAA,EAAO,KAAA,CAAM,KAAA,eACb,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,mBAG1B,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,oBAE/B,SAAA;AAAA,cAiBG,UAAA,iBACW,OAAA,EAAS,KAAA,GAAQ,KAAA,CAAM,KAAA,+BACzB,aAAA,CAAc,KAAA,GACzB,QAAA,GAAW,QAAA,CAAS,KAAA,EAAO,SAAA,eAC3B,OAAA,GAAU,OAAA,CAAQ,OAAA,CAAQ,SAAA,mBACzB,SAAA"}

package/dist/useTable.js

@@ -1,44 +1,2 @@
-import { t as isShallowEqual } from "./isShallowEqual-Kynsoe7a.js";
-import { n as identity, t as useTableWithSelector } from "./useTableWithSelector-D3f689pF.js";
-import { t as runGetters } from "./runGetters-BfRTE7LZ.js";
-import { useCallback } from "react";
-//#region src/hooks/useTable.ts
-const tableValuesCache = /* @__PURE__ */ new WeakMap();
-const tableHandlersCache = /* @__PURE__ */ new WeakMap();
-const getTableValues = (table) => {
-	let cached = tableValuesCache.get(table.options);
-	if (!cached) {
-		let cachedHandlers = tableHandlersCache.get(table);
-		if (!cachedHandlers) {
-			cachedHandlers = {
-				toggleAllColumnsVisibilityHandler: table.getToggleAllColumnsVisibilityHandler(),
-				toggleAllPageRowsSelectedHandler: table.getToggleAllPageRowsSelectedHandler(),
-				toggleAllRowsExpandedHandler: table.getToggleAllRowsExpandedHandler(),
-				toggleAllRowsSelectedHandler: table.getToggleAllRowsSelectedHandler()
-			};
-			tableHandlersCache.set(table, cachedHandlers);
-		}
-		const { toggleAllColumnsVisibilityHandler, toggleAllPageRowsSelectedHandler, toggleAllRowsExpandedHandler, toggleAllRowsSelectedHandler } = cachedHandlers;
-		const { getColumn, getRow, ...rest } = table;
-		cached = {
-			...runGetters(rest),
-			getColumn,
-			getRow,
-			toggleAllColumnsVisibilityHandler,
-			toggleAllPageRowsSelectedHandler,
-			toggleAllRowsExpandedHandler,
-			toggleAllRowsSelectedHandler
-		};
-		tableValuesCache.set(table.options, cached);
-	}
-	return cached;
-};
-const useTable = (table, selector = identity, isEqual = isShallowEqual) => {
-	return useTableWithSelector(table, useCallback((table) => selector(getTableValues(table)), [selector]), isEqual);
-};
-const tableHook = useTable;
-const tableHookʹ = (table) => (selector = identity, isEqual = isShallowEqual) => tableHook(table, selector, isEqual);
-//#endregion
-export { useTable, tableHookʹ as useTableʹ };
-
+import{r as e}from"./invariant-DhtaPrYv.js";import{i as t,n,r,t as i}from"./useTableBase-CgF6IzQm.js";import{useCallback as a}from"react";const o=new WeakMap,s=new WeakMap,c=e=>{let t=o.get(e.options);if(!t){let n=s.get(e);n||(n={toggleAllColumnsVisibilityHandler:e.getToggleAllColumnsVisibilityHandler(),toggleAllPageRowsSelectedHandler:e.getToggleAllPageRowsSelectedHandler(),toggleAllRowsExpandedHandler:e.getToggleAllRowsExpandedHandler(),toggleAllRowsSelectedHandler:e.getToggleAllRowsSelectedHandler()},s.set(e,n));let{toggleAllColumnsVisibilityHandler:i,toggleAllPageRowsSelectedHandler:a,toggleAllRowsExpandedHandler:c,toggleAllRowsSelectedHandler:l}=n,{getColumn:u,getRow:d,...f}=e;t={...r(f),getColumn:u,getRow:d,toggleAllColumnsVisibilityHandler:i,toggleAllPageRowsSelectedHandler:a,toggleAllRowsExpandedHandler:c,toggleAllRowsSelectedHandler:l},o.set(e.options,t)}return t},l=(...r)=>{let[o,s=t,l=e]=n(r)?r:[void 0,...r];return i(o,a(e=>s(c(e),e),[s]),l)},u=l,d=e=>(t,n)=>u(e,t,n);export{l as useTable,d as useTableʹ};
 //# sourceMappingURL=useTable.js.map

package/dist/useTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.js","names":[],"sources":["../src/hooks/useTable.ts"],"sourcesContent":["import { useCallback } from \"react\"\n\nimport type {\n  RequiredKeys,\n  RowData,\n  Table,\n  TableOptionsResolved,\n} from \"@tanstack/table-core\"\n\nimport { identity } from \"../lib/identity\"\nimport { runGetters } from \"../lib/runGetters\"\nimport { isShallowEqual } from \"../lib/isShallowEqual\"\n\nimport type { IsEqual, RunGetters } from \"../types\"\n\nimport { useTableWithSelector } from \"./useTableWithSelector\"\n\nexport interface TableValues<TData extends RowData> extends RunGetters<\n  Table<TData>\n> {}\n\nconst tableValuesCache = new WeakMap<\n  RequiredKeys<TableOptionsResolved<any>, \"state\">,\n  TableValues<any>\n>()\n\nconst tableHandlersCache = new WeakMap<\n  Table<any>,\n  {\n    toggleAllColumnsVisibilityHandler: ReturnType<\n      Table<any>[\"getToggleAllColumnsVisibilityHandler\"]\n    >\n    toggleAllPageRowsSelectedHandler: ReturnType<\n      Table<any>[\"getToggleAllPageRowsSelectedHandler\"]\n    >\n    toggleAllRowsExpandedHandler: ReturnType<\n      Table<any>[\"getToggleAllRowsExpandedHandler\"]\n    >\n    toggleAllRowsSelectedHandler: ReturnType<\n      Table<any>[\"getToggleAllRowsSelectedHandler\"]\n    >\n  }\n>()\n\nconst getTableValues = <TData extends RowData>(\n  table: Table<TData>,\n): TableValues<TData> => {\n  let cached = tableValuesCache.get(table.options)\n  if (!cached) {\n    let cachedHandlers = tableHandlersCache.get(table)\n    if (!cachedHandlers) {\n      cachedHandlers = {\n        toggleAllColumnsVisibilityHandler:\n          table.getToggleAllColumnsVisibilityHandler(),\n        toggleAllPageRowsSelectedHandler:\n          table.getToggleAllPageRowsSelectedHandler(),\n        toggleAllRowsExpandedHandler: table.getToggleAllRowsExpandedHandler(),\n        toggleAllRowsSelectedHandler: table.getToggleAllRowsSelectedHandler(),\n      }\n      tableHandlersCache.set(table, cachedHandlers)\n    }\n\n    const {\n      toggleAllColumnsVisibilityHandler,\n      toggleAllPageRowsSelectedHandler,\n      toggleAllRowsExpandedHandler,\n      toggleAllRowsSelectedHandler,\n    } = cachedHandlers\n\n    const { getColumn, getRow, ...rest } = table\n\n    cached = {\n      ...runGetters(rest),\n      getColumn,\n      getRow,\n      toggleAllColumnsVisibilityHandler,\n      toggleAllPageRowsSelectedHandler,\n      toggleAllRowsExpandedHandler,\n      toggleAllRowsSelectedHandler,\n    }\n    tableValuesCache.set(table.options, cached)\n  }\n  return cached\n}\n\ntype Selector<TData extends RowData, Selection> = (\n  tableValues: TableValues<TData>,\n) => Selection\n\nexport const useTable = <TData extends RowData, Selection = TableValues<TData>>(\n  table?: Table<TData> | undefined,\n  selector: Selector<TData, Selection> = identity as never,\n  isEqual: IsEqual<NoInfer<Selection>> = isShallowEqual,\n): Selection => {\n  const getSelection = useCallback(\n    (table: Table<TData>) => selector(getTableValues(table)),\n    [selector],\n  )\n\n  return useTableWithSelector(table, getSelection, isEqual)\n}\n\nconst tableHook = useTable\n\nconst tableHookʹ =\n  <TData extends RowData>(table?: Table<TData> | undefined) =>\n  <Selection = TableValues<TData>>(\n    selector: Selector<TData, Selection> = identity as never,\n    isEqual: IsEqual<NoInfer<Selection>> = isShallowEqual,\n  ): Selection =>\n    tableHook(table, selector, isEqual)\n\nexport { tableHookʹ as useTableʹ }\n"],"mappings":";;;;;AAqBA,MAAM,mCAAmB,IAAI,QAG3B;AAEF,MAAM,qCAAqB,IAAI,QAgB7B;AAEF,MAAM,kBACJ,UACuB;CACvB,IAAI,SAAS,iBAAiB,IAAI,MAAM,OAAO;CAC/C,IAAI,CAAC,QAAQ;EACX,IAAI,iBAAiB,mBAAmB,IAAI,KAAK;EACjD,IAAI,CAAC,gBAAgB;GACnB,iBAAiB;IACf,mCACE,MAAM,qCAAqC;IAC7C,kCACE,MAAM,oCAAoC;IAC5C,8BAA8B,MAAM,gCAAgC;IACpE,8BAA8B,MAAM,gCAAgC;GACtE;GACA,mBAAmB,IAAI,OAAO,cAAc;EAC9C;EAEA,MAAM,EACJ,mCACA,kCACA,8BACA,iCACE;EAEJ,MAAM,EAAE,WAAW,QAAQ,GAAG,SAAS;EAEvC,SAAS;GACP,GAAG,WAAW,IAAI;GAClB;GACA;GACA;GACA;GACA;GACA;EACF;EACA,iBAAiB,IAAI,MAAM,SAAS,MAAM;CAC5C;CACA,OAAO;AACT;AAMA,MAAa,YACX,OACA,WAAuC,UACvC,UAAuC,mBACzB;CAMd,OAAO,qBAAqB,OALP,aAClB,UAAwB,SAAS,eAAe,KAAK,CAAC,GACvD,CAAC,QAAQ,CAGmC,GAAG,OAAO;AAC1D;AAEA,MAAM,YAAY;AAElB,MAAM,cACoB,WAEtB,WAAuC,UACvC,UAAuC,mBAEvC,UAAU,OAAO,UAAU,OAAO"}
+{"version":3,"file":"useTable.js","names":[],"sources":["../src/hooks/useTable.ts"],"sourcesContent":["import { useCallback } from \"react\"\n\nimport type {\n  RequiredKeys,\n  RowData,\n  Table,\n  TableOptionsResolved,\n} from \"@tanstack/table-core\"\n\nimport { identity } from \"../lib/identity\"\nimport { runGetters } from \"../lib/runGetters\"\nimport { isShallowEqual } from \"../lib/isShallowEqual\"\nimport { hasTableArg } from \"../lib/hasTableArg\"\n\nimport type { IsEqual, RunGetters } from \"../types\"\n\nimport { useTableBase } from \"../lib/useTableBase\"\n\nexport interface TableSnapshot<TData extends RowData> extends RunGetters<\n  Table<TData>\n> {}\n\nconst tableSnapshotCache = new WeakMap<\n  RequiredKeys<TableOptionsResolved<any>, \"state\">,\n  TableSnapshot<any>\n>()\n\nconst tableHandlersCache = new WeakMap<\n  Table<any>,\n  {\n    toggleAllColumnsVisibilityHandler: ReturnType<\n      Table<any>[\"getToggleAllColumnsVisibilityHandler\"]\n    >\n    toggleAllPageRowsSelectedHandler: ReturnType<\n      Table<any>[\"getToggleAllPageRowsSelectedHandler\"]\n    >\n    toggleAllRowsExpandedHandler: ReturnType<\n      Table<any>[\"getToggleAllRowsExpandedHandler\"]\n    >\n    toggleAllRowsSelectedHandler: ReturnType<\n      Table<any>[\"getToggleAllRowsSelectedHandler\"]\n    >\n  }\n>()\n\nconst getTableSnapshot = <TData extends RowData>(\n  table: Table<TData>,\n): TableSnapshot<TData> => {\n  let cached = tableSnapshotCache.get(table.options)\n  if (!cached) {\n    let cachedHandlers = tableHandlersCache.get(table)\n    if (!cachedHandlers) {\n      cachedHandlers = {\n        toggleAllColumnsVisibilityHandler:\n          table.getToggleAllColumnsVisibilityHandler(),\n        toggleAllPageRowsSelectedHandler:\n          table.getToggleAllPageRowsSelectedHandler(),\n        toggleAllRowsExpandedHandler: table.getToggleAllRowsExpandedHandler(),\n        toggleAllRowsSelectedHandler: table.getToggleAllRowsSelectedHandler(),\n      }\n      tableHandlersCache.set(table, cachedHandlers)\n    }\n\n    const {\n      toggleAllColumnsVisibilityHandler,\n      toggleAllPageRowsSelectedHandler,\n      toggleAllRowsExpandedHandler,\n      toggleAllRowsSelectedHandler,\n    } = cachedHandlers\n\n    const { getColumn, getRow, ...rest } = table\n\n    cached = {\n      ...runGetters(rest),\n      getColumn,\n      getRow,\n      toggleAllColumnsVisibilityHandler,\n      toggleAllPageRowsSelectedHandler,\n      toggleAllRowsExpandedHandler,\n      toggleAllRowsSelectedHandler,\n    }\n    tableSnapshotCache.set(table.options, cached)\n  }\n  return cached\n}\n\ntype Selector<TData extends RowData, Selection> = (\n  tableSnapshot: TableSnapshot<TData>,\n\ttable: Table<TData>\n) => Selection\n\nexport const useTable = <TData extends RowData, Selection = TableSnapshot<TData>>(\n  ...args:\n    | [\n        table: Table<TData> | undefined,\n        selector?: Selector<TData, Selection> | undefined,\n        isEqual?: IsEqual<NoInfer<Selection>> | undefined,\n      ]\n    | [\n        selector?: Selector<TData, Selection> | undefined,\n        isEqual?: IsEqual<NoInfer<Selection>> | undefined,\n      ]\n): Selection => {\n  const [\n    table,\n    selector = identity as never,\n    isEqual = isShallowEqual,\n  ] = hasTableArg(args) ? args : [undefined, ...args]\n\n  const getSelection = useCallback(\n    (table: Table<TData>) => selector(getTableSnapshot(table), table),\n    [selector],\n  )\n\n  return useTableBase(table, getSelection, isEqual)\n}\n\nconst tableHook = useTable\n\nconst tableHookʹ =\n  <TData extends RowData>(table?: Table<TData> | undefined) =>\n  <Selection = TableSnapshot<TData>>(\n    selector?: Selector<TData, Selection> | undefined,\n    isEqual?: IsEqual<NoInfer<Selection>> | undefined\n  ): Selection =>\n    tableHook(table, selector, isEqual)\n\nexport { tableHookʹ as useTableʹ }\n"],"mappings":"0IAsBA,MAAM,EAAqB,IAAI,QAKzB,EAAqB,IAAI,QAkBzB,EACJ,GACyB,CACzB,IAAI,EAAS,EAAmB,IAAI,EAAM,OAAO,EACjD,GAAI,CAAC,EAAQ,CACX,IAAI,EAAiB,EAAmB,IAAI,CAAK,EAC5C,IACH,EAAiB,CACf,kCACE,EAAM,qCAAqC,EAC7C,iCACE,EAAM,oCAAoC,EAC5C,6BAA8B,EAAM,gCAAgC,EACpE,6BAA8B,EAAM,gCAAgC,CACtE,EACA,EAAmB,IAAI,EAAO,CAAc,GAG9C,GAAM,CACJ,oCACA,mCACA,+BACA,gCACE,EAEE,CAAE,YAAW,SAAQ,GAAG,GAAS,EAEvC,EAAS,CACP,GAAG,EAAW,CAAI,EAClB,YACA,SACA,oCACA,mCACA,+BACA,8BACF,EACA,EAAmB,IAAI,EAAM,QAAS,CAAM,CAC9C,CACA,OAAO,CACT,EAOa,GACX,GAAG,IAUW,CACd,GAAM,CACJ,EACA,EAAW,EACX,EAAU,GACR,EAAY,CAAI,EAAI,EAAO,CAAC,IAAA,GAAW,GAAG,CAAI,EAOlD,OAAO,EAAa,EALC,EAClB,GAAwB,EAAS,EAAiB,CAAK,EAAG,CAAK,EAChE,CAAC,CAAQ,CAG2B,EAAG,CAAO,CAClD,EAEM,EAAY,EAEZ,EACoB,IAEtB,EACA,IAEA,EAAU,EAAO,EAAU,CAAO"}

package/dist/useTableBase-BLBisaqE.cjs

@@ -0,0 +1 @@
+const e=require("./TableContext.cjs"),t=require("./invariant-BzSvgtnX.cjs");let n=require("react");const r=(e,...t)=>e,i=e=>e.slice(0,1).toLowerCase()+e.slice(1),a=e=>Object.fromEntries(Object.entries(e).map(([e,t])=>{if(typeof t==`function`&&e.startsWith(`get`))try{return[i(e.replace(/^get/,``)),t()]}catch{return[e,t]}return[e,t]})),o=e=>typeof e==`object`&&!!e&&t.n.has(e),s=e=>o(e[0])||e[0]===void 0,c=(i,a=r,o)=>{"use no memo";let s=i??(0,n.use)(e.TableContext);t.t(s,"`useTableBase` must be used as a descendent of `TableContext` or provided with a `Table` as an argument!");let c=(0,n.useMemo)(()=>(t.n.get(s)??{}).listeners,[s]);t.t(c,"The provided/found `Table` instance cannot be subscribed to. Was it created by the correct `useReactTable` hook?");let l=(0,n.useCallback)(e=>(c.add(e),()=>{c.delete(e)}),[c]),u=(0,n.useRef)({hasValue:!1,value:null}),d=(0,n.useSyncExternalStore)(l,(0,n.useMemo)(()=>{let e=!1,t,n;return()=>{let r=s.options;if(!e){e=!0,t=r;let i=a(s);if(o!==void 0&&u.current.hasValue){let e=u.current.value;if(o(e,i))return n=e,e}return n=i,i}let i=t,c=n;if(Object.is(i,r))return c;let l=a(s);return o!==void 0&&o(c,l)?(t=r,c):(t=r,n=l,l)}},[a,s,o]));return(0,n.useInsertionEffect)(()=>{u.current.hasValue=!0,u.current.value=d},[d]),d};Object.defineProperty(exports,"i",{enumerable:!0,get:function(){return r}}),Object.defineProperty(exports,"n",{enumerable:!0,get:function(){return s}}),Object.defineProperty(exports,"r",{enumerable:!0,get:function(){return a}}),Object.defineProperty(exports,"t",{enumerable:!0,get:function(){return c}});

package/dist/useTableBase-CgF6IzQm.js

@@ -0,0 +1,2 @@
+import{TableContext as e}from"./TableContext.js";import{n as t,t as n}from"./invariant-DhtaPrYv.js";import{use as r,useCallback as i,useInsertionEffect as a,useMemo as o,useRef as s,useSyncExternalStore as c}from"react";const l=(e,...t)=>e,u=e=>e.slice(0,1).toLowerCase()+e.slice(1),d=e=>Object.fromEntries(Object.entries(e).map(([e,t])=>{if(typeof t==`function`&&e.startsWith(`get`))try{return[u(e.replace(/^get/,``)),t()]}catch{return[e,t]}return[e,t]})),f=e=>typeof e==`object`&&!!e&&t.has(e),p=e=>f(e[0])||e[0]===void 0,m=(u,d=l,f)=>{"use no memo";let p=u??r(e);n(p,"`useTableBase` must be used as a descendent of `TableContext` or provided with a `Table` as an argument!");let m=o(()=>(t.get(p)??{}).listeners,[p]);n(m,"The provided/found `Table` instance cannot be subscribed to. Was it created by the correct `useReactTable` hook?");let h=i(e=>(m.add(e),()=>{m.delete(e)}),[m]),g=s({hasValue:!1,value:null}),_=c(h,o(()=>{let e=!1,t,n;return()=>{let r=p.options;if(!e){e=!0,t=r;let i=d(p);if(f!==void 0&&g.current.hasValue){let e=g.current.value;if(f(e,i))return n=e,e}return n=i,i}let i=t,a=n;if(Object.is(i,r))return a;let o=d(p);return f!==void 0&&f(a,o)?(t=r,a):(t=r,n=o,o)}},[d,p,f]));return a(()=>{g.current.hasValue=!0,g.current.value=_},[_]),_};export{l as i,p as n,d as r,m as t};
+//# sourceMappingURL=useTableBase-CgF6IzQm.js.map

package/dist/useTableBase-CgF6IzQm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useTableBase-CgF6IzQm.js","names":[],"sources":["../src/lib/identity.ts","../src/lib/uncapitalize.ts","../src/lib/runGetters.ts","../src/lib/hasTableArg.ts","../src/lib/useTableBase.ts"],"sourcesContent":["export const identity = <T>(x: T, ..._: any[]): T => x\n","export const uncapitalize = (str: string): string =>\n  str.slice(0, 1).toLowerCase() + str.slice(1)\n","import type { RunGetters } from \"../types\"\nimport { uncapitalize } from \"./uncapitalize\"\n\nexport const runGetters = <T extends object>(x: T): RunGetters<T> =>\n  Object.fromEntries(\n    Object.entries(x).map(([key, value]) => {\n      if (typeof value === \"function\" && key.startsWith(\"get\")) {\n        try {\n          return [uncapitalize(key.replace(/^get/, \"\")), value()]\n        } catch {\n          return [key, value]\n        }\n      }\n\n      return [key, value]\n    }),\n  ) as RunGetters<T>\n","import type {\n  RowData,\n  Table,\n} from \"@tanstack/table-core\"\n\nimport { tableRegistry } from \"./tableRegistry\"\n\nconst isTable = <TData extends RowData>(\n  x: unknown | Table<TData>,\n): x is Table<TData> =>\n  typeof x === \"object\" && x !== null && tableRegistry.has(x as Table<TData>)\n\nexport const hasTableArg = <\n  TData extends RowData,\n  Rest extends [unknown?, ...unknown[]],\n>(\n  args: [Table<TData> | undefined, ...Rest] | Rest,\n): args is [Table<TData> | undefined, ...Rest] =>\n  isTable(args[0]) || args[0] === undefined\n","import {\n  use,\n  useCallback,\n  useInsertionEffect,\n  useMemo,\n  useRef,\n  useSyncExternalStore,\n} from \"react\"\n\nimport type {\n  RequiredKeys,\n  RowData,\n  Table,\n  TableOptionsResolved,\n} from \"@tanstack/table-core\"\n\nimport { TableContext } from \"../contexts/TableContext\"\n\nimport { identity } from \"./identity\"\nimport { tableRegistry } from \"./tableRegistry\"\nimport { invariant } from \"./invariant\"\n\nimport type { IsEqual } from \"../types\"\n\nexport const useTableBase = <\n  TData extends RowData,\n  Selection = Table<TData>,\n>(\n  table?: Table<TData> | undefined,\n  selector: (table: Table<TData>) => Selection = identity as never,\n  isEqual?: IsEqual<NoInfer<Selection>> | undefined,\n): Selection => {\n  \"use no memo\"\n\n  const resolvedTable = table ?? use<Table<TData> | null>(TableContext)\n\n  invariant(\n    resolvedTable,\n    \"`useTableBase` must be used as a descendent of `TableContext` or provided with a `Table` as an argument!\",\n  )\n\n  const listeners = useMemo(\n    () => (tableRegistry.get(resolvedTable) ?? {}).listeners,\n    [resolvedTable],\n  )\n\n  invariant(\n    listeners,\n    \"The provided/found `Table` instance cannot be subscribed to. Was it created by the correct `useReactTable` hook?\",\n  )\n\n  const subscribe = useCallback(\n    (onTableChange: () => void) => {\n      listeners.add(onTableChange)\n      return () => {\n        listeners.delete(onTableChange)\n      }\n    },\n    [listeners],\n  )\n\n  // Use this to track the rendered snapshot.\n  const instRef = useRef<\n    | {\n        hasValue: false\n        value: null\n      }\n    | { hasValue: true; value: Selection }\n  >({\n    hasValue: false,\n    value: null,\n  })\n\n  // eslint-disable-next-line react-hooks/immutability\n  const getSnapshot = useMemo(() => {\n    let hasMemo = false,\n      memoizedTableOptions: RequiredKeys<TableOptionsResolved<TData>, \"state\">,\n      memoizedSelection: Selection\n\n    return () => {\n      const nextTableOptions = resolvedTable.options\n      if (!hasMemo) {\n        // The first time the hook is called, there is no memoized result.\n        // eslint-disable-next-line react-hooks/immutability -- should be fine 😅 this is how it is in the upstream, too\n        hasMemo = true\n        memoizedTableOptions = nextTableOptions\n        const nextSelection = selector(resolvedTable)\n\n        if (isEqual !== undefined) {\n          // Even if the selector has changed, the currently rendered selection\n          // may be equal to the new selection. We should attempt to reuse the\n          // current value if possible, to preserve downstream memoizations.\n          if (instRef.current.hasValue) {\n            const currentSelection = instRef.current.value\n            if (isEqual(currentSelection, nextSelection)) {\n              memoizedSelection = currentSelection\n              return currentSelection\n            }\n          }\n        }\n\n        memoizedSelection = nextSelection\n        return nextSelection\n      }\n\n      const prevTableOptions = memoizedTableOptions\n      // eslint-disable-next-line react-hooks/memo-dependencies\n      const prevSelection = memoizedSelection\n\n      if (Object.is(prevTableOptions, nextTableOptions)) {\n        // The snapshot is the same as last time. Reuse the previous selection.\n        return prevSelection\n      }\n\n      // The snapshot has changed, so we need to compute a new selection.\n      const nextSelection = selector(resolvedTable)\n\n      // If a custom isEqual function is provided, use that to check if the data\n      // has changed. If it hasn't, return the previous selection. That signals\n      // to React that the selections are conceptually equal, and we can bail\n      // out of rendering.\n      if (isEqual !== undefined && isEqual(prevSelection, nextSelection)) {\n        // The snapshot still has changed, so make sure to update to not keep\n        // old references alive\n        memoizedTableOptions = nextTableOptions\n        return prevSelection\n      }\n\n      memoizedTableOptions = nextTableOptions\n      memoizedSelection = nextSelection\n      return nextSelection\n    }\n  }, [selector, resolvedTable, isEqual])\n\n  const value = useSyncExternalStore(subscribe, getSnapshot)\n\n  useInsertionEffect(() => {\n    instRef.current.hasValue = true\n    instRef.current.value = value\n  }, [value])\n\n  return value\n}\n"],"mappings":"4NAAA,MAAa,GAAe,EAAM,GAAG,IAAgB,ECAxC,EAAgB,GAC3B,EAAI,MAAM,EAAG,CAAC,EAAE,YAAY,EAAI,EAAI,MAAM,CAAC,ECEhC,EAAgC,GAC3C,OAAO,YACL,OAAO,QAAQ,CAAC,EAAE,KAAK,CAAC,EAAK,KAAW,CACtC,GAAI,OAAO,GAAU,YAAc,EAAI,WAAW,KAAK,EACrD,GAAI,CACF,MAAO,CAAC,EAAa,EAAI,QAAQ,OAAQ,EAAE,CAAC,EAAG,EAAM,CAAC,CACxD,MAAQ,CACN,MAAO,CAAC,EAAK,CAAK,CACpB,CAGF,MAAO,CAAC,EAAK,CAAK,CACpB,CAAC,CACH,ECTI,EACJ,GAEA,OAAO,GAAM,YAAY,GAAc,EAAc,IAAI,CAAiB,EAE/D,EAIX,GAEA,EAAQ,EAAK,EAAE,GAAK,EAAK,KAAO,IAAA,GCMrB,GAIX,EACA,EAA+C,EAC/C,IACc,CACd,cAEA,IAAM,EAAgB,GAAS,EAAyB,CAAY,EAEpE,EACE,EACA,0GACF,EAEA,IAAM,EAAY,OACT,EAAc,IAAI,CAAa,GAAK,CAAC,GAAG,UAC/C,CAAC,CAAa,CAChB,EAEA,EACE,EACA,kHACF,EAEA,IAAM,EAAY,EACf,IACC,EAAU,IAAI,CAAa,MACd,CACX,EAAU,OAAO,CAAa,CAChC,GAEF,CAAC,CAAS,CACZ,EAGM,EAAU,EAMd,CACA,SAAU,GACV,MAAO,IACT,CAAC,EA+DK,EAAQ,EAAqB,EA5Df,MAAc,CAChC,IAAI,EAAU,GACZ,EACA,EAEF,UAAa,CACX,IAAM,EAAmB,EAAc,QACvC,GAAI,CAAC,EAAS,CAGZ,EAAU,GACV,EAAuB,EACvB,IAAM,EAAgB,EAAS,CAAa,EAE5C,GAAI,IAAY,IAAA,IAIV,EAAQ,QAAQ,SAAU,CAC5B,IAAM,EAAmB,EAAQ,QAAQ,MACzC,GAAI,EAAQ,EAAkB,CAAa,EAEzC,MADA,GAAoB,EACb,CAEX,CAIF,MADA,GAAoB,EACb,CACT,CAEA,IAAM,EAAmB,EAEnB,EAAgB,EAEtB,GAAI,OAAO,GAAG,EAAkB,CAAgB,EAE9C,OAAO,EAIT,IAAM,EAAgB,EAAS,CAAa,EAe5C,OATI,IAAY,IAAA,IAAa,EAAQ,EAAe,CAAa,GAG/D,EAAuB,EAChB,IAGT,EAAuB,EACvB,EAAoB,EACb,EACT,CACF,EAAG,CAAC,EAAU,EAAe,CAAO,CAEoB,CAAC,EAOzD,OALA,MAAyB,CACvB,EAAQ,QAAQ,SAAW,GAC3B,EAAQ,QAAQ,MAAQ,CAC1B,EAAG,CAAC,CAAK,CAAC,EAEH,CACT"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "react-hook-tanstack-table",
   "packageManager": "yarn@4.15.0",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Rules-of-React respecting bindings for TanStack Table.",
   "author": "Xandor Schiefer <me@xandor.co.za>",
   "license": "MIT",
@@ -47,10 +47,6 @@
       "import": "./dist/useTable.js",
       "require": "./dist/useTable.cjs"
     },
-    "./useTableWithSelector": {
-      "import": "./dist/useTableWithSelector.js",
-      "require": "./dist/useTableWithSelector.cjs"
-    },
     "./package.json": "./package.json"
   },
   "files": [

package/src/hooks/useCell.ts

@@ -18,28 +18,41 @@ import { invariant } from "../lib/invariant"
 
 import type { IsEqual, RunGetters } from "../types"
 
-import type { ColumnValues } from "./useColumn"
-import type { RowValues } from "./useRow"
-import { useTableWithSelector } from "./useTableWithSelector"
+import type { ColumnSnapshot } from "./useColumn"
+import type { RowSnapshot } from "./useRow"
+import { useTableBase } from "../lib/useTableBase"
 
-export interface CellValues<TData extends RowData, TValue> extends RunGetters<
+export interface CellSnapshot<TData extends RowData, TValue> extends RunGetters<
   Cell<TData, TValue>
 > {}
 
-const cellValuesCache = new WeakMap<
+const cellSnapshotCache = new WeakMap<
   RequiredKeys<TableOptionsResolved<any>, "state">,
-  Map<string, Map<string, CellValues<any, any>>>
+  Map<string, Map<string, CellSnapshot<any, any>>>
 >()
 
-const getCellValues = <TData extends RowData, TValue>(
+const getCell = <TData extends RowData, TValue>(
   table: Table<TData>,
   rowId: string,
   columnId: string,
-): CellValues<TData, TValue> => {
-  let cellCache = cellValuesCache.get(table.options)
+) => {
+	const cell = table
+		.getRow(rowId)
+		?.getAllCells()
+		.find((c) => c.column.id === columnId) as Cell<TData, TValue> | undefined
+	invariant(cell)
+	return cell
+}
+
+const getCellSnapshot = <TData extends RowData, TValue>(
+  table: Table<TData>,
+  rowId: string,
+  columnId: string,
+): CellSnapshot<TData, TValue> => {
+  let cellCache = cellSnapshotCache.get(table.options)
   if (!cellCache) {
     cellCache = new Map()
-    cellValuesCache.set(table.options, cellCache)
+    cellSnapshotCache.set(table.options, cellCache)
   }
 
   let rowCache = cellCache.get(rowId)
@@ -49,17 +62,9 @@ const getCellValues = <TData extends RowData, TValue>(
   }
 
   let cached = rowCache.get(columnId)
-
   if (!cached) {
-    const cell = table
-      .getRow(rowId)
-      ?.getAllCells()
-      .find((c) => c.column.id === columnId) as Cell<TData, TValue> | undefined
-
-    invariant(cell)
-
+    const cell = getCell(table, rowId, columnId)
     cached = runGetters(cell)
-
     rowCache.set(columnId, cached)
   }
 
@@ -67,25 +72,27 @@ const getCellValues = <TData extends RowData, TValue>(
 }
 
 type Selector<TData extends RowData, TValue, Selection> = (
-  cellValues: CellValues<TData, TValue>,
+  cellSnapshot: CellSnapshot<TData, TValue>,
+  cell: Cell<TData, TValue>,
+  table: Table<TData>,
 ) => Selection
 
 interface CellCoords<TData extends RowData, TValue> {
-  column: Column<TData, TValue> | ColumnValues<TData> | string
-  row: Row<TData> | RowValues<TData> | string
+  column: Column<TData, TValue> | ColumnSnapshot<TData> | string
+  row: Row<TData> | RowSnapshot<TData> | string
 }
 
 export const useCell = <
   TData extends RowData,
   TValue,
-  Selection = CellValues<TData, TValue>,
+  Selection = CellSnapshot<TData, TValue>,
 >(
   ...args:
     | [
         table: Table<TData> | undefined,
         cell:
           | Cell<TData, TValue>
-          | CellValues<TData, TValue>
+          | CellSnapshot<TData, TValue>
           | CellCoords<TData, TValue>,
         selector?: Selector<TData, TValue, Selection> | undefined,
         isEqual?: IsEqual<NoInfer<Selection>> | undefined,
@@ -93,7 +100,7 @@ export const useCell = <
     | [
         cell:
           | Cell<TData, TValue>
-          | CellValues<TData, TValue>
+          | CellSnapshot<TData, TValue>
           | CellCoords<TData, TValue>,
         selector?: Selector<TData, TValue, Selection> | undefined,
         isEqual?: IsEqual<NoInfer<Selection>> | undefined,
@@ -121,11 +128,15 @@ export const useCell = <
       }
 
   const getSelection = useCallback(
-    (table: Table<TData>) => selector(getCellValues(table, rowId, columnId)),
+    (table: Table<TData>) => selector(
+			getCellSnapshot<TData, TValue>(table, rowId, columnId),
+			getCell<TData, TValue>(table, rowId, columnId),
+			table
+		),
     [columnId, rowId, selector],
   )
 
-  return useTableWithSelector(table, getSelection, isEqual)
+  return useTableBase(table, getSelection, isEqual)
 }
 
 const cellHook = useCell
@@ -137,17 +148,17 @@ const cellHookʹ =
           table: Table<TData> | undefined,
           cell:
             | Cell<TData, TValue>
-            | CellValues<TData, TValue>
+            | CellSnapshot<TData, TValue>
             | CellCoords<TData, TValue>,
         ]
       | [
           cell:
             | Cell<TData, TValue>
-            | CellValues<TData, TValue>
+            | CellSnapshot<TData, TValue>
             | CellCoords<TData, TValue>,
         ]
   ) =>
-  <Selection = CellValues<TData, TValue>>(
+  <Selection = CellSnapshot<TData, TValue>>(
     selector?: Selector<TData, TValue, Selection> | undefined,
     isEqual?: IsEqual<NoInfer<Selection>> | undefined,
   ): Selection =>

package/src/hooks/useColumn.ts

@@ -16,16 +16,16 @@ import { invariant } from "../lib/invariant"
 
 import type { IsEqual, RunGetters } from "../types"
 
-import { useTableWithSelector } from "./useTableWithSelector"
+import { useTableBase } from "../lib/useTableBase"
 
-export interface ColumnValues<
+export interface ColumnSnapshot<
   TData extends RowData,
   TValue = unknown,
 > extends RunGetters<Column<TData, TValue>> {}
 
-const columnValuesCache = new WeakMap<
+const columnSnapshotCache = new WeakMap<
   RequiredKeys<TableOptionsResolved<any>, "state">,
-  Map<string, ColumnValues<any, any>>
+  Map<string, ColumnSnapshot<any, any>>
 >()
 
 const columnHandlersCache = new WeakMap<
@@ -43,24 +43,28 @@ const columnHandlersCache = new WeakMap<
   }
 >()
 
-const getColumnValues = <TData extends RowData, TValue = unknown>(
+const getColumn = <TData extends RowData, TValue = unknown>(table: Table<TData>, columnId: string) => {
+	const column = table.getColumn(columnId) as
+		| Column<TData, TValue>
+		| undefined
+	invariant(column)
+	return column
+}
+
+const getColumnSnapshot = <TData extends RowData, TValue = unknown>(
   table: Table<TData>,
   columnId: string,
-): ColumnValues<TData, TValue> => {
-  let columnCache = columnValuesCache.get(table.options)
+): ColumnSnapshot<TData, TValue> => {
+  let columnCache = columnSnapshotCache.get(table.options)
   if (!columnCache) {
     columnCache = new Map()
-    columnValuesCache.set(table.options, columnCache)
+    columnSnapshotCache.set(table.options, columnCache)
   }
 
   let cached = columnCache.get(columnId)
 
   if (!cached) {
-    const column = table.getColumn(columnId) as
-      | Column<TData, TValue>
-      | undefined
-
-    invariant(column)
+    const column = getColumn<TData, TValue>(table, columnId)
 
     let cachedHandlers = columnHandlersCache.get(column)
     if (!cachedHandlers) {
@@ -92,20 +96,22 @@ const getColumnValues = <TData extends RowData, TValue = unknown>(
 }
 
 type Selector<TData extends RowData, TValue, Selection> = (
-  table: ColumnValues<TData, TValue>,
+  columnSnapshot: ColumnSnapshot<TData, TValue>,
+	column: Column<TData, TValue>,
+	table: Table<TData>
 ) => Selection
 
 export const useColumn = <
   TData extends RowData,
   TValue = unknown,
-  Selection = ColumnValues<TData, TValue>,
+  Selection = ColumnSnapshot<TData, TValue>,
 >(
   ...args:
     | [
         table: Table<TData> | undefined,
         column:
           | Column<TData, TValue>
-          | ColumnValues<TData, TValue>
+          | ColumnSnapshot<TData, TValue>
           | { id: string }
           | string,
         selector?: Selector<TData, TValue, Selection> | undefined,
@@ -114,7 +120,7 @@ export const useColumn = <
     | [
         column:
           | Column<TData, TValue>
-          | ColumnValues<TData, TValue>
+          | ColumnSnapshot<TData, TValue>
           | { id: string }
           | string,
         selector?: Selector<TData, TValue, Selection> | undefined,
@@ -131,11 +137,15 @@ export const useColumn = <
   const columnId = typeof columnOrId === "string" ? columnOrId : columnOrId.id
 
   const getSelection = useCallback(
-    (table: Table<TData>) => selector(getColumnValues(table, columnId)),
+    (table: Table<TData>) => selector(
+			getColumnSnapshot<TData, TValue>(table, columnId),
+			getColumn<TData, TValue>(table, columnId),
+			table
+		),
     [columnId, selector],
   )
 
-  return useTableWithSelector(table, getSelection, isEqual)
+  return useTableBase(table, getSelection, isEqual)
 }
 
 const columnHook = useColumn
@@ -147,19 +157,19 @@ const columnHookʹ =
           table: Table<TData> | undefined,
           column:
             | Column<TData, TValue>
-            | ColumnValues<TData, TValue>
+            | ColumnSnapshot<TData, TValue>
             | { id: string }
             | string,
         ]
       | [
           column:
             | Column<TData, TValue>
-            | ColumnValues<TData, TValue>
+            | ColumnSnapshot<TData, TValue>
             | { id: string }
             | string,
         ]
   ) =>
-  <Selection = ColumnValues<TData, TValue>>(
+  <Selection = ColumnSnapshot<TData, TValue>>(
     selector?: Selector<TData, TValue, Selection> | undefined,
     isEqual?: IsEqual<NoInfer<Selection>> | undefined,
   ): Selection =>

package/src/hooks/useHeader.ts

@@ -16,15 +16,15 @@ import { invariant } from "../lib/invariant"
 
 import type { IsEqual, RunGetters } from "../types"
 
-import { useTableWithSelector } from "./useTableWithSelector"
+import { useTableBase } from "../lib/useTableBase"
 
-export interface HeaderValues<TData extends RowData, TValue> extends RunGetters<
+export interface HeaderSnapshot<TData extends RowData, TValue> extends RunGetters<
   Header<TData, TValue>
 > {}
 
-const headerValuesCache = new WeakMap<
+const headerSnapshotCache = new WeakMap<
   RequiredKeys<TableOptionsResolved<any>, "state">,
-  Map<string, HeaderValues<any, any>>
+  Map<string, HeaderSnapshot<any, any>>
 >()
 
 const headerHandlersCache = new WeakMap<
@@ -34,24 +34,28 @@ const headerHandlersCache = new WeakMap<
   }
 >()
 
-const getHeaderValues = <TData extends RowData, TValue>(
+const getHeader = <TData extends RowData, TValue>(table: Table<TData>, headerId: string) => {
+	const header = table.getFlatHeaders().find((h) => h.id === headerId) as
+		| Header<TData, TValue>
+		| undefined
+	invariant(header)
+	return header 
+}
+
+const getHeaderSnapshot = <TData extends RowData, TValue>(
   table: Table<TData>,
   headerId: string,
-): HeaderValues<TData, TValue> => {
-  let headerCache = headerValuesCache.get(table.options)
+): HeaderSnapshot<TData, TValue> => {
+  let headerCache = headerSnapshotCache.get(table.options)
   if (!headerCache) {
     headerCache = new Map()
-    headerValuesCache.set(table.options, headerCache)
+    headerSnapshotCache.set(table.options, headerCache)
   }
 
   let cached = headerCache.get(headerId)
 
   if (!cached) {
-    const header = table.getFlatHeaders().find((h) => h.id === headerId) as
-      | Header<TData, TValue>
-      | undefined
-
-    invariant(header)
+    const header = getHeader<TData, TValue>(table, headerId)
 
     let cachedHandlers = headerHandlersCache.get(header)
     if (!cachedHandlers) {
@@ -75,20 +79,22 @@ const getHeaderValues = <TData extends RowData, TValue>(
 }
 
 type Selector<TData extends RowData, TValue, Selection> = (
-  headerValues: HeaderValues<TData, TValue>,
+  headerSnapshot: HeaderSnapshot<TData, TValue>,
+	header: Header<TData, TValue>,
+	table: Table<TData>
 ) => Selection
 
 export const useHeader = <
   TData extends RowData,
   TValue,
-  Selection = HeaderValues<TData, TValue>,
+  Selection = HeaderSnapshot<TData, TValue>,
 >(
   ...args:
     | [
         table: Table<TData> | undefined,
         header:
           | Header<TData, TValue>
-          | HeaderValues<TData, TValue>
+          | HeaderSnapshot<TData, TValue>
           | { id: string }
           | string,
         selector?: Selector<TData, TValue, Selection> | undefined,
@@ -97,7 +103,7 @@ export const useHeader = <
     | [
         header:
           | Header<TData, TValue>
-          | HeaderValues<TData, TValue>
+          | HeaderSnapshot<TData, TValue>
           | { id: string }
           | string,
         selector?: Selector<TData, TValue, Selection> | undefined,
@@ -114,11 +120,15 @@ export const useHeader = <
   const headerId = typeof headerOrId === "string" ? headerOrId : headerOrId.id
 
   const getSelection = useCallback(
-    (table: Table<TData>) => selector(getHeaderValues(table, headerId)),
+    (table: Table<TData>) => selector(
+			getHeaderSnapshot<TData, TValue>(table, headerId),
+			getHeader<TData, TValue>(table, headerId),
+			table
+		),
     [headerId, selector],
   )
 
-  return useTableWithSelector(table, getSelection, isEqual)
+  return useTableBase(table, getSelection, isEqual)
 }
 
 const headerHook = useHeader
@@ -130,19 +140,19 @@ const headerHookʹ =
           table: Table<TData> | undefined,
           header:
             | Header<TData, TValue>
-            | HeaderValues<TData, TValue>
+            | HeaderSnapshot<TData, TValue>
             | { id: string }
             | string,
         ]
       | [
           header:
             | Header<TData, TValue>
-            | HeaderValues<TData, TValue>
+            | HeaderSnapshot<TData, TValue>
             | { id: string }
             | string,
         ]
   ) =>
-  <Selection = HeaderValues<TData, TValue>>(
+  <Selection = HeaderSnapshot<TData, TValue>>(
     selector?: Selector<TData, TValue, Selection> | undefined,
     isEqual?: IsEqual<NoInfer<Selection>> | undefined,
   ): Selection =>