intable 0.0.58 → 0.0.59

package/dist/plugins/RowGroupPlugin.js

@@ -1,8 +1,7 @@
 import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import chevron_right_default from "../chevron-right.js";
-import { Ctx } from "../index.js";
 import { createComponent, delegateEvents, effect, insert, memo, style, template } from "solid-js/web";
-import { batch, createMemo, useContext } from "solid-js";
+import { batch, createMemo } from "solid-js";
 import { groupBy, zipObject } from "es-toolkit";
 import { findLast } from "es-toolkit/compat";
 var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center\">"), pathKey = (e) => e.join("\0");
@@ -11,79 +10,79 @@ const RowGroupPlugin = {
 	priority: -Infinity,
 	store: (e) => ({ rowGroup: {
 		expandKeys: {},
-		isExpand: (l) => !!e.rowGroup.expandKeys[pathKey(l[GROUP].path)],
-		expand: (l, u) => batch(() => u ? l[GROUP].path2.forEach((l) => {
-			e.rowGroup.expandKeys[pathKey(l[GROUP].path)] = !0;
-		}) : e.rowGroup.expandKeys[pathKey(l[GROUP].path)] = !0),
-		toggleExpand: (l) => {
-			let u = pathKey(l[GROUP].path);
-			e.rowGroup.expandKeys[u] ? delete e.rowGroup.expandKeys[u] : e.rowGroup.expandKeys[u] = !0;
+		isExpand: (c) => !!e.rowGroup.expandKeys[pathKey(c[GROUP].path)],
+		expand: (c, l) => batch(() => l ? c[GROUP].path2.forEach((c) => {
+			e.rowGroup.expandKeys[pathKey(c[GROUP].path)] = !0;
+		}) : e.rowGroup.expandKeys[pathKey(c[GROUP].path)] = !0),
+		toggleExpand: (c) => {
+			let l = pathKey(c[GROUP].path);
+			e.rowGroup.expandKeys[l] ? delete e.rowGroup.expandKeys[l] : e.rowGroup.expandKeys[l] = !0;
 		}
 	} }),
-	commands: (e, { addRows: l }) => ({ addRows(u, d, f) {
-		let { data: p, rowGroup: m, rowKey: h } = e.props;
-		if (m?.fields?.length) {
-			let m = findLast(p, (e) => e[GROUP], u);
-			if (m && p[u][GROUP]) {
-				let l = function e(l) {
-					return l[GROUP]?.children[0]?.[GROUP] ? e(l[GROUP].children[0]) : l;
-				}(m);
-				e.rowGroup.expand(l, !0);
-				let d = l[GROUP].children[0];
-				u = e.props.data.indexOf(d), f = !0;
+	commands: (e, { addRows: c }) => ({ addRows(l, u, d) {
+		let { data: f, rowGroup: p, rowKey: m } = e.props;
+		if (p?.fields?.length) {
+			let p = findLast(f, (e) => e[GROUP], l);
+			if (p && f[l][GROUP]) {
+				let c = function e(c) {
+					return c[GROUP]?.children[0]?.[GROUP] ? e(c[GROUP].children[0]) : c;
+				}(p);
+				e.rowGroup.expand(c, !0);
+				let u = c[GROUP].children[0];
+				l = e.props.data.indexOf(u), d = !0;
 			}
-			l?.(u, d, f);
-		} else l?.(...arguments);
+			c?.(l, u, d);
+		} else c?.(...arguments);
 	} }),
 	rewriteProps: {
-		data: ({ data: e }, { store: l }) => l.props?.rowGroup?.fields?.length ? expandData(e, l) : e,
-		newRow: ({ newRow: e }, { store: l }) => function(u) {
-			let d = e(...arguments), { data: f, rowGroup: p } = l.props;
-			if (p?.fields?.length) {
-				let e = findLast(f, (e) => e[GROUP], u);
+		data: ({ data: e }, { store: c }) => c.props?.rowGroup?.fields?.length ? expandData(e, c) : e,
+		newRow: ({ newRow: e }, { store: c }) => function(l) {
+			let u = e(...arguments), { data: d, rowGroup: f } = c.props;
+			if (f?.fields?.length) {
+				let e = findLast(d, (e) => e[GROUP], l);
 				if (e) {
-					let l = function e(l) {
-						return l[GROUP]?.children[0]?.[GROUP] ? e(l[GROUP].children[0]) : l;
-					}(e), u = zipObject(p.fields, l[GROUP].path);
-					Object.assign(d, u);
+					let c = function e(c) {
+						return c[GROUP]?.children[0]?.[GROUP] ? e(c[GROUP].children[0]) : c;
+					}(e), l = zipObject(f.fields, c[GROUP].path);
+					Object.assign(u, l);
 				}
 			}
-			return d;
+			return u;
 		},
-		Td: ({ Td: f }, { store: _ }) => _.props?.rowGroup?.fields ? (v) => {
-			if (!v.data?.[GROUP]) return f(v);
-			let { props: y } = useContext(Ctx), b = createMemo(() => _.rowGroup.isExpand(v.data));
-			return createComponent(f, mergeProps$2(v, { get children() {
-				return memo(() => y.columns?.findIndex((e) => !e[_.internal]) == v.x)() ? (() => {
+		Td: ({ Td: u }, { store: h }) => h.props?.rowGroup?.fields ? (g) => {
+			if (!g.data?.[GROUP]) return u(g);
+			let { props: _ } = h, v = createMemo(() => h.rowGroup.isExpand(g.data));
+			return createComponent(u, mergeProps$2(g, { get children() {
+				return memo(() => _.columns?.findIndex((e) => !e[h.internal]) == g.x)() ? (() => {
 					var e = _tmpl$();
-					return e.$$dblclick = () => _.rowGroup.toggleExpand(v.data), insert(e, createComponent(chevron_right_default, {
+					return e.$$dblclick = () => h.rowGroup.toggleExpand(g.data), insert(e, createComponent(chevron_right_default, {
 						class: "icon-clickable mr-2",
 						get style() {
-							return `transform: rotate(${b() ? 90 : 0}deg); opacity: .6`;
+							return `transform: rotate(${v() ? 90 : 0}deg); opacity: .6`;
 						},
-						onClick: () => _.rowGroup.toggleExpand(v.data)
-					}), null), insert(e, () => v.data[GROUP].value, null), effect((l) => style(e, `padding-left: ${(v.data[GROUP].path.length - 1) * 16}px`, l)), e;
-				})() : v.children;
+						onClick: () => h.rowGroup.toggleExpand(g.data)
+					}), null), insert(e, () => g.data[GROUP].value, null), effect((c) => style(e, `padding-left: ${(g.data[GROUP].path.length - 1) * 16}px`, c)), e;
+				})() : g.children;
 			} }));
-		} : f
+		} : u
 	}
 };
-var GROUP = Symbol("row-group"), expandData = (e, l, u = []) => {
-	let d = l.props.rowGroup.fields, f = l.props.columns.find((e) => !e[l.internal]);
-	if (!f || d.length == u.length) return e;
-	let p = u[u.length - 1]?.[GROUP].path || [], m = groupBy(e, (e) => e[d[p.length]]);
-	return Object.keys(m).flatMap((e) => {
-		let d = {
-			[f.id]: e,
-			[l.internal]: 1
-		}, h = [...u, d];
-		d[GROUP] = {
-			path: [...p, e],
+var GROUP = Symbol("row-group"), expandData = (e, c, l = []) => {
+	let u = c.props.rowGroup.fields, d = c.props.columns.find((e) => !e[c.internal]);
+	if (!d || u.length == l.length) return e;
+	let f = l[l.length - 1]?.[GROUP].path || [], p = groupBy(e, (e) => e[u[f.length]]);
+	return Object.keys(p).flatMap((e) => {
+		let u = {
+			[d.id]: e,
+			[c.internal]: 1
+		}, m = [...l, u];
+		u[GROUP] = {
+			path: [...f, e],
 			value: e,
-			path2: h
-		}, d[GROUP].children = expandData(m[e], l, h);
-		let g = l.rowGroup.isExpand(d) ? d[GROUP].children : [];
-		return [d, ...g];
+			path2: m
+		}, u[GROUP].children = expandData(p[e], c, m);
+		let h = c.rowGroup.isExpand(u) ? u[GROUP].children : [];
+		return [u, ...h];
 	});
 };
 delegateEvents(["dblclick"]);

package/dist/plugins/RowSelectionPlugin.js

@@ -40,7 +40,10 @@ const RowSelectionPlugin = {
 			})), l;
 		})())
 	} }),
-	commands: (e) => ({ rowSelector: useSelector(mergeProps$1(() => ({ ...e.props?.rowSelection }))) }),
+	commands: (e) => ({ rowSelector: useSelector(mergeProps$1(() => ({
+		...e.props?.rowSelection,
+		key: e.props.rowKey
+	}))) }),
 	rewriteProps: {
 		rowSelection: ({ rowSelection: e }) => mergeProps$1({
 			enable: !1,

package/dist/plugins/TreePlugin.d.ts

@@ -8,7 +8,6 @@ declare module '../index' {
         };
     }
     interface TableStore {
-        tree: ReturnType<typeof useSelector<any[]>>;
         /**
          * Lookup map populated as a side-effect of the `data` rewriteProp.
          * Maps each row's rowKey → its tree metadata.
@@ -18,7 +17,11 @@ declare module '../index' {
             depth: number;
             hasChildren: boolean;
             parentKey: any;
+            row: any;
         }>;
     }
+    interface Commands {
+        tree: ReturnType<typeof useSelector<any[]>>;
+    }
 }
 export declare const TreePlugin: Plugin$0;

package/dist/plugins/TreePlugin.js

@@ -10,8 +10,9 @@ function flattenTree(e, t, n, r, i = 0, a = null, o = [], s = /* @__PURE__ */ ne
 		s.set(e, {
 			depth: i,
 			hasChildren: u,
-			parentKey: a
-		}), o.push(c), u && r(e) && flattenTree(l, t, n, r, i + 1, e, o, s);
+			parentKey: a,
+			row: c
+		}), o.push(c), u && r(c) && flattenTree(l, t, n, r, i + 1, e, o, s);
 	}
 	return {
 		flat: o,
@@ -23,7 +24,6 @@ const TreePlugin = (c) => {
 	return {
 		name: "tree",
 		store: (e) => ({
-			tree: useSelector({ multiple: !0 }),
 			_treeMeta: /* @__PURE__ */ new Map(),
 			_hasChildren: !1
 		}),
@@ -34,14 +34,14 @@ const TreePlugin = (c) => {
 			}),
 			data: ({ data: e }, { store: t }) => {
 				if (!t.props?.tree) return e;
-				let n = t.props.tree.children || "children", r = t.props.rowKey, { flat: i, meta: a } = flattenTree(e, n, r, (e) => t.tree.has(e));
+				let n = t.props.tree.children || "children", r = t.props.rowKey, { flat: i, meta: a } = flattenTree(e, n, r, (e) => t.commands.tree.has(e));
 				return t._treeMeta = a, t._haschildren = Object.values(Object.fromEntries(a)).some((e) => e.hasChildren), i;
 			},
 			Td: ({ Td: t }, { store: c }) => c._haschildren ? (l) => {
 				let f = () => c.props.rowKey, m = () => c._treeMeta?.get(l.data?.[f()]);
 				return createComponent(t, mergeProps$1(l, {
 					onDblClick: (e) => {
-						l.onDblClick?.(e), m()?.hasChildren && c.tree.toggle(l.data?.[f()]);
+						l.onDblClick?.(e), l.x == p() && m()?.hasChildren && c.commands.tree.toggle(l.data);
 					},
 					get children() {
 						return memo(() => !!(c._haschildren && l.x === p()))() ? (() => {
@@ -51,10 +51,10 @@ const TreePlugin = (c) => {
 								return () => e() ? createComponent(chevron_right_default, {
 									class: "icon-clickable mr-1",
 									get style() {
-										return `transform: rotate(${c.tree.has(l.data?.[f()]) ? 90 : 0}deg); opacity: .6; flex-shrink: 0; transition: transform .15s`;
+										return `transform: rotate(${c.commands.tree.has(l.data) ? 90 : 0}deg); opacity: .6; flex-shrink: 0; transition: transform .15s`;
 									},
 									onClick: (e) => {
-										e.stopPropagation(), c.tree.toggle(l.data?.[f()]);
+										e.stopPropagation(), c.commands.tree.toggle(l.data);
 									}
 								}) : _tmpl$2();
 							})(), null), insert(e, () => l.children, null), effect((t) => style(e, `padding-left: ${m()?.depth * 16}px`, t)), e;
@@ -63,52 +63,58 @@ const TreePlugin = (c) => {
 				}));
 			} : t
 		},
-		commands: (e, { addRows: t }) => ({ addRows(n, r, i = !0) {
-			if (!e.props?.tree) return t?.(n, r, i);
-			let { data: a, rowKey: o } = e.props, s = e.props.tree.children || "children", c = a[n];
-			if (c?.[e.internal]) {
-				let t = null, r = null;
-				for (let r = n - 1; r >= 0; r--) if (!a[r]?.[e.internal]) {
-					t = a[r];
-					break;
+		commands: (e, { addRows: n }) => ({
+			tree: useSelector({
+				multiple: !0,
+				key: e.props.rowKey
+			}),
+			addRows(t, r, i = !0) {
+				if (!e.props?.tree) return n?.(t, r, i);
+				let { data: a, rowKey: o } = e.props, s = e.props.tree.children || "children", c = a[t];
+				if (c?.[e.internal]) {
+					let n = null, r = null;
+					for (let r = t - 1; r >= 0; r--) if (!a[r]?.[e.internal]) {
+						n = a[r];
+						break;
+					}
+					for (let n = t + 1; n < a.length; n++) if (!a[n]?.[e.internal]) {
+						r = a[n];
+						break;
+					}
+					c = i ? n || r : r || n;
 				}
-				for (let t = n + 1; t < a.length; t++) if (!a[t]?.[e.internal]) {
-					r = a[t];
-					break;
+				if (!c) return n?.(t, r, i);
+				let l = c[o], u = e._treeMeta?.get(l);
+				if (!u || u.depth === 0) return n?.(t, r, i);
+				let d = e._treeMeta.get(u.parentKey)?.row, f = u.parentKey, p = a.findIndex((e) => e[o] === l);
+				if (p >= 0 && e.selected) {
+					let t = p + (i ? 0 : 1);
+					e.selected.start = [0, t], e.selected.end = [Infinity, t + r.length - 1];
 				}
-				c = i ? t || r : r || t;
-			}
-			if (!c) return t?.(n, r, i);
-			let l = c[o], u = e._treeMeta?.get(l);
-			if (!u || u.depth === 0) return t?.(n, r, i);
-			let d = u.parentKey, f = a.findIndex((e) => e[o] === l);
-			if (f >= 0 && e.selected) {
-				let t = f + (i ? 0 : 1);
-				e.selected.start = [0, t], e.selected.end = [Infinity, t + r.length - 1];
-			}
-			let p = [...e.rawProps.data || []];
-			function m(e) {
-				for (let t = 0; t < e.length; t++) {
-					let n = e[t];
-					if (n[o] === d) {
-						let a = [...n[s] || []], c = a.findIndex((e) => e[o] === l), u = c >= 0 ? c + (i ? 0 : 1) : a.length;
-						return a.splice(u, 0, ...r), e[t] = {
-							...n,
-							[s]: a
-						}, !0;
-					}
-					if (Array.isArray(n[s]) && n[s].length) {
-						let r = [...n[s]];
-						if (m(r)) return e[t] = {
-							...n,
-							[s]: r
-						}, !0;
+				let m = [...e.rawProps.data || []];
+				function h(e) {
+					for (let t = 0; t < e.length; t++) {
+						let n = e[t];
+						if (n[o] === f) {
+							let a = [...n[s] || []], c = a.findIndex((e) => e[o] === l), u = c >= 0 ? c + (i ? 0 : 1) : a.length;
+							return a.splice(u, 0, ...r), e[t] = {
+								...n,
+								[s]: a
+							}, !0;
+						}
+						if (Array.isArray(n[s]) && n[s].length) {
+							let r = [...n[s]];
+							if (h(r)) return e[t] = {
+								...n,
+								[s]: r
+							}, !0;
+						}
 					}
+					return !1;
 				}
-				return !1;
+				h(m), e.commands.tree.add(d), e.props?.onDataChange?.(m);
 			}
-			m(p), e.tree.has(d) || e.tree.toggle(d), e.props?.onDataChange?.(p);
-		} })
+		})
 	};
 };
 export { TreePlugin };

package/dist/plugins/VirtualScrollPlugin.js

@@ -1,8 +1,7 @@
-import { Ctx } from "../index.js";
 import { RecycleList } from "../components/RecycleList.js";
 import { useVirtualizer } from "../hooks/useVirtualizer.js";
 import { createComponent, mergeProps } from "solid-js/web";
-import { createEffect, createMemo, mergeProps as mergeProps$1, useContext } from "solid-js";
+import { createEffect, createMemo, mergeProps as mergeProps$1 } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
 import { defaultsDeep } from "es-toolkit/compat";
 import { defaultRangeExtractor } from "@tanstack/solid-virtual";
@@ -10,17 +9,17 @@ var $ML = Symbol();
 const VirtualScrollPlugin = {
 	name: "virtual-scroll",
 	store: (e) => ({
-		scrollToCell(r, i, a) {
-			r = typeof r == "object" ? e.props.columns.indexOf(r) : r, i = typeof i == "object" ? e.props.data.indexOf(i) : i;
-			let o = e.virtualizerX, s = e.virtualizerY;
-			o.scrollToIndex(r, !0), s.scrollToIndex(i, !0);
+		scrollToCell(n, r, i) {
+			n = typeof n == "object" ? e.props.columns.indexOf(n) : n, r = typeof r == "object" ? e.props.data.indexOf(r) : r;
+			let a = e.virtualizerX, o = e.virtualizerY;
+			a.scrollToIndex(n, !0), o.scrollToIndex(r, !0);
 		},
-		scrollCellIfNeeded(r, i, a) {
-			r = typeof r == "object" ? e.props.columns.indexOf(r) : r, i = typeof i == "object" ? e.props.data.indexOf(i) : i;
-			let o = e.virtualizerX, s = e.virtualizerY, c = e.table.querySelector(`[x="${r}"][y="${i}"]`);
-			if (!c) return e.scrollToCell(r, i);
-			let l = c.getBoundingClientRect(), u = e.scroll_el.getBoundingClientRect();
-			(l.top < u.top || l.bottom > u.bottom) && s.scrollToIndex(i, !0), (l.left < u.left || l.right > u.right) && o.scrollToIndex(r, !0);
+		scrollCellIfNeeded(n, r, i) {
+			n = typeof n == "object" ? e.props.columns.indexOf(n) : n, r = typeof r == "object" ? e.props.data.indexOf(r) : r;
+			let a = e.virtualizerX, o = e.virtualizerY, s = e.table.querySelector(`[x="${n}"][y="${r}"]`);
+			if (!s) return e.scrollToCell(n, r);
+			let c = s.getBoundingClientRect(), l = e.scroll_el.getBoundingClientRect();
+			(c.top < l.top || c.bottom > l.bottom) && o.scrollToIndex(r, !0), (c.left < l.left || c.right > l.right) && a.scrollToIndex(n, !0);
 		}
 	}),
 	rewriteProps: {
@@ -28,106 +27,106 @@ const VirtualScrollPlugin = {
 			x: { overscan: 2 },
 			y: { overscan: 2 }
 		}),
-		Scroll: ({ Scroll: e }, { store: r }) => (r) => (r = combineProps({ class: "virtual" }, r), createComponent(e, r)),
-		Table: ({ Table: r }, { store: o }) => (d) => {
-			let { props: f } = useContext(Ctx), p = useVirtualizer(mergeProps$1(() => f.virtual?.y, {
-				getScrollElement: () => o.scroll_el,
+		Scroll: ({ Scroll: e }, { store: n }) => (n) => (n = combineProps({ class: "virtual" }, n), createComponent(e, n)),
+		Table: ({ Table: e }, { store: i }) => (c) => {
+			let { props: l } = i, d = useVirtualizer(mergeProps$1(() => l.virtual?.y, {
+				getScrollElement: () => i.scroll_el,
 				get count() {
-					return f.data?.length || 0;
+					return l.data?.length || 0;
 				},
 				estimateSize: () => 32,
 				indexAttribute: "y",
-				extras: (e, r) => {
-					let i = o._mergeMap?.();
-					if (!i?.spans.size) return [];
-					let a = o.virtualizerX, s = a ? a.startIdx() : 0, c = a ? a.endIdx() : Infinity, l = [];
-					for (let [a, o] of i.spans) {
-						if (o.rowspan <= 1) continue;
-						let [i, u] = a.split(",").map(Number);
-						if (i > r || i + o.rowspan - 1 < e || u > c || u + o.colspan - 1 < s) continue;
-						for (let e = 0; e < o.rowspan; e++) l.push(i + e);
+				extras: (e, n) => {
+					let r = i._mergeMap?.();
+					if (!r?.spans.size) return [];
+					let a = i.virtualizerX, o = a ? a.startIdx() : 0, s = a ? a.endIdx() : Infinity, c = [];
+					for (let [i, a] of r.spans) {
+						if (a.rowspan <= 1) continue;
+						let [r, l] = i.split(",").map(Number);
+						if (r > n || r + a.rowspan - 1 < e || l > s || l + a.colspan - 1 < o) continue;
+						for (let e = 0; e < a.rowspan; e++) c.push(r + e);
 					}
-					return l;
+					return c;
 				}
-			})), m = useVirtualizer(mergeProps$1(() => f.virtual?.x, {
+			})), f = useVirtualizer(mergeProps$1(() => l.virtual?.x, {
 				horizontal: !0,
-				getScrollElement: () => o.scroll_el,
+				getScrollElement: () => i.scroll_el,
 				get count() {
-					return f.columns?.length || 0;
+					return l.columns?.length || 0;
 				},
-				estimateSize: (e) => f.columns?.[e].width ?? 40,
+				estimateSize: (e) => l.columns?.[e].width ?? 40,
 				indexAttribute: "x",
 				rangeExtractor(e) {
-					return [...new Set([...f.columns?.map((e, r) => e.fixed ? r : void 0).filter((e) => e != null) || [], ...defaultRangeExtractor(e)])];
+					return [...new Set([...l.columns?.map((e, n) => e.fixed ? n : void 0).filter((e) => e != null) || [], ...defaultRangeExtractor(e)])];
 				},
-				extras: (e, r) => {
-					let i = f.columns?.map((e, r) => e.fixed ? r : void 0).filter((e) => e != null) || [], a = o._headerGroupAnchors?.(e, r) || [], s = new Set([...i, ...a]), c = o._mergeMap?.();
-					if (!c?.spans.size) return [...s];
-					let l = p.startIdx(), u = p.endIdx();
-					for (let [i, a] of c.spans) {
-						if (a.colspan <= 1) continue;
-						let [o, c] = i.split(",").map(Number);
-						if (o > u || o + a.rowspan - 1 < l || c > r || c + a.colspan - 1 < e) continue;
-						for (let e = 0; e < a.colspan; e++) s.add(c + e);
+				extras: (e, n) => {
+					let r = l.columns?.map((e, n) => e.fixed ? n : void 0).filter((e) => e != null) || [], a = i._headerGroupAnchors?.(e, n) || [], o = new Set([...r, ...a]), s = i._mergeMap?.();
+					if (!s?.spans.size) return [...o];
+					let c = d.startIdx(), u = d.endIdx();
+					for (let [r, i] of s.spans) {
+						if (i.colspan <= 1) continue;
+						let [a, s] = r.split(",").map(Number);
+						if (a > u || a + i.rowspan - 1 < c || s > n || s + i.colspan - 1 < e) continue;
+						for (let e = 0; e < i.colspan; e++) o.add(s + e);
 					}
-					return [...s];
+					return [...o];
 				}
 			}));
-			return o.virtualizerY = p, o.virtualizerX = m, o[$ML] = createMemo(() => {
-				let e = o.virtualizerX.getVirtualItems(), r = {};
-				for (let i = 1; i < e.length; i++) {
-					let a = e[i], o = e[i - 1];
-					a.index - o.index > 1 && (r[a.index] = {
-						item: a,
-						offset: a.start - o.end
+			return i.virtualizerY = d, i.virtualizerX = f, i[$ML] = createMemo(() => {
+				let e = i.virtualizerX.getVirtualItems(), n = {};
+				for (let r = 1; r < e.length; r++) {
+					let i = e[r], a = e[r - 1];
+					i.index - a.index > 1 && (n[i.index] = {
+						item: i,
+						offset: i.start - a.end
 					});
 				}
-				return r;
+				return n;
 			}), createEffect(() => {
-				let { table: e } = o;
-				e.style.width = o.virtualizerX.getTotalSize() + "px", e.style.height = o.virtualizerY.getTotalSize() + (o.thead?.offsetHeight || 0) + "px";
-			}), createComponent(r, d);
+				let { table: e } = i;
+				e.style.width = i.virtualizerX.getTotalSize() + "px", e.style.height = i.virtualizerY.getTotalSize() + (i.thead?.offsetHeight || 0) + "px";
+			}), createComponent(e, c);
 		},
-		Thead: ({ Thead: e }, { store: r }) => (i) => (i = combineProps({ get style() {
-			return `transform: translate(${r.virtualizerX.getVirtualItems()[0]?.start}px, 0px);`;
+		Thead: ({ Thead: e }, { store: n }) => (i) => (i = combineProps({ get style() {
+			return `transform: translate(${n.virtualizerX.getVirtualItems()[0]?.start}px, 0px);`;
 		} }, i), createComponent(e, i)),
-		Tbody: ({ Tbody: e }, { store: r }) => (i) => (i = combineProps({ get style() {
-			return `transform: translate(${r.virtualizerX.getVirtualItems()[0]?.start}px, ${r.virtualizerY.getVirtualItems()[0]?.start}px)`;
+		Tbody: ({ Tbody: e }, { store: n }) => (i) => (i = combineProps({ get style() {
+			return `transform: translate(${n.virtualizerX.getVirtualItems()[0]?.start}px, ${n.virtualizerY.getVirtualItems()[0]?.start}px)`;
 		} }, i), createComponent(e, i)),
-		Tr: ({ Tr: e }, { store: r }) => (i) => (createEffect(() => i.y != null && r.trSizes[i.y] && r.virtualizerY.resizeItem(i.y, r.trSizes[i.y].height)), createComponent(e, i)),
-		Td: ({ Td: e }, { store: r }) => (i) => {
-			let o = createMemo(() => r[$ML]()[i.x]), s = combineProps({ get style() {
+		Tr: ({ Tr: e }, { store: n }) => (i) => (createEffect(() => i.y != null && n.trSizes[i.y] && n.virtualizerY.resizeItem(i.y, n.trSizes[i.y].height)), createComponent(e, i)),
+		Td: ({ Td: e }, { store: n }) => (i) => {
+			let a = createMemo(() => n[$ML]()[i.x]), s = combineProps({ get style() {
 				let e = i.colspan ?? 1;
-				return `width: ${e > 1 ? Array.from({ length: e }, (e, a) => r.props.columns?.[i.x + a]?.width ?? 80).reduce((e, r) => e + r, 0) : i.col.width || 80}px; margin-left: ${i.col.fixed ? 0 : o()?.offset ?? 0}px`;
+				return `width: ${e > 1 ? Array.from({ length: e }, (e, r) => n.props.columns?.[i.x + r]?.width ?? 80).reduce((e, n) => e + n, 0) : i.col.width || 80}px; margin-left: ${i.col.fixed ? 0 : a()?.offset ?? 0}px`;
 			} }, i);
 			return createComponent(e, s);
 		},
-		Th: ({ Th: e }, { store: r }) => (i) => {
-			createEffect(() => (i.colspan ?? 1) === 1 && r.thSizes[i.x] && r.virtualizerX.resizeItem(i.x, r.thSizes[i.x].width));
-			let o = createMemo(() => r[$ML]?.()[i.x]), l = combineProps({ get style() {
+		Th: ({ Th: e }, { store: n }) => (i) => {
+			createEffect(() => (i.colspan ?? 1) === 1 && n.thSizes[i.x] && n.virtualizerX.resizeItem(i.x, n.thSizes[i.x].width));
+			let s = createMemo(() => n[$ML]?.()[i.x]), l = combineProps({ get style() {
 				let e = i.colspan ?? 1;
-				return `width: ${e > 1 ? Array.from({ length: e }, (e, a) => r.props.columns?.[i.x + a]?.width ?? 80).reduce((e, r) => e + r, 0) : i.col.width || 80}px; margin-left: ${i.col.fixed ? 0 : o()?.offset ?? 0}px`;
+				return `width: ${e > 1 ? Array.from({ length: e }, (e, r) => n.props.columns?.[i.x + r]?.width ?? 80).reduce((e, n) => e + n, 0) : i.col.width || 80}px; margin-left: ${i.col.fixed ? 0 : s()?.offset ?? 0}px`;
 			} }, i);
 			return createComponent(e, l);
 		},
-		EachRows: ({ EachRows: e }, { store: i }) => (s) => {
-			e = RecycleList;
-			let l = createMemo(() => i.virtualizerY.getVirtualItems().map((e) => s.each[e.index]));
-			return createComponent(e, mergeProps(s, {
+		EachRows: ({ EachRows: n }, { store: a }) => (s) => {
+			n = RecycleList;
+			let c = createMemo(() => a.virtualizerY.getVirtualItems().map((e) => s.each[e.index]));
+			return createComponent(n, mergeProps(s, {
 				get each() {
-					return l();
+					return c();
 				},
-				children: (e, r) => s.children(e, createMemo(() => i.virtualizerY.getVirtualItems()[r()]?.index))
+				children: (e, n) => s.children(e, createMemo(() => a.virtualizerY.getVirtualItems()[n()]?.index))
 			}));
 		},
-		EachCells: ({ EachCells: e }, { store: i }) => (s) => {
-			if (e = RecycleList, s.each?.length !== i.virtualizerX?.options?.count) return createComponent(e, s);
-			let l = createMemo(() => i.virtualizerX.getVirtualItems().map((e) => s.each[e.index]));
-			return createComponent(e, mergeProps(s, {
+		EachCells: ({ EachCells: n }, { store: a }) => (s) => {
+			if (n = RecycleList, s.each?.length !== a.virtualizerX?.options?.count) return createComponent(n, s);
+			let c = createMemo(() => a.virtualizerX.getVirtualItems().map((e) => s.each[e.index]));
+			return createComponent(n, mergeProps(s, {
 				get each() {
-					return l();
+					return c();
 				},
-				children: (e, r) => s.children(e, createMemo(() => i.virtualizerX.getVirtualItems()[r()]?.index))
+				children: (e, n) => s.children(e, createMemo(() => a.virtualizerX.getVirtualItems()[n()]?.index))
 			}));
 		}
 	}