@tanstack/preact-table 9.0.0-alpha.41 → 9.0.0-alpha.43

package/dist/reactivity.cjs

@@ -0,0 +1,20 @@
+let _tanstack_preact_store = require("@tanstack/preact-store");
+
+//#region src/reactivity.ts
+function preactReactivity() {
+	return {
+		createOptionsStore: false,
+		batch: _tanstack_preact_store.batch,
+		untrack: (fn) => fn(),
+		createReadonlyAtom: (fn, options) => {
+			return (0, _tanstack_preact_store.createAtom)(() => fn(), { compare: options === null || options === void 0 ? void 0 : options.compare });
+		},
+		createWritableAtom: (value, options) => {
+			return (0, _tanstack_preact_store.createAtom)(value, { compare: options === null || options === void 0 ? void 0 : options.compare });
+		}
+	};
+}
+
+//#endregion
+exports.preactReactivity = preactReactivity;
+//# sourceMappingURL=reactivity.cjs.map

package/dist/reactivity.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"reactivity.cjs","names":[],"sources":["../src/reactivity.ts"],"sourcesContent":["import { batch, createAtom } from '@tanstack/preact-store'\nimport type {\n  TableAtomOptions,\n  TableReactivityBindings,\n} from '@tanstack/table-core/reactivity'\n\nexport function preactReactivity(): TableReactivityBindings {\n  return {\n    createOptionsStore: false,\n    batch,\n    untrack: (fn) => fn(),\n    createReadonlyAtom: <T>(fn: () => T, options?: TableAtomOptions<T>) => {\n      return createAtom(() => fn(), {\n        compare: options?.compare,\n      })\n    },\n    createWritableAtom: <T>(value: T, options?: TableAtomOptions<T>) => {\n      return createAtom(value, {\n        compare: options?.compare,\n      })\n    },\n  }\n}\n\n// // TOTO - re-explore preact signals for reactivity\n// import { batch, computed, signal, untracked } from '@preact/signals'\n// import type {\n//   TableAtomOptions,\n//   TableReactivityBindings,\n// } from '@tanstack/table-core/reactivity'\n// import type { Atom, Observer, ReadonlyAtom } from '@tanstack/preact-store'\n\n// function observerToCallback<T>(\n//   observerOrNext: Observer<T> | ((value: T) => void),\n// ): (value: T) => void {\n//   return typeof observerOrNext === 'function'\n//     ? observerOrNext\n//     : (value) => observerOrNext.next?.(value)\n// }\n\n// function signalToReadonlyAtom<T>(source: {\n//   value: T\n//   subscribe: (observer: (value: T) => void) => () => void\n// }): ReadonlyAtom<T> {\n//   return Object.assign(source, {\n//     get: () => source.value,\n//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {\n//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))\n//       return { unsubscribe }\n//     }) as ReadonlyAtom<T>['subscribe'],\n//   })\n// }\n\n// function signalToWritableAtom<T>(source: {\n//   value: T\n//   subscribe: (observer: (value: T) => void) => () => void\n// }): Atom<T> {\n//   return Object.assign(source, {\n//     set: (updater: T | ((prevVal: T) => T)) => {\n//       source.value =\n//         typeof updater === 'function'\n//           ? (updater as (prevVal: T) => T)(source.value)\n//           : updater\n//     },\n//     get: () => source.value,\n//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {\n//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))\n//       return { unsubscribe }\n//     }) as Atom<T>['subscribe'],\n//   })\n// }\n\n// export function preactReactivity(): TableReactivityBindings {\n//   return {\n//     createReadonlyAtom: <T>(fn: () => T, _options?: TableAtomOptions<T>) => {\n//       return signalToReadonlyAtom(computed(fn))\n//     },\n//     createWritableAtom: <T>(\n//       value: T,\n//       _options?: TableAtomOptions<T>,\n//     ): Atom<T> => {\n//       return signalToWritableAtom(signal(value))\n//     },\n//     untrack: untracked,\n//     batch: batch,\n//   }\n// }\n"],"mappings":";;;AAMA,SAAgB,mBAA4C;AAC1D,QAAO;EACL,oBAAoB;EACpB;EACA,UAAU,OAAO,IAAI;EACrB,qBAAwB,IAAa,YAAkC;AACrE,uDAAwB,IAAI,EAAE,EAC5B,2DAAS,QAAS,SACnB,CAAC;;EAEJ,qBAAwB,OAAU,YAAkC;AAClE,iDAAkB,OAAO,EACvB,2DAAS,QAAS,SACnB,CAAC;;EAEL"}

package/dist/reactivity.js

@@ -0,0 +1,20 @@
+import { batch, createAtom } from "@tanstack/preact-store";
+
+//#region src/reactivity.ts
+function preactReactivity() {
+	return {
+		createOptionsStore: false,
+		batch,
+		untrack: (fn) => fn(),
+		createReadonlyAtom: (fn, options) => {
+			return createAtom(() => fn(), { compare: options === null || options === void 0 ? void 0 : options.compare });
+		},
+		createWritableAtom: (value, options) => {
+			return createAtom(value, { compare: options === null || options === void 0 ? void 0 : options.compare });
+		}
+	};
+}
+
+//#endregion
+export { preactReactivity };
+//# sourceMappingURL=reactivity.js.map

package/dist/reactivity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reactivity.js","names":[],"sources":["../src/reactivity.ts"],"sourcesContent":["import { batch, createAtom } from '@tanstack/preact-store'\nimport type {\n  TableAtomOptions,\n  TableReactivityBindings,\n} from '@tanstack/table-core/reactivity'\n\nexport function preactReactivity(): TableReactivityBindings {\n  return {\n    createOptionsStore: false,\n    batch,\n    untrack: (fn) => fn(),\n    createReadonlyAtom: <T>(fn: () => T, options?: TableAtomOptions<T>) => {\n      return createAtom(() => fn(), {\n        compare: options?.compare,\n      })\n    },\n    createWritableAtom: <T>(value: T, options?: TableAtomOptions<T>) => {\n      return createAtom(value, {\n        compare: options?.compare,\n      })\n    },\n  }\n}\n\n// // TOTO - re-explore preact signals for reactivity\n// import { batch, computed, signal, untracked } from '@preact/signals'\n// import type {\n//   TableAtomOptions,\n//   TableReactivityBindings,\n// } from '@tanstack/table-core/reactivity'\n// import type { Atom, Observer, ReadonlyAtom } from '@tanstack/preact-store'\n\n// function observerToCallback<T>(\n//   observerOrNext: Observer<T> | ((value: T) => void),\n// ): (value: T) => void {\n//   return typeof observerOrNext === 'function'\n//     ? observerOrNext\n//     : (value) => observerOrNext.next?.(value)\n// }\n\n// function signalToReadonlyAtom<T>(source: {\n//   value: T\n//   subscribe: (observer: (value: T) => void) => () => void\n// }): ReadonlyAtom<T> {\n//   return Object.assign(source, {\n//     get: () => source.value,\n//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {\n//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))\n//       return { unsubscribe }\n//     }) as ReadonlyAtom<T>['subscribe'],\n//   })\n// }\n\n// function signalToWritableAtom<T>(source: {\n//   value: T\n//   subscribe: (observer: (value: T) => void) => () => void\n// }): Atom<T> {\n//   return Object.assign(source, {\n//     set: (updater: T | ((prevVal: T) => T)) => {\n//       source.value =\n//         typeof updater === 'function'\n//           ? (updater as (prevVal: T) => T)(source.value)\n//           : updater\n//     },\n//     get: () => source.value,\n//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {\n//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))\n//       return { unsubscribe }\n//     }) as Atom<T>['subscribe'],\n//   })\n// }\n\n// export function preactReactivity(): TableReactivityBindings {\n//   return {\n//     createReadonlyAtom: <T>(fn: () => T, _options?: TableAtomOptions<T>) => {\n//       return signalToReadonlyAtom(computed(fn))\n//     },\n//     createWritableAtom: <T>(\n//       value: T,\n//       _options?: TableAtomOptions<T>,\n//     ): Atom<T> => {\n//       return signalToWritableAtom(signal(value))\n//     },\n//     untrack: untracked,\n//     batch: batch,\n//   }\n// }\n"],"mappings":";;;AAMA,SAAgB,mBAA4C;AAC1D,QAAO;EACL,oBAAoB;EACpB;EACA,UAAU,OAAO,IAAI;EACrB,qBAAwB,IAAa,YAAkC;AACrE,UAAO,iBAAiB,IAAI,EAAE,EAC5B,2DAAS,QAAS,SACnB,CAAC;;EAEJ,qBAAwB,OAAU,YAAkC;AAClE,UAAO,WAAW,OAAO,EACvB,2DAAS,QAAS,SACnB,CAAC;;EAEL"}

package/dist/useTable.cjs

@@ -1,5 +1,6 @@
 const require_FlexRender = require('./FlexRender.cjs');
 const require_Subscribe = require('./Subscribe.cjs');
+const require_reactivity = require('./reactivity.cjs');
 let _tanstack_table_core = require("@tanstack/table-core");
 let _tanstack_preact_store = require("@tanstack/preact-store");
 let preact_hooks = require("preact/hooks");
@@ -7,7 +8,13 @@ let preact_hooks = require("preact/hooks");
 //#region src/useTable.ts
 function useTable(tableOptions, selector = () => ({})) {
 	const [table] = (0, preact_hooks.useState)(() => {
-		const tableInstance = (0, _tanstack_table_core.constructTable)(tableOptions);
+		const tableInstance = (0, _tanstack_table_core.constructTable)({
+			...tableOptions,
+			_features: {
+				coreReativityFeature: require_reactivity.preactReactivity(),
+				...tableOptions._features
+			}
+		});
 		tableInstance.Subscribe = ((props) => {
 			return require_Subscribe.Subscribe({
 				...props,
@@ -21,16 +28,16 @@ function useTable(tableOptions, selector = () => ({})) {
 		...prev,
 		...tableOptions
 	}));
-	const selectorWithDataAndColumns = (state) => ({
-		columns: tableOptions.columns,
-		data: tableOptions.data,
-		...selector(state)
-	});
-	const state = (0, _tanstack_preact_store.useSelector)(table.store, selectorWithDataAndColumns, { compare: _tanstack_preact_store.shallow });
+	const state = (0, _tanstack_preact_store.useSelector)(table.store, selector, { compare: _tanstack_preact_store.shallow });
 	return (0, preact_hooks.useMemo)(() => ({
 		...table,
+		options: tableOptions,
+		state
+	}), [
+		table,
+		tableOptions,
 		state
-	}), [state, table]);
+	]);
 }
 
 //#endregion

package/dist/useTable.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.cjs","names":["Subscribe","FlexRender","shallow"],"sources":["../src/useTable.ts"],"sourcesContent":["import { useMemo, useState } from 'preact/hooks'\nimport { constructTable } from '@tanstack/table-core'\nimport { shallow, useSelector } from '@tanstack/preact-store'\nimport { FlexRender } from './FlexRender'\nimport { Subscribe } from './Subscribe'\nimport type {\n  CellData,\n  RowData,\n  Table,\n  TableFeatures,\n  TableOptions,\n  TableState,\n} from '@tanstack/table-core'\nimport type { Atom, ReadonlyAtom } from '@tanstack/preact-store'\nimport type { ComponentChildren } from 'preact'\nimport type { FlexRenderProps } from './FlexRender'\nimport type { SubscribePropsWithStore } from './Subscribe'\n\nexport type PreactTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n> = Table<TFeatures, TData> & {\n  /**\n   * A Preact HOC (Higher Order Component) that allows you to subscribe to the table state.\n   *\n   * Pass `source` to subscribe to a single atom or store (e.g. `table.atoms.rowSelection`\n   * or `table.optionsStore`) instead of the full `table.store`.\n   *\n   * @example\n   * <table.Subscribe selector={(state) => ({ rowSelection: state.rowSelection })}>\n   *   {({ rowSelection }) => (\n   *     <tr key={row.id}>...</tr>\n   *   )}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection}>\n   *   {(rowSelection) => <div>...</div>}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection} selector={(s) => s?.[row.id]}>\n   *   {() => <tr key={row.id}>...</tr>}\n   * </table.Subscribe>\n   */\n  /**\n   * Overloads (source first, then store) so JSX contextual typing works for both modes.\n   * Source without `selector` is separate so children infer `TSourceValue` (identity projection).\n   */\n  Subscribe: {\n    <TSourceValue>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector?: undefined\n      children: ((state: TSourceValue) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSourceValue, TSubSelected>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector: (state: TSourceValue) => TSubSelected\n      children: ((state: TSubSelected) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSubSelected>(\n      props: Omit<\n        SubscribePropsWithStore<TFeatures, TData, TSubSelected>,\n        'table'\n      >,\n    ): ComponentChildren\n  }\n  /**\n   * A Preact component that renders headers, cells, or footers with custom markup.\n   * Use this utility component instead of manually calling flexRender.\n   */\n  FlexRender: <TValue extends CellData = CellData>(\n    props: FlexRenderProps<TFeatures, TData, TValue>,\n  ) => ComponentChildren\n  /**\n   * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.\n   */\n  readonly state: Readonly<TSelected> & {\n    columns: TableOptions<TFeatures, TData>['columns']\n    data: TableOptions<TFeatures, TData>['data']\n  }\n}\n\nexport function useTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n>(\n  tableOptions: TableOptions<TFeatures, TData>,\n  selector: (state: TableState<TFeatures>) => TSelected = () =>\n    ({}) as TSelected,\n): PreactTable<TFeatures, TData, TSelected> {\n  const [table] = useState(() => {\n    const tableInstance = constructTable(tableOptions) as PreactTable<\n      TFeatures,\n      TData,\n      TSelected\n    >\n\n    tableInstance.Subscribe = ((props: any) => {\n      return Subscribe({\n        ...props,\n        table: tableInstance,\n      })\n    }) as PreactTable<TFeatures, TData, TSelected>['Subscribe']\n\n    tableInstance.FlexRender = FlexRender\n\n    return tableInstance\n  })\n\n  // sync table options on every render\n  table.setOptions((prev) => ({\n    ...prev,\n    ...tableOptions,\n  }))\n\n  const selectorWithDataAndColumns = (state: TableState<TFeatures>) => ({\n    columns: tableOptions.columns,\n    data: tableOptions.data,\n    ...selector(state),\n  })\n\n  const state = useSelector(table.store, selectorWithDataAndColumns, {\n    compare: shallow,\n  })\n\n  return useMemo(\n    () => ({\n      ...table,\n      state,\n    }),\n    [state, table],\n  ) as PreactTable<TFeatures, TData, TSelected>\n}\n"],"mappings":";;;;;;;AAoFA,SAAgB,SAKd,cACA,kBACG,EAAE,GACqC;CAC1C,MAAM,CAAC,0CAAwB;EAC7B,MAAM,yDAA+B,aAAa;AAMlD,gBAAc,cAAc,UAAe;AACzC,UAAOA,4BAAU;IACf,GAAG;IACH,OAAO;IACR,CAAC;;AAGJ,gBAAc,aAAaC;AAE3B,SAAO;GACP;AAGF,OAAM,YAAY,UAAU;EAC1B,GAAG;EACH,GAAG;EACJ,EAAE;CAEH,MAAM,8BAA8B,WAAkC;EACpE,SAAS,aAAa;EACtB,MAAM,aAAa;EACnB,GAAG,SAAS,MAAM;EACnB;CAED,MAAM,gDAAoB,MAAM,OAAO,4BAA4B,EACjE,SAASC,gCACV,CAAC;AAEF,yCACS;EACL,GAAG;EACH;EACD,GACD,CAAC,OAAO,MAAM,CACf"}
+{"version":3,"file":"useTable.cjs","names":["preactReactivity","Subscribe","FlexRender","shallow"],"sources":["../src/useTable.ts"],"sourcesContent":["import { useMemo, useState } from 'preact/hooks'\nimport { constructTable } from '@tanstack/table-core'\nimport { shallow, useSelector } from '@tanstack/preact-store'\nimport { preactReactivity } from './reactivity'\nimport { FlexRender } from './FlexRender'\nimport { Subscribe } from './Subscribe'\nimport type {\n  CellData,\n  RowData,\n  Table,\n  TableFeatures,\n  TableOptions,\n  TableState,\n} from '@tanstack/table-core'\nimport type { Atom, ReadonlyAtom } from '@tanstack/preact-store'\nimport type { ComponentChildren } from 'preact'\nimport type { FlexRenderProps } from './FlexRender'\nimport type { SubscribePropsWithStore } from './Subscribe'\n\nexport type PreactTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n> = Table<TFeatures, TData> & {\n  /**\n   * A Preact HOC (Higher Order Component) that allows you to subscribe to the table state.\n   *\n   * Pass `source` to subscribe to a single atom or store (e.g. `table.atoms.rowSelection`\n   * or `table.optionsStore`) instead of the full `table.store`.\n   *\n   * @example\n   * <table.Subscribe selector={(state) => ({ rowSelection: state.rowSelection })}>\n   *   {({ rowSelection }) => (\n   *     <tr key={row.id}>...</tr>\n   *   )}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection}>\n   *   {(rowSelection) => <div>...</div>}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection} selector={(s) => s?.[row.id]}>\n   *   {() => <tr key={row.id}>...</tr>}\n   * </table.Subscribe>\n   */\n  /**\n   * Overloads (source first, then store) so JSX contextual typing works for both modes.\n   * Source without `selector` is separate so children infer `TSourceValue` (identity projection).\n   */\n  Subscribe: {\n    <TSourceValue>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector?: undefined\n      children: ((state: TSourceValue) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSourceValue, TSubSelected>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector: (state: TSourceValue) => TSubSelected\n      children: ((state: TSubSelected) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSubSelected>(\n      props: Omit<\n        SubscribePropsWithStore<TFeatures, TData, TSubSelected>,\n        'table'\n      >,\n    ): ComponentChildren\n  }\n  /**\n   * A Preact component that renders headers, cells, or footers with custom markup.\n   * Use this utility component instead of manually calling flexRender.\n   */\n  FlexRender: <TValue extends CellData = CellData>(\n    props: FlexRenderProps<TFeatures, TData, TValue>,\n  ) => ComponentChildren\n  /**\n   * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.\n   */\n  readonly state: Readonly<TSelected>\n}\n\nexport function useTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n>(\n  tableOptions: TableOptions<TFeatures, TData>,\n  selector: (state: TableState<TFeatures>) => TSelected = () =>\n    ({}) as TSelected,\n): PreactTable<TFeatures, TData, TSelected> {\n  const [table] = useState(() => {\n    const tableInstance = constructTable({\n      ...tableOptions,\n      _features: {\n        coreReativityFeature: preactReactivity(),\n        ...tableOptions._features,\n      },\n    }) as PreactTable<TFeatures, TData, TSelected>\n\n    tableInstance.Subscribe = ((props: any) => {\n      return Subscribe({\n        ...props,\n        table: tableInstance,\n      })\n    }) as PreactTable<TFeatures, TData, TSelected>['Subscribe']\n\n    tableInstance.FlexRender = FlexRender\n\n    return tableInstance\n  })\n\n  // sync options on every render\n  table.setOptions((prev) => ({\n    ...prev,\n    ...tableOptions,\n  }))\n\n  const state = useSelector(table.store, selector, { compare: shallow })\n\n  return useMemo(\n    () => ({\n      ...table,\n      options: tableOptions,\n      state,\n    }),\n    [table, tableOptions, state],\n  )\n}\n"],"mappings":";;;;;;;;AAkFA,SAAgB,SAKd,cACA,kBACG,EAAE,GACqC;CAC1C,MAAM,CAAC,0CAAwB;EAC7B,MAAM,yDAA+B;GACnC,GAAG;GACH,WAAW;IACT,sBAAsBA,qCAAkB;IACxC,GAAG,aAAa;IACjB;GACF,CAAC;AAEF,gBAAc,cAAc,UAAe;AACzC,UAAOC,4BAAU;IACf,GAAG;IACH,OAAO;IACR,CAAC;;AAGJ,gBAAc,aAAaC;AAE3B,SAAO;GACP;AAGF,OAAM,YAAY,UAAU;EAC1B,GAAG;EACH,GAAG;EACJ,EAAE;CAEH,MAAM,gDAAoB,MAAM,OAAO,UAAU,EAAE,SAASC,gCAAS,CAAC;AAEtE,yCACS;EACL,GAAG;EACH,SAAS;EACT;EACD,GACD;EAAC;EAAO;EAAc;EAAM,CAC7B"}

package/dist/useTable.d.cts

@@ -54,10 +54,7 @@ type PreactTable<TFeatures extends TableFeatures, TData extends RowData, TSelect
   /**
    * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.
    */
-  readonly state: Readonly<TSelected> & {
-    columns: TableOptions<TFeatures, TData>['columns'];
-    data: TableOptions<TFeatures, TData>['data'];
-  };
+  readonly state: Readonly<TSelected>;
 };
 declare function useTable<TFeatures extends TableFeatures, TData extends RowData, TSelected = {}>(tableOptions: TableOptions<TFeatures, TData>, selector?: (state: TableState<TFeatures>) => TSelected): PreactTable<TFeatures, TData, TSelected>;
 //#endregion

package/dist/useTable.d.ts

@@ -54,10 +54,7 @@ type PreactTable<TFeatures extends TableFeatures, TData extends RowData, TSelect
   /**
    * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.
    */
-  readonly state: Readonly<TSelected> & {
-    columns: TableOptions<TFeatures, TData>['columns'];
-    data: TableOptions<TFeatures, TData>['data'];
-  };
+  readonly state: Readonly<TSelected>;
 };
 declare function useTable<TFeatures extends TableFeatures, TData extends RowData, TSelected = {}>(tableOptions: TableOptions<TFeatures, TData>, selector?: (state: TableState<TFeatures>) => TSelected): PreactTable<TFeatures, TData, TSelected>;
 //#endregion

package/dist/useTable.js

@@ -1,5 +1,6 @@
 import { FlexRender } from "./FlexRender.js";
 import { Subscribe } from "./Subscribe.js";
+import { preactReactivity } from "./reactivity.js";
 import { constructTable } from "@tanstack/table-core";
 import { shallow, useSelector } from "@tanstack/preact-store";
 import { useMemo, useState } from "preact/hooks";
@@ -7,7 +8,13 @@ import { useMemo, useState } from "preact/hooks";
 //#region src/useTable.ts
 function useTable(tableOptions, selector = () => ({})) {
 	const [table] = useState(() => {
-		const tableInstance = constructTable(tableOptions);
+		const tableInstance = constructTable({
+			...tableOptions,
+			_features: {
+				coreReativityFeature: preactReactivity(),
+				...tableOptions._features
+			}
+		});
 		tableInstance.Subscribe = ((props) => {
 			return Subscribe({
 				...props,
@@ -21,16 +28,16 @@ function useTable(tableOptions, selector = () => ({})) {
 		...prev,
 		...tableOptions
 	}));
-	const selectorWithDataAndColumns = (state) => ({
-		columns: tableOptions.columns,
-		data: tableOptions.data,
-		...selector(state)
-	});
-	const state = useSelector(table.store, selectorWithDataAndColumns, { compare: shallow });
+	const state = useSelector(table.store, selector, { compare: shallow });
 	return useMemo(() => ({
 		...table,
+		options: tableOptions,
+		state
+	}), [
+		table,
+		tableOptions,
 		state
-	}), [state, table]);
+	]);
 }
 
 //#endregion

package/dist/useTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTable.js","names":[],"sources":["../src/useTable.ts"],"sourcesContent":["import { useMemo, useState } from 'preact/hooks'\nimport { constructTable } from '@tanstack/table-core'\nimport { shallow, useSelector } from '@tanstack/preact-store'\nimport { FlexRender } from './FlexRender'\nimport { Subscribe } from './Subscribe'\nimport type {\n  CellData,\n  RowData,\n  Table,\n  TableFeatures,\n  TableOptions,\n  TableState,\n} from '@tanstack/table-core'\nimport type { Atom, ReadonlyAtom } from '@tanstack/preact-store'\nimport type { ComponentChildren } from 'preact'\nimport type { FlexRenderProps } from './FlexRender'\nimport type { SubscribePropsWithStore } from './Subscribe'\n\nexport type PreactTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n> = Table<TFeatures, TData> & {\n  /**\n   * A Preact HOC (Higher Order Component) that allows you to subscribe to the table state.\n   *\n   * Pass `source` to subscribe to a single atom or store (e.g. `table.atoms.rowSelection`\n   * or `table.optionsStore`) instead of the full `table.store`.\n   *\n   * @example\n   * <table.Subscribe selector={(state) => ({ rowSelection: state.rowSelection })}>\n   *   {({ rowSelection }) => (\n   *     <tr key={row.id}>...</tr>\n   *   )}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection}>\n   *   {(rowSelection) => <div>...</div>}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection} selector={(s) => s?.[row.id]}>\n   *   {() => <tr key={row.id}>...</tr>}\n   * </table.Subscribe>\n   */\n  /**\n   * Overloads (source first, then store) so JSX contextual typing works for both modes.\n   * Source without `selector` is separate so children infer `TSourceValue` (identity projection).\n   */\n  Subscribe: {\n    <TSourceValue>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector?: undefined\n      children: ((state: TSourceValue) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSourceValue, TSubSelected>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector: (state: TSourceValue) => TSubSelected\n      children: ((state: TSubSelected) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSubSelected>(\n      props: Omit<\n        SubscribePropsWithStore<TFeatures, TData, TSubSelected>,\n        'table'\n      >,\n    ): ComponentChildren\n  }\n  /**\n   * A Preact component that renders headers, cells, or footers with custom markup.\n   * Use this utility component instead of manually calling flexRender.\n   */\n  FlexRender: <TValue extends CellData = CellData>(\n    props: FlexRenderProps<TFeatures, TData, TValue>,\n  ) => ComponentChildren\n  /**\n   * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.\n   */\n  readonly state: Readonly<TSelected> & {\n    columns: TableOptions<TFeatures, TData>['columns']\n    data: TableOptions<TFeatures, TData>['data']\n  }\n}\n\nexport function useTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n>(\n  tableOptions: TableOptions<TFeatures, TData>,\n  selector: (state: TableState<TFeatures>) => TSelected = () =>\n    ({}) as TSelected,\n): PreactTable<TFeatures, TData, TSelected> {\n  const [table] = useState(() => {\n    const tableInstance = constructTable(tableOptions) as PreactTable<\n      TFeatures,\n      TData,\n      TSelected\n    >\n\n    tableInstance.Subscribe = ((props: any) => {\n      return Subscribe({\n        ...props,\n        table: tableInstance,\n      })\n    }) as PreactTable<TFeatures, TData, TSelected>['Subscribe']\n\n    tableInstance.FlexRender = FlexRender\n\n    return tableInstance\n  })\n\n  // sync table options on every render\n  table.setOptions((prev) => ({\n    ...prev,\n    ...tableOptions,\n  }))\n\n  const selectorWithDataAndColumns = (state: TableState<TFeatures>) => ({\n    columns: tableOptions.columns,\n    data: tableOptions.data,\n    ...selector(state),\n  })\n\n  const state = useSelector(table.store, selectorWithDataAndColumns, {\n    compare: shallow,\n  })\n\n  return useMemo(\n    () => ({\n      ...table,\n      state,\n    }),\n    [state, table],\n  ) as PreactTable<TFeatures, TData, TSelected>\n}\n"],"mappings":";;;;;;;AAoFA,SAAgB,SAKd,cACA,kBACG,EAAE,GACqC;CAC1C,MAAM,CAAC,SAAS,eAAe;EAC7B,MAAM,gBAAgB,eAAe,aAAa;AAMlD,gBAAc,cAAc,UAAe;AACzC,UAAO,UAAU;IACf,GAAG;IACH,OAAO;IACR,CAAC;;AAGJ,gBAAc,aAAa;AAE3B,SAAO;GACP;AAGF,OAAM,YAAY,UAAU;EAC1B,GAAG;EACH,GAAG;EACJ,EAAE;CAEH,MAAM,8BAA8B,WAAkC;EACpE,SAAS,aAAa;EACtB,MAAM,aAAa;EACnB,GAAG,SAAS,MAAM;EACnB;CAED,MAAM,QAAQ,YAAY,MAAM,OAAO,4BAA4B,EACjE,SAAS,SACV,CAAC;AAEF,QAAO,eACE;EACL,GAAG;EACH;EACD,GACD,CAAC,OAAO,MAAM,CACf"}
+{"version":3,"file":"useTable.js","names":[],"sources":["../src/useTable.ts"],"sourcesContent":["import { useMemo, useState } from 'preact/hooks'\nimport { constructTable } from '@tanstack/table-core'\nimport { shallow, useSelector } from '@tanstack/preact-store'\nimport { preactReactivity } from './reactivity'\nimport { FlexRender } from './FlexRender'\nimport { Subscribe } from './Subscribe'\nimport type {\n  CellData,\n  RowData,\n  Table,\n  TableFeatures,\n  TableOptions,\n  TableState,\n} from '@tanstack/table-core'\nimport type { Atom, ReadonlyAtom } from '@tanstack/preact-store'\nimport type { ComponentChildren } from 'preact'\nimport type { FlexRenderProps } from './FlexRender'\nimport type { SubscribePropsWithStore } from './Subscribe'\n\nexport type PreactTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n> = Table<TFeatures, TData> & {\n  /**\n   * A Preact HOC (Higher Order Component) that allows you to subscribe to the table state.\n   *\n   * Pass `source` to subscribe to a single atom or store (e.g. `table.atoms.rowSelection`\n   * or `table.optionsStore`) instead of the full `table.store`.\n   *\n   * @example\n   * <table.Subscribe selector={(state) => ({ rowSelection: state.rowSelection })}>\n   *   {({ rowSelection }) => (\n   *     <tr key={row.id}>...</tr>\n   *   )}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection}>\n   *   {(rowSelection) => <div>...</div>}\n   * </table.Subscribe>\n   *\n   * @example\n   * <table.Subscribe source={table.atoms.rowSelection} selector={(s) => s?.[row.id]}>\n   *   {() => <tr key={row.id}>...</tr>}\n   * </table.Subscribe>\n   */\n  /**\n   * Overloads (source first, then store) so JSX contextual typing works for both modes.\n   * Source without `selector` is separate so children infer `TSourceValue` (identity projection).\n   */\n  Subscribe: {\n    <TSourceValue>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector?: undefined\n      children: ((state: TSourceValue) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSourceValue, TSubSelected>(props: {\n      source: Atom<TSourceValue> | ReadonlyAtom<TSourceValue>\n      selector: (state: TSourceValue) => TSubSelected\n      children: ((state: TSubSelected) => ComponentChildren) | ComponentChildren\n    }): ComponentChildren\n    <TSubSelected>(\n      props: Omit<\n        SubscribePropsWithStore<TFeatures, TData, TSubSelected>,\n        'table'\n      >,\n    ): ComponentChildren\n  }\n  /**\n   * A Preact component that renders headers, cells, or footers with custom markup.\n   * Use this utility component instead of manually calling flexRender.\n   */\n  FlexRender: <TValue extends CellData = CellData>(\n    props: FlexRenderProps<TFeatures, TData, TValue>,\n  ) => ComponentChildren\n  /**\n   * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.\n   */\n  readonly state: Readonly<TSelected>\n}\n\nexport function useTable<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TSelected = {},\n>(\n  tableOptions: TableOptions<TFeatures, TData>,\n  selector: (state: TableState<TFeatures>) => TSelected = () =>\n    ({}) as TSelected,\n): PreactTable<TFeatures, TData, TSelected> {\n  const [table] = useState(() => {\n    const tableInstance = constructTable({\n      ...tableOptions,\n      _features: {\n        coreReativityFeature: preactReactivity(),\n        ...tableOptions._features,\n      },\n    }) as PreactTable<TFeatures, TData, TSelected>\n\n    tableInstance.Subscribe = ((props: any) => {\n      return Subscribe({\n        ...props,\n        table: tableInstance,\n      })\n    }) as PreactTable<TFeatures, TData, TSelected>['Subscribe']\n\n    tableInstance.FlexRender = FlexRender\n\n    return tableInstance\n  })\n\n  // sync options on every render\n  table.setOptions((prev) => ({\n    ...prev,\n    ...tableOptions,\n  }))\n\n  const state = useSelector(table.store, selector, { compare: shallow })\n\n  return useMemo(\n    () => ({\n      ...table,\n      options: tableOptions,\n      state,\n    }),\n    [table, tableOptions, state],\n  )\n}\n"],"mappings":";;;;;;;;AAkFA,SAAgB,SAKd,cACA,kBACG,EAAE,GACqC;CAC1C,MAAM,CAAC,SAAS,eAAe;EAC7B,MAAM,gBAAgB,eAAe;GACnC,GAAG;GACH,WAAW;IACT,sBAAsB,kBAAkB;IACxC,GAAG,aAAa;IACjB;GACF,CAAC;AAEF,gBAAc,cAAc,UAAe;AACzC,UAAO,UAAU;IACf,GAAG;IACH,OAAO;IACR,CAAC;;AAGJ,gBAAc,aAAa;AAE3B,SAAO;GACP;AAGF,OAAM,YAAY,UAAU;EAC1B,GAAG;EACH,GAAG;EACJ,EAAE;CAEH,MAAM,QAAQ,YAAY,MAAM,OAAO,UAAU,EAAE,SAAS,SAAS,CAAC;AAEtE,QAAO,eACE;EACL,GAAG;EACH,SAAS;EACT;EACD,GACD;EAAC;EAAO;EAAc;EAAM,CAC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/preact-table",
-  "version": "9.0.0-alpha.41",
+  "version": "9.0.0-alpha.43",
   "description": "Headless UI for building powerful tables & datagrids for Preact.",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@tanstack/preact-store": "^0.13.0",
-    "@tanstack/table-core": "9.0.0-alpha.41"
+    "@tanstack/table-core": "9.0.0-alpha.43"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.10.5",

package/src/reactivity.ts

@@ -0,0 +1,87 @@
+import { batch, createAtom } from '@tanstack/preact-store'
+import type {
+  TableAtomOptions,
+  TableReactivityBindings,
+} from '@tanstack/table-core/reactivity'
+
+export function preactReactivity(): TableReactivityBindings {
+  return {
+    createOptionsStore: false,
+    batch,
+    untrack: (fn) => fn(),
+    createReadonlyAtom: <T>(fn: () => T, options?: TableAtomOptions<T>) => {
+      return createAtom(() => fn(), {
+        compare: options?.compare,
+      })
+    },
+    createWritableAtom: <T>(value: T, options?: TableAtomOptions<T>) => {
+      return createAtom(value, {
+        compare: options?.compare,
+      })
+    },
+  }
+}
+
+// // TOTO - re-explore preact signals for reactivity
+// import { batch, computed, signal, untracked } from '@preact/signals'
+// import type {
+//   TableAtomOptions,
+//   TableReactivityBindings,
+// } from '@tanstack/table-core/reactivity'
+// import type { Atom, Observer, ReadonlyAtom } from '@tanstack/preact-store'
+
+// function observerToCallback<T>(
+//   observerOrNext: Observer<T> | ((value: T) => void),
+// ): (value: T) => void {
+//   return typeof observerOrNext === 'function'
+//     ? observerOrNext
+//     : (value) => observerOrNext.next?.(value)
+// }
+
+// function signalToReadonlyAtom<T>(source: {
+//   value: T
+//   subscribe: (observer: (value: T) => void) => () => void
+// }): ReadonlyAtom<T> {
+//   return Object.assign(source, {
+//     get: () => source.value,
+//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {
+//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))
+//       return { unsubscribe }
+//     }) as ReadonlyAtom<T>['subscribe'],
+//   })
+// }
+
+// function signalToWritableAtom<T>(source: {
+//   value: T
+//   subscribe: (observer: (value: T) => void) => () => void
+// }): Atom<T> {
+//   return Object.assign(source, {
+//     set: (updater: T | ((prevVal: T) => T)) => {
+//       source.value =
+//         typeof updater === 'function'
+//           ? (updater as (prevVal: T) => T)(source.value)
+//           : updater
+//     },
+//     get: () => source.value,
+//     subscribe: ((observerOrNext: Observer<T> | ((value: T) => void)) => {
+//       const unsubscribe = source.subscribe(observerToCallback(observerOrNext))
+//       return { unsubscribe }
+//     }) as Atom<T>['subscribe'],
+//   })
+// }
+
+// export function preactReactivity(): TableReactivityBindings {
+//   return {
+//     createReadonlyAtom: <T>(fn: () => T, _options?: TableAtomOptions<T>) => {
+//       return signalToReadonlyAtom(computed(fn))
+//     },
+//     createWritableAtom: <T>(
+//       value: T,
+//       _options?: TableAtomOptions<T>,
+//     ): Atom<T> => {
+//       return signalToWritableAtom(signal(value))
+//     },
+//     untrack: untracked,
+//     batch: batch,
+//   }
+// }

package/src/useTable.ts

@@ -1,6 +1,7 @@
 import { useMemo, useState } from 'preact/hooks'
 import { constructTable } from '@tanstack/table-core'
 import { shallow, useSelector } from '@tanstack/preact-store'
+import { preactReactivity } from './reactivity'
 import { FlexRender } from './FlexRender'
 import { Subscribe } from './Subscribe'
 import type {
@@ -76,10 +77,7 @@ export type PreactTable<
   /**
    * The selected state of the table. This state may not match the structure of `table.store.state` because it is selected by the `selector` function that you pass as the 2nd argument to `useTable`.
    */
-  readonly state: Readonly<TSelected> & {
-    columns: TableOptions<TFeatures, TData>['columns']
-    data: TableOptions<TFeatures, TData>['data']
-  }
+  readonly state: Readonly<TSelected>
 }
 
 export function useTable<
@@ -92,11 +90,13 @@ export function useTable<
     ({}) as TSelected,
 ): PreactTable<TFeatures, TData, TSelected> {
   const [table] = useState(() => {
-    const tableInstance = constructTable(tableOptions) as PreactTable<
-      TFeatures,
-      TData,
-      TSelected
-    >
+    const tableInstance = constructTable({
+      ...tableOptions,
+      _features: {
+        coreReativityFeature: preactReactivity(),
+        ...tableOptions._features,
+      },
+    }) as PreactTable<TFeatures, TData, TSelected>
 
     tableInstance.Subscribe = ((props: any) => {
       return Subscribe({
@@ -110,27 +110,20 @@ export function useTable<
     return tableInstance
   })
 
-  // sync table options on every render
+  // sync options on every render
   table.setOptions((prev) => ({
     ...prev,
     ...tableOptions,
   }))
 
-  const selectorWithDataAndColumns = (state: TableState<TFeatures>) => ({
-    columns: tableOptions.columns,
-    data: tableOptions.data,
-    ...selector(state),
-  })
-
-  const state = useSelector(table.store, selectorWithDataAndColumns, {
-    compare: shallow,
-  })
+  const state = useSelector(table.store, selector, { compare: shallow })
 
   return useMemo(
     () => ({
       ...table,
+      options: tableOptions,
       state,
     }),
-    [state, table],
-  ) as PreactTable<TFeatures, TData, TSelected>
+    [table, tableOptions, state],
+  )
 }