intable 0.0.57 → 0.0.59

package/dist/plugins/HeaderGroup.js

@@ -1,6 +1,5 @@
-import { Ctx } from "../index.js";
 import { createComponent, memo, mergeProps } from "solid-js/web";
-import { For, Show, createEffect, createMemo, createSignal, useContext } from "solid-js";
+import { For, Show, createEffect, createMemo, createSignal } from "solid-js";
 function leafCount(e) {
 	return e.children?.length ? e.children.reduce((e, t) => e + leafCount(t), 0) : 1;
 }
@@ -14,12 +13,12 @@ function flatLeaves(e, t = [], n) {
 	return t;
 }
 function buildFlatGrid(e, t, n, r, i, a) {
-	let o = n.length, s = Array.from({ length: t }, () => Array(o).fill(null)), c = 0;
-	function l(e, o) {
+	let o = n.length, s = Array.from({ length: t }, () => Array(o).fill(null)), l = 0;
+	function u(e, o) {
 		for (let d of e) {
-			let e = !!d.children?.length, f = leafCount(d), p = e ? 1 : t - o, m = e ? i[c] : d, h = r.get(m[a.ID]);
+			let e = !!d.children?.length, f = leafCount(d), p = e ? 1 : t - o, m = e ? i[l] : d, h = r.get(m[a.ID]);
 			if (h == null) {
-				e || c++;
+				e || l++;
 				continue;
 			}
 			s[o][h] = {
@@ -40,10 +39,10 @@ function buildFlatGrid(e, t, n, r, i, a) {
 				colspan: 1,
 				rowspan: 1
 			};
-			e ? l(d.children, o + 1) : c++;
+			e ? u(d.children, o + 1) : l++;
 		}
 	}
-	c = 0, l(e, 0);
+	l = 0, u(e, 0);
 	for (let e = 0; e < o; e++) {
 		if (s[0][e] != null) continue;
 		let r = n[e];
@@ -71,76 +70,76 @@ const HeaderGroupPlugin = {
 		if (!r.some((e) => e.children?.length) || maxDepth(r) <= 1) return [];
 		let i = e.props.columns || [], a = flatLeaves(r, [], e), o = /* @__PURE__ */ new Map();
 		for (let t = 0; t < i.length; t++) o.set(i[t][e.ID], t);
-		let s = [], c = 0;
-		function l(r) {
+		let s = [], d = 0;
+		function f(r) {
 			for (let i of r) if (i.children?.length) {
-				let r = leafCount(i), d = a[c];
-				if (d) {
-					let i = o.get(d[e.ID]);
+				let r = leafCount(i), l = a[d];
+				if (l) {
+					let i = o.get(l[e.ID]);
 					if (i != null) {
 						let e = i + r - 1;
 						i <= n && e >= t && s.push(i);
 					}
 				}
-				l(i.children);
-			} else c++;
+				f(i.children);
+			} else d++;
 		}
-		return l(r), s;
+		return f(r), s;
 	} }),
 	rewriteProps: {
 		columns: ({ columns: e }, { store: t }) => flatLeaves(e, [], t),
-		Thead: ({ Thead: u }, { store: m }) => (h) => {
-			let { props: g } = useContext(Ctx), _ = createMemo(() => {
-				let e = m.rawProps.columns || [], t = maxDepth(e);
+		Thead: ({ Thead: c }, { store: f }) => (p) => {
+			let { props: m } = f, h = createMemo(() => {
+				let e = f.rawProps.columns || [], t = maxDepth(e);
 				if (t <= 1) return null;
-				let n = g.columns || [], r = flatLeaves(e, [], m), i = /* @__PURE__ */ new Map();
-				for (let e = 0; e < n.length; e++) i.set(n[e][m.ID], e);
+				let n = m.columns || [], r = flatLeaves(e, [], f), i = /* @__PURE__ */ new Map();
+				for (let e = 0; e < n.length; e++) i.set(n[e][f.ID], e);
 				return {
-					grid: buildFlatGrid(e, t, n, i, r, m),
+					grid: buildFlatGrid(e, t, n, i, r, f),
 					depth: t
 				};
-			}), [v, y] = createSignal(24);
+			}), [g, _] = createSignal(24);
 			createEffect(() => {
-				let e = m.thead;
+				let e = f.thead;
 				if (!e) return;
 				let t = e.querySelectorAll(":scope > tr"), n = t[t.length - 1];
-				n && y(n.offsetHeight || 24);
+				n && _(n.offsetHeight || 24);
 			});
-			let b = () => !!m.virtualizerX;
+			let v = () => !!f.virtualizerX;
 			return createComponent(Show, {
 				get when() {
-					return _();
+					return h();
 				},
 				get fallback() {
-					return createComponent(u, h);
+					return createComponent(c, p);
 				},
-				children: (e) => createComponent(u, mergeProps(h, { get children() {
+				children: (i) => createComponent(c, mergeProps(p, { get children() {
 					return createComponent(For, {
 						get each() {
-							return e().grid;
+							return i().grid;
 						},
-						children: (r, i) => createComponent(g.Tr, {
+						children: (n, r) => createComponent(m.Tr, {
 							get style() {
-								return memo(() => !!b())() ? `height:${v()}px;overflow:visible;position:relative;z-index:${e().depth - i()}` : "";
+								return memo(() => !!v())() ? `height:${g()}px;overflow:visible;position:relative;z-index:${i().depth - r()}` : "";
 							},
 							get children() {
-								return createComponent(g.EachCells, {
+								return createComponent(m.EachCells, {
 									get each() {
-										return g.columns;
+										return m.columns;
 									},
-									children: (e, i) => {
-										let a = () => r[i()];
+									children: (r, i) => {
+										let a = () => n[i()];
 										if (!a()) return null;
 										let o = () => {
 											let e = a();
-											return e.kind === "anchor" ? b() && e.rowspan > 1 && v() ? `height:${e.rowspan * v()}px;position:relative;` : "" : e.kind === "colspan-hidden" ? "display:none" : e.kind === "rowspan-hidden" ? b() ? "visibility:hidden" : "display:none" : "";
+											return e.kind === "anchor" ? v() && e.rowspan > 1 && g() ? `height:${e.rowspan * g()}px;position:relative;` : "" : e.kind === "colspan-hidden" ? "display:none" : e.kind === "rowspan-hidden" ? v() ? "visibility:hidden" : "display:none" : "";
 										}, s = () => a().kind === "anchor";
-										return createComponent(g.Th, {
+										return createComponent(m.Th, {
 											get x() {
 												return i();
 											},
 											get col() {
-												return memo(() => !!s())() ? a().anchorCol : e();
+												return memo(() => !!s())() ? a().anchorCol : r();
 											},
 											get colspan() {
 												return memo(() => !!(s() && a().colspan > 1))() ? a().colspan : void 0;

package/dist/plugins/LoadMorePlugin.d.ts

@@ -12,7 +12,7 @@ declare module '../index' {
             noMoreText?: string;
             onLoadMore?: () => void | Promise<void>;
         };
-        LoadMore?: Component<TableProps['loadMore']>;
+        LoadMore?: Component<Exclude<TableProps['loadMore'], undefined>>;
     }
     interface TableStore {
         loadMore: {

package/dist/plugins/LoadMorePlugin.js

@@ -7,18 +7,6 @@ var _tmpl$ = /* @__PURE__ */ template("<div class=\"data-table__load-more sticky
 function isPromiseLike(e) {
 	return !!e && typeof e.then == "function";
 }
-var LoadMoreLayer = (s) => {
-	let c = () => !!s.enable && (s.loading || s.hasMore === !1), l = () => s.loading ? s.loadingText ?? "loading..." : s.noMoreText ?? "无更多数据";
-	return createComponent(Show, {
-		get when() {
-			return c();
-		},
-		get children() {
-			var e = _tmpl$();
-			return insert(e, l), e;
-		}
-	});
-};
 const LoadMorePlugin = {
 	name: "loadMore",
 	store: () => ({ loadMore: {
@@ -26,36 +14,47 @@ const LoadMorePlugin = {
 		lastTriggerAt: 0
 	} }),
 	rewriteProps: {
-		loadMore: ({ loadMore: e }, { store: o }) => ({
+		loadMore: ({ loadMore: e }, { store: a }) => ({
 			enable: !1,
 			threshold: 100,
 			debounce: 200,
 			...e
 		}),
-		LoadMore: ({ LoadMore: o = LoadMoreLayer }, { store: s }) => () => createComponent(o, mergeProps(() => s.props.loadMore)),
-		Footer: ({ Footer: o }, { store: l }) => (u) => createComponent(o, mergeProps(() => combineProps({ class: "contents" }, u), { get children() {
-			return [memo(() => u.children), createComponent(l.props.LoadMore, {})];
+		LoadMore: ({ LoadMore: o }, { store: s }) => o ?? ((o) => {
+			let s = () => !!o.enable && (o.loading || o.hasMore === !1), c = () => o.loading ? o.loadingText ?? "loading..." : o.noMoreText ?? "无更多数据";
+			return createComponent(Show, {
+				get when() {
+					return s();
+				},
+				get children() {
+					var e = _tmpl$();
+					return insert(e, c), e;
+				}
+			});
+		}),
+		ScrollFooter: ({ ScrollFooter: a }, { store: c }) => (l) => createComponent(a, mergeProps(() => combineProps({ class: "contents" }, l), { get children() {
+			return [memo(() => l.children), createComponent(c.props.LoadMore, mergeProps(() => c.props.loadMore))];
 		} }))
 	},
 	onMount: (e) => {
-		let o = () => {
-			let s = e.props.loadMore;
-			if (!s.enable || !s.onLoadMore || s.hasMore === !1 || s.loading || e.loadMore.pending) return;
-			let c = e.scroll_el;
-			if (!c) return;
-			let l = c.scrollHeight - c.scrollTop - c.clientHeight, u = s.threshold;
-			if (l > u) return;
-			let d = Date.now(), f = s.debounce;
-			if (d - e.loadMore.lastTriggerAt < f) return;
-			e.loadMore.lastTriggerAt = d;
-			let p = s.onLoadMore();
-			isPromiseLike(p) && (e.loadMore.pending = !0, p.finally(() => {
-				e.loadMore.pending = !1, delay(0).then(o);
+		let a = () => {
+			let o = e.props.loadMore;
+			if (!o.enable || !o.onLoadMore || o.hasMore === !1 || o.loading || e.loadMore.pending) return;
+			let s = e.scroll_el;
+			if (!s) return;
+			let c = s.scrollHeight - s.scrollTop - s.clientHeight, l = o.threshold;
+			if (c > l) return;
+			let u = Date.now(), d = o.debounce;
+			if (u - e.loadMore.lastTriggerAt < d) return;
+			e.loadMore.lastTriggerAt = u;
+			let f = o.onLoadMore();
+			isPromiseLike(f) && (e.loadMore.pending = !0, f.finally(() => {
+				e.loadMore.pending = !1, delay(0).then(a);
 			}));
 		};
 		createEffect(() => {
-			let s = e.scroll_el, c = e.props.loadMore;
-			!s || !c.enable || (createEventListener(() => e.scroll_el, "scroll", o, { passive: !0 }), queueMicrotask(o));
+			let o = e.scroll_el, s = e.props.loadMore;
+			!o || !s.enable || (createEventListener(() => e.scroll_el, "scroll", a, { passive: !0 }), queueMicrotask(a));
 		});
 	}
 };

package/dist/plugins/PaginationPlugin.d.ts

@@ -0,0 +1,22 @@
+import type { Plugin } from '..';
+declare module '..' {
+    interface TableProps {
+        pagination?: {
+            enable?: boolean;
+            pageSize?: number;
+            defaultValue?: number;
+            value?: number;
+            onChange?: (page: number) => void;
+            /** Server-side pagination: called on page change with (page, pageSize).
+             *  Parent should update `data` and `total` in response. */
+            request?: (page: number, pageSize: number) => void | Promise<void>;
+            /** Total record count (required for server-side pagination) */
+            total?: number;
+        };
+    }
+    interface TableStore {
+        _pgnTotal: number;
+        _pgnLoading: boolean;
+    }
+}
+export declare const PaginationPlugin: Plugin;

package/dist/plugins/PaginationPlugin.js

@@ -0,0 +1,105 @@
+import { useControlled } from "../hooks/useControlled.js";
+import { Ctx } from "../index.js";
+import { className, createComponent, delegateEvents, effect, insert, memo, mergeProps, template } from "solid-js/web";
+import { For, Show, createMemo, mergeProps as mergeProps$1, runWithOwner, untrack, useContext } from "solid-js";
+var _tmpl$ = /* @__PURE__ */ template("<div class=\"data-table__pagination flex items-center justify-end gap-1 py-2 text-sm\"><span class=mr-2>共 <!> 条</span><button class=\"data-table__pagination-btn disabled:op-30\">‹</button><button class=\"data-table__pagination-btn disabled:op-30\">›"), _tmpl$2 = /* @__PURE__ */ template("<span class=\"px-1 select-none\">…"), _tmpl$3 = /* @__PURE__ */ template("<button>");
+const PaginationPlugin = {
+	name: "pagination",
+	store: (e) => ({
+		_pgnTotal: 0,
+		_pgnLoading: !1
+	}),
+	rewriteProps: {
+		loading: ({ loading: e }, { store: l }) => l._pgnLoading || e,
+		pagination: ({ pagination: l }, { store: u }) => {
+			l = mergeProps$1({
+				enable: !1,
+				pageSize: 20,
+				defaultValue: 1
+			}, l);
+			let d = untrack(() => u._pgn ??= runWithOwner(u.owner, () => useControlled(l)));
+			return u._pgn.$setOpt(l), d;
+		},
+		data: ({ data: e }, { store: l }) => {
+			if (!e) return e;
+			let u = l.props.pagination;
+			return u?.enable ? typeof u.request == "function" ? (l._pgnTotal = u.total ?? e.length, e) : (l._pgnTotal = e.length, e) : e;
+		},
+		EachRows: ({ EachRows: e }, { store: l }) => l.props.pagination?.enable ? (u) => {
+			let f = mergeProps$1(() => l.props.pagination);
+			if (!f?.enable || typeof f.request == "function") return createComponent(e, u);
+			let p = () => (f.value - 1) * f.pageSize, m = () => u.each.slice(p(), p() + f.pageSize);
+			return createComponent(e, {
+				get each() {
+					return m();
+				},
+				children: (e, l) => u.children(e, () => p() + l())
+			});
+		} : e,
+		Footer: ({ Footer: e }, { store: l }) => (u) => createComponent(e, mergeProps(u, { get children() {
+			return [memo(() => u.children), createComponent(Show, {
+				get when() {
+					return l.props.pagination?.enable;
+				},
+				get children() {
+					return createComponent(PaginationFooter, {});
+				}
+			})];
+		} }))
+	}
+};
+function PaginationFooter() {
+	let { store: e } = useContext(Ctx), f = mergeProps$1(() => e.props.pagination), h = () => f.value, g = () => f.pageSize, _ = () => Math.ceil(e._pgnTotal / g()), v = createMemo(() => pageNumbers(h(), _())), x = (l) => {
+		if (l < 1 || l > _()) return;
+		let u = e.props.pagination?.request;
+		if (u) {
+			if (e._pgnLoading) return;
+			e._pgnLoading = !0;
+			let d = u(l, g());
+			d && typeof d.then == "function" ? d.finally(() => {
+				e._pgnLoading = !1;
+			}) : e._pgnLoading = !1;
+		}
+		e.props.pagination?.onChange?.(l);
+	};
+	return (() => {
+		var l = _tmpl$(), f = l.firstChild, g = f.firstChild, y = g.nextSibling;
+		y.nextSibling;
+		var b = f.nextSibling, S = b.nextSibling;
+		return insert(f, () => e._pgnTotal, y), b.$$click = () => x(h() - 1), insert(l, createComponent(For, {
+			get each() {
+				return v();
+			},
+			children: (l) => {
+				let d = () => l === h();
+				return l === "..." ? _tmpl$2() : (() => {
+					var f = _tmpl$3();
+					return f.$$click = () => x(l), insert(f, l), effect((l) => {
+						var p = `data-table__pagination-btn ${d() ? "is-active" : ""}`, m = e.props.loading;
+						return p !== l.e && className(f, l.e = p), m !== l.t && (f.disabled = l.t = m), l;
+					}, {
+						e: void 0,
+						t: void 0
+					}), f;
+				})();
+			}
+		}), S), S.$$click = () => x(h() + 1), effect((l) => {
+			var u = h() <= 1 || e.props.loading, d = h() >= _() || e.props.loading;
+			return u !== l.e && (b.disabled = l.e = u), d !== l.t && (S.disabled = l.t = d), l;
+		}, {
+			e: void 0,
+			t: void 0
+		}), l;
+	})();
+}
+function pageNumbers(e, l) {
+	if (l <= 1) return [];
+	if (l <= 7) return Array.from({ length: l }, (e, l) => l + 1);
+	let u = [1];
+	e > 4 && u.push("...");
+	let d = Math.max(2, e - 1), f = Math.min(l - 1, e + 1);
+	for (let e = d; e <= f; e++) u.push(e);
+	return e < l - 3 && u.push("..."), u.push(l), u;
+}
+delegateEvents(["click"]);
+export { PaginationPlugin };

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

@@ -3,7 +3,7 @@ import { Checkbox } from "./RenderPlugin/components.js";
 import { useSelector } from "../hooks/useSelector.js";
 import { createComponent, insert, template } from "solid-js/web";
 import { mergeProps as mergeProps$1 } from "solid-js";
-var _tmpl$ = /* @__PURE__ */ template("<label class=\"flex items-center justify-center w-full h-full\">"), _tmpl$2 = /* @__PURE__ */ template("<label>");
+var _tmpl$ = /* @__PURE__ */ template("<label class=\"flex items-center justify-center w-full h-full absolute inset-0\">"), _tmpl$2 = /* @__PURE__ */ template("<label>");
 const RowSelectionPlugin = {
 	name: "row-selection",
 	priority: -Infinity,
@@ -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;