intable 0.0.46 → 0.0.47

package/dist/index.d.ts

@@ -114,7 +114,7 @@ export type THProps = {
     colspan?: number;
     style?: any;
 };
-interface TDProps {
+export interface TDProps {
     x: number;
     y: number;
     data: any;

package/dist/mergeProps2.js

@@ -0,0 +1,73 @@
+import { $PROXY, createMemo } from "solid-js";
+var SUPPORTS_PROXY = typeof Proxy == "function";
+function trueFn() {
+	return !0;
+}
+var propTraps = {
+	get(n, r, i) {
+		return r === $PROXY ? i : n.get(r);
+	},
+	has(n, r) {
+		return r === $PROXY ? !0 : n.has(r);
+	},
+	set: trueFn,
+	deleteProperty: trueFn,
+	getOwnPropertyDescriptor(e, n) {
+		return {
+			configurable: !0,
+			enumerable: !0,
+			get() {
+				return e.get(n);
+			},
+			set: trueFn,
+			deleteProperty: trueFn
+		};
+	},
+	ownKeys(e) {
+		return e.keys();
+	}
+};
+function resolveSource(e) {
+	return (e = typeof e == "function" ? e() : e) ? e : {};
+}
+function mergeProps$1(...i) {
+	let o = !1;
+	for (let r = 0; r < i.length; r++) {
+		let a = i[r];
+		o ||= !!a && $PROXY in a, i[r] = typeof a == "function" ? (o = !0, createMemo(a)) : a;
+	}
+	if (SUPPORTS_PROXY && o) return new Proxy({
+		get(e) {
+			for (let n = i.length - 1; n >= 0; n--) {
+				let r = resolveSource(i[n])[e];
+				if (r !== void 0) return r;
+			}
+		},
+		has(e) {
+			for (let n = i.length - 1; n >= 0; n--) if (e in resolveSource(i[n])) return !0;
+			return !1;
+		},
+		keys() {
+			let e = [];
+			for (let n = 0; n < i.length; n++) e.push(...Object.keys(resolveSource(i[n])));
+			return [...new Set(e)];
+		}
+	}, propTraps);
+	let s = Object.create(null);
+	for (let e = i.length - 1; e >= 0; e--) {
+		let n = i[e];
+		if (!n) continue;
+		let r = Object.getOwnPropertyDescriptors(n);
+		for (let e in r) {
+			let n = r[e];
+			s[e] || (s[e] = n);
+		}
+	}
+	let c = {}, l = Object.keys(s);
+	for (let e = l.length - 1; e >= 0; e--) {
+		let n = l[e], r = s[n];
+		r && r.get ? Object.defineProperty(c, n, r) : c[n] = r ? r.value : void 0;
+	}
+	return c;
+}
+export { mergeProps$1 as mergeProps };

package/dist/plugins/CellMergePlugin.js

@@ -1,4 +1,5 @@
-import { createComponent, mergeProps } from "solid-js/web";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
+import { createComponent } from "solid-js/web";
 import { Show, createMemo } from "solid-js";
 function buildMergeMap(e, t, n) {
 	let r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Set();
@@ -26,13 +27,13 @@ function buildMergeMap(e, t, n) {
 const CellMergePlugin = {
 	name: "cell-merge",
 	rewriteProps: {
-		Table: ({ Table: t }, { store: n }) => (a) => (n._mergeMap ??= createMemo(() => {
+		Table: ({ Table: e }, { store: n }) => (a) => (n._mergeMap ??= createMemo(() => {
 			let { merge: e, data: t, columns: r } = n.props;
 			return !e && !r?.some((e) => e.mergeRow) || !t?.length || !r?.length ? {
 				spans: /* @__PURE__ */ new Map(),
 				covered: /* @__PURE__ */ new Set()
 			} : buildMergeMap(t, r, e);
-		}), createComponent(t, a)),
+		}), createComponent(e, a)),
 		Td: ({ Td: r }, { store: i }) => (a) => {
 			let o = () => `${a.y},${a.x}`, s = () => i._mergeMap?.().covered.has(o()) ?? !1, c = () => i._mergeMap?.().spans.get(o());
 			return createComponent(Show, {
@@ -40,7 +41,7 @@ const CellMergePlugin = {
 					return !s();
 				},
 				get children() {
-					return createComponent(r, mergeProps(a, {
+					return createComponent(r, mergeProps$2(a, {
 						get rowspan() {
 							return c()?.rowspan;
 						},

package/dist/plugins/CellSelectionPlugin.js

@@ -1,6 +1,7 @@
 import { usePointerDrag } from "../hooks/index.js";
 import { unFn } from "../utils.js";
-import { createComponent, memo, mergeProps, template } from "solid-js/web";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
+import { createComponent, memo, template } from "solid-js/web";
 import { batch, createMemo } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
 import { createLazyMemo } from "@solid-primitives/memo";
@@ -25,39 +26,39 @@ const CellSelectionPlugin = {
 		return e.props.data.slice(s, c + 1);
 	} }),
 	rewriteProps: {
-		Table: ({ Table: a }, { store: s }) => (c) => (usePointerDrag(() => s.table, {
+		Table: ({ Table: a }, { store: o }) => (c) => (usePointerDrag(() => o.table, {
 			preventDefault: !1,
-			start(e, a, o) {
+			start(e, a, s) {
 				batch(() => {
-					let o = (e) => e.composedPath().find((e) => e.tagName == "TH" || e.tagName == "TD"), c = (e) => [e.getAttribute("x"), e.getAttribute("y")], l = o(e);
+					let s = (e) => e.composedPath().find((e) => e.tagName == "TH" || e.tagName == "TD"), c = (e) => [e.getAttribute("x"), e.getAttribute("y")], l = s(e);
 					if (l && !(e.buttons != 1 && l.classList.contains("range-selected"))) {
 						if (l.tagName == "TH") {
 							let [e, u] = c(l);
 							if (e == null) return;
-							s.selected.start = [+e, 0], s.selected.end = [+e, Infinity], a((e) => {
-								let a = o(e);
+							o.selected.start = [+e, 0], o.selected.end = [+e, Infinity], a((e) => {
+								let a = s(e);
 								if (!a) return;
 								let [l, u] = c(a);
-								l != null && (s.selected.end = [+l, Infinity]);
+								l != null && (o.selected.end = [+l, Infinity]);
 							});
 						}
 						if (l.classList.contains("index")) {
 							let [e, u] = c(l);
 							if (e == null || u == null) return;
-							s.selected.start = [0, +u], s.selected.end = [Infinity, +u], a((e) => {
-								let a = o(e);
+							o.selected.start = [0, +u], o.selected.end = [Infinity, +u], a((e) => {
+								let a = s(e);
 								if (!a) return;
 								let [l, u] = c(a);
-								l == null || u == null || (s.selected.end = [Infinity, +u]);
+								l == null || u == null || (o.selected.end = [Infinity, +u]);
 							});
 						} else if (l.tagName == "TD") {
 							let [e, u] = c(l);
 							if (e == null || u == null) return;
-							s.selected.start = [+e, +u], s.selected.end = [...s.selected.start], a((e) => {
-								let a = o(e);
+							o.selected.start = [+e, +u], o.selected.end = [...o.selected.start], a((e) => {
+								let a = s(e);
 								if (!a) return;
 								let [l, u] = c(a);
-								l == null || u == null || (s.selected.end = [+l, +u]);
+								l == null || u == null || (o.selected.end = [+l, +u]);
 							});
 						}
 					}
@@ -69,7 +70,7 @@ const CellSelectionPlugin = {
 				let { start: e, end: o } = a.selected;
 				return inrange(l.x, ...[e[0], o[0]].sort((e, a) => e - a)) ? "col-range-highlight" : "";
 			});
-			return createComponent(e, mergeProps(l, {
+			return createComponent(e, mergeProps$2(l, {
 				get class() {
 					return `${l.class} ${u()}`;
 				},
@@ -83,7 +84,7 @@ const CellSelectionPlugin = {
 				let e = "", { xs: o, ys: s } = a.cellSelectionRect(), c = inrange(l.x, o[0], o[1]), u = inrange(l.y, s[0], s[1]);
 				return c && u && (e += "range-selected ", l.x == o[0] && (e += "range-selected-l "), l.x == o[1] && (e += "range-selected-r "), l.y == s[0] && (e += "range-selected-t "), l.y == s[1] && (e += "range-selected-b ")), l.col.id == a.$index?.id && u && (e += "row-range-highlight "), e;
 			});
-			return createComponent(e, mergeProps(l, {
+			return createComponent(e, mergeProps$2(l, {
 				get class() {
 					return `${l.class} ${u()}`;
 				},

package/dist/plugins/DiffPlugin.js

@@ -1,4 +1,5 @@
-import { className, createComponent, effect, memo, mergeProps, template } from "solid-js/web";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
+import { className, createComponent, effect, memo, template } from "solid-js/web";
 import { createMemo } from "solid-js";
 import { createLazyMemo } from "@solid-primitives/memo";
 import { isEqual, keyBy } from "es-toolkit";
@@ -53,14 +54,14 @@ const DiffPlugin = {
 				let { diff: e } = f.props, o = p.data[f.props.rowKey];
 				return [p.data[NEW] ? "bg-green!" : p.data[DEL] ? "bg-red!" : p.data[f.internal] ? "" : e.changed && p.data[p.col.id] != f.diffDataKeyed()[o]?.[p.col.id] ? "bg-green!" : ""].join(" ");
 			});
-			return createComponent(u, mergeProps(p, {
+			return createComponent(u, mergeProps$2(p, {
 				get class() {
 					return p.class + (m() ? " relative z-1" : "");
 				},
 				get children() {
 					return [p.children, memo(() => memo(() => !!m())() && (() => {
-						var o = _tmpl$();
-						return effect(() => className(o, m() + " absolute inset-0 z--1 op-15 pointer-events-none")), o;
+						var e = _tmpl$();
+						return effect(() => className(e, m() + " absolute inset-0 z--1 op-15 pointer-events-none")), e;
 					})())];
 				}
 			}));

package/dist/plugins/EditablePlugin.js

@@ -1,8 +1,9 @@
 import { chooseFile, resolveOptions, unFn } from "../utils.js";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { Checkbox, Files } from "./RenderPlugin/components.js";
 import Textarea_default from "../components/Textarea.js";
 import { Ctx } from "../index.js";
-import { addEventListener, createComponent, delegateEvents, effect, insert, memo, mergeProps, spread, template, use } from "solid-js/web";
+import { addEventListener, createComponent, delegateEvents, effect, insert, memo, spread, template, use } from "solid-js/web";
 import { createEffect, createMemo, createRoot, createSignal, on, onCleanup, useContext } from "solid-js";
 import { createMutable } from "solid-js/store";
 import { combineProps } from "@solid-primitives/props";
@@ -13,38 +14,38 @@ const EditablePlugin = {
 	name: "editable",
 	store: () => ({ editors: { ...editors } }),
 	rewriteProps: {
-		editable: ({ editable: e }, { store: _ }) => (y) => {
-			let b = [y.col.editable, e].filter((e) => e != null);
-			return !!b.length && b.every((e) => unFn(e, y)) && !y.data[_.internal] && !y.col[_.internal];
+		editable: ({ editable: e }, { store: g }) => (v) => {
+			let y = [v.col.editable, e].filter((e) => e != null);
+			return !!y.length && y.every((e) => unFn(e, v)) && !v.data[g.internal] && !v.col[g.internal];
 		},
-		Td: ({ Td: e }, { store: _ }) => (y) => {
-			let b, { props: x } = useContext(Ctx), [T, E] = createSignal(!1), O = "", k = () => unFn(x.editable, y), j = () => (([e, _]) => y.x == e && y.y == _)(_.selected.start || []), M = () => j() && k() && !T(), [N, P] = createSignal(!1), F = createAsyncMemo(() => {
+		Td: ({ Td: e }, { store: g }) => (y) => {
+			let b, { props: x } = useContext(Ctx), [T, E] = createSignal(!1), O = "", k = () => unFn(x.editable, y), j = () => (([e, g]) => y.x == e && y.y == g)(g.selected.start || []), M = () => j() && k() && !T(), [N, P] = createSignal(!1), F = createAsyncMemo(() => {
 				if (T()) {
-					let e = createMemo(() => JSON.stringify(_.selected ?? "{}"));
+					let e = createMemo(() => JSON.stringify(g.selected ?? "{}"));
 					createEffect(on(e, () => E(!1), { defer: !0 })), R.w = b.getBoundingClientRect().width, R.h = b.getBoundingClientRect().height;
-					let v = !1, S = y.data[y.col.id], C = ((e) => typeof e == "string" ? _.editors[e] : e)(y.col.editor ?? y.col.type ?? (y.col.enum ? "select" : "text")), w = {
+					let _ = !1, v = y.data[y.col.id], S = ((e) => typeof e == "string" ? g.editors[e] : e)(y.col.editor ?? y.col.type ?? (y.col.enum ? "select" : "text")), C = {
 						props: y.col.editorProps,
 						col: y.col,
 						eventKey: O,
 						data: y.data,
-						value: S,
+						value: v,
 						ok: async () => {
-							await I(D.getValue()), E(!1);
+							await I(w.getValue()), E(!1);
 						},
-						cancel: () => (v = !0, E(!1)),
+						cancel: () => (_ = !0, E(!1)),
 						onChange: (e) => T() && I(e).catch(() => {})
-					}, D = C(w);
-					return queueMicrotask(() => D.focus?.()), onCleanup(() => {
-						!v && D.getValue() !== S && _.commands.rowChange({
+					}, w = S(C);
+					return queueMicrotask(() => w.focus?.()), onCleanup(() => {
+						!_ && w.getValue() !== v && g.commands.rowChange({
 							...x.data[y.y],
-							[y.col.id]: D.getValue()
-						}), v || I(D.getValue()).catch(() => {}), O = "", D.destroy();
-					}), [w, D];
+							[y.col.id]: w.getValue()
+						}), _ || I(w.getValue()).catch(() => {}), O = "", w.destroy();
+					}), [C, w];
 				}
 			});
 			async function I(e) {
 				try {
-					P(!0), await _.validateCell(e, y.data, y.col);
+					P(!0), await g.validateCell(e, y.data, y.col);
 				} finally {
 					P(!1);
 				}
@@ -64,7 +65,7 @@ const EditablePlugin = {
 				onClick: () => L?.focus?.(),
 				onDblClick: () => E(k()),
 				onKeyDown: (e) => e.key == "Escape" && F()?.[0].cancel()
-			}), createComponent(e, mergeProps(y, { get children() {
+			}), createComponent(e, mergeProps$2(y, { get children() {
 				return [memo(() => memo(() => !!F()?.[1]?.el)() ? (() => {
 					var e = _tmpl$();
 					return addEventListener(e, "keydown", (e) => {
@@ -89,9 +90,9 @@ const EditablePlugin = {
 		}
 	}
 };
-var createEditor = (e, v, y) => ({ eventKey: b, value: x, col: S, ok: C, cancel: T, props: E, onChange: D }) => createRoot((T) => {
+var createEditor = (e, _, y) => ({ eventKey: b, value: x, col: S, ok: C, cancel: T, props: E, onChange: D }) => createRoot((T) => {
 	let [O, k] = createSignal(b || x), A;
-	return createComponent(e, mergeProps({
+	return createComponent(e, mergeProps$2({
 		ref: (e) => A = e,
 		class: "relative block px-2 size-full z-9 box-border resize-none outline-0",
 		get value() {
@@ -102,7 +103,7 @@ var createEditor = (e, v, y) => ({ eventKey: b, value: x, col: S, ok: C, cancel:
 		get options() {
 			return memo(() => !!S.enum)() ? resolveOptions(S.enum ?? []) : void 0;
 		}
-	}, v, E)), setTimeout(() => {
+	}, _, E)), setTimeout(() => {
 		y && A?.showPicker?.();
 	}, 0), {
 		el: A,
@@ -111,12 +112,12 @@ var createEditor = (e, v, y) => ({ eventKey: b, value: x, col: S, ok: C, cancel:
 		destroy: T
 	};
 }), Input = (e) => (() => {
-	var _ = _tmpl$4();
-	return spread(_, e, !1, !1), _;
+	var g = _tmpl$4();
+	return spread(g, e, !1, !1), g;
 })();
 const editors = {
 	text: createEditor(Input),
-	textarea: createEditor((e) => createComponent(Textarea_default, mergeProps({ autosize: {
+	textarea: createEditor((e) => createComponent(Textarea_default, mergeProps$2({ autosize: {
 		minRows: 2,
 		maxRows: 3
 	} }, e, { get class() {
@@ -130,27 +131,27 @@ const editors = {
 	color: createEditor(Input, { type: "color" }),
 	tel: createEditor(Input, { type: "tel" }),
 	password: createEditor(Input, { type: "password" }),
-	file: createEditor((_) => createComponent(Files, mergeProps(_, {
+	file: createEditor((g) => createComponent(Files, mergeProps$2(g, {
 		class: "relative z-9 outline-2 outline-blue min-h-a! h-a! p-1 bg-#fff",
-		onAdd: () => chooseFile({ multiple: !0 }).then((e) => _.onChange([..._.value || [], ...e.map((e) => ({
+		onAdd: () => chooseFile({ multiple: !0 }).then((e) => g.onChange([...g.value || [], ...e.map((e) => ({
 			name: e.name,
 			size: e.size
 		}))]))
 	}))),
 	checkbox: createEditor((e) => (() => {
-		var _ = _tmpl$5(), v = e.ref;
-		return typeof v == "function" ? use(v, _) : e.ref = _, insert(_, createComponent(Checkbox, mergeProps(e, {
+		var g = _tmpl$5(), _ = e.ref;
+		return typeof _ == "function" ? use(_, g) : e.ref = g, insert(g, createComponent(Checkbox, mergeProps$2(e, {
 			ref: () => {},
 			onInput: () => {},
 			class: "mx-3!"
-		}))), _;
+		}))), g;
 	})()),
 	select: createEditor((e) => (() => {
-		var _ = _tmpl$6();
-		return _.firstChild, spread(_, e, !1, !0), insert(_, () => e.options?.map((_) => (() => {
-			var v = _tmpl$7();
-			return insert(v, () => _.label), effect(() => v.selected = _.value === e.value), effect(() => v.value = _.value), v;
-		})()), null), _;
+		var g = _tmpl$6();
+		return g.firstChild, spread(g, e, !1, !0), insert(g, () => e.options?.map((g) => (() => {
+			var _ = _tmpl$7();
+			return insert(_, () => g.label), effect(() => _.selected = g.value === e.value), effect(() => _.value = g.value), _;
+		})()), null), g;
 	})(), {}, !0)
 };
 delegateEvents(["keydown", "input"]);

package/dist/plugins/FilterPlugin.js

@@ -1,8 +1,9 @@
 import { findret, toArr } from "../utils.js";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { useControlled } from "../hooks/useControlled.js";
 import { normalizeType } from "../components/AndOrFields.js";
 import { Filter, firstRule, isRuleNode } from "../components/Filter.js";
-import { createComponent, memo, mergeProps } from "solid-js/web";
+import { createComponent, memo } from "solid-js/web";
 import { Show, mergeProps as mergeProps$1 } from "solid-js";
 import { keyBy } from "es-toolkit";
 function isBlank(e) {
@@ -97,11 +98,11 @@ function evaluateFilterTree(e, m, h) {
 	return g.length ? m.op === "or" ? g.some((m) => evaluateFilterTree(e, m, h)) : g.every((m) => evaluateFilterTree(e, m, h)) : !0;
 }
 function passesFilters(e, m, h) {
-	let _ = keyBy(h, (e) => e.id);
+	let g = keyBy(h, (e) => e.id);
 	return evaluateFilterTree(e, {
 		op: "and",
 		children: m
-	}, (e) => normalizeType(_[e.field]));
+	}, (e) => normalizeType(g[e.field]));
 }
 const FilterPlugin = {
 	name: "filter",
@@ -136,24 +137,24 @@ const FilterPlugin = {
 			let { columns: h } = m.props, g = m.props.filter;
 			return !g.autoMatch || !g.value.some(hasActiveTree) ? e : e.filter((e) => passesFilters(e, g.value, h));
 		},
-		Th: ({ Th: m }, { store: h }) => (g) => {
-			let y = () => !!g.col.filterable && !g.col[h.internal];
-			return createComponent(m, mergeProps(g, { get children() {
-				return [memo(() => g.children), createComponent(Show, {
+		Th: ({ Th: m }, { store: g }) => (_) => {
+			let b = () => !!_.col.filterable && !_.col[g.internal];
+			return createComponent(m, mergeProps$2(_, { get children() {
+				return [memo(() => _.children), createComponent(Show, {
 					get when() {
-						return y();
+						return b();
 					},
 					get children() {
 						return createComponent(Filter, {
 							get col() {
-								return g.col;
+								return _.col;
 							},
 							get tree() {
-								return findret(h.props.filter.value, (e) => firstRule(e)?.field === g.col.id ? e : null);
+								return findret(g.props.filter.value, (e) => firstRule(e)?.field === _.col.id ? e : null);
 							},
 							setTree: (e) => {
-								let m = [...h.props.filter.value], _ = m.findIndex((e) => firstRule(e)?.field == g.col.id);
-								e ? _ > -1 ? m[_] = e : m.push(e) : _ > -1 && m.splice(_, 1), h.props.filter?.onChange?.(m);
+								let m = [...g.props.filter.value], h = m.findIndex((e) => firstRule(e)?.field == _.col.id);
+								e ? h > -1 ? m[h] = e : m.push(e) : h > -1 && m.splice(h, 1), g.props.filter?.onChange?.(m);
 							}
 						});
 					}

package/dist/plugins/RenderPlugin/index.d.ts

@@ -2,6 +2,7 @@ import { type JSX } from 'solid-js';
 import { type Plugin, type TDProps } from '../..';
 declare module '../../index' {
     interface TableProps {
+        cpu?: boolean;
     }
     interface TableColumn {
         type?: string;
@@ -17,10 +18,7 @@ declare module '../../index' {
         };
     }
 }
-export type RenderProps = TDProps & {
-    onChange: (v: any) => void;
-};
-export type Render = (props: RenderProps) => JSX.Element | any;
+export type Render = (props: TDProps) => JSX.Element | any;
 export declare const RenderPlugin: Plugin;
 export declare const renders: {
     text: Render;

package/dist/plugins/RenderPlugin/index.js

@@ -1,18 +1,17 @@
 import { renderComponent, solidComponent } from "../../components/utils.js";
 import { resolveOptions, toArr } from "../../utils.js";
+import { mergeProps as mergeProps$1 } from "../../mergeProps2.js";
 import { Checkbox, Files } from "./components.js";
-import { createComponent, insert, mergeProps, template } from "solid-js/web";
+import { createComponent, insert, template } from "solid-js/web";
 var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center h-full\">");
 const RenderPlugin = {
 	name: "render",
 	priority: -Infinity,
 	store: () => ({ renders: { ...renders } }),
-	rewriteProps: { Td: ({ Td: d }, { store: f }) => (p) => createComponent(d, mergeProps(p, { get children() {
-		return (() => {
-			let d = ((e) => typeof e == "string" ? f.renders[e] : e)(p.col.render ?? p.col.type);
-			return d ? renderComponent(d, p, f) : text(p);
-		})();
-	} })) }
+	rewriteProps: { Td: ({ Td: d }, { store: f }) => (p) => (f.props.cpu && (p = mergeProps$1(() => ({}), p)), createComponent(d, mergeProps$1(p, { children: () => {
+		let d = ((e) => typeof e == "string" ? f.renders[e] : e)(p.col.render ?? p.col.type ?? text);
+		return d == text ? text(p) : renderComponent(d, p, f);
+	} }))) }
 };
 var text = (e) => e.col.enum ? toArr(e.value).map((d) => resolveOptions(e.col.enum).find((e) => e.value == d)?.label ?? d).join(", ") : e.value;
 const renders = {

package/dist/plugins/ResizePlugin.js

@@ -1,7 +1,8 @@
 import { usePointerDrag } from "../hooks/index.js";
 import { unFn } from "../utils.js";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { Ctx } from "../index.js";
-import { className, createComponent, delegateEvents, effect, memo, mergeProps, template, use } from "solid-js/web";
+import { className, createComponent, delegateEvents, effect, memo, template, use } from "solid-js/web";
 import { batch, untrack, useContext } from "solid-js";
 import { reconcile } from "solid-js/store";
 import { clamp } from "es-toolkit";
@@ -10,35 +11,35 @@ import { defaultsDeep } from "es-toolkit/compat";
 var _tmpl$ = /* @__PURE__ */ template("<div>"), COL = Symbol("col_size"), ROW = Symbol("row_size"), findParentEl = (e, m) => {
 	for (; e = e.parentElement;) if (m(e)) return e;
 }, ColHandle = (m) => {
-	let { props: _, store: v } = useContext(Ctx), b;
-	return usePointerDrag(() => b, { start(e, h, g) {
+	let { props: h, store: v } = useContext(Ctx), y;
+	return usePointerDrag(() => y, { start(e, g, _) {
 		e.stopPropagation();
-		let y = m.x, { min: x, max: S } = _.resizable.col, C = findParentEl(b, (e) => e.tagName === "TH"), w = C.offsetWidth;
-		h((e, { ox: h }) => v[COL][m.x] = clamp(w + h, x, S)), g(() => {
-			let e = _.columns[y], m = [...v.rawProps.columns || []], h = m.findIndex((m) => m[v.ID] === e[v.ID]);
-			h > -1 && (m[h] = {
-				...m[h],
+		let b = m.x, { min: x, max: S } = h.resizable.col, C = findParentEl(y, (e) => e.tagName === "TH"), w = C.offsetWidth;
+		g((e, { ox: h }) => v[COL][m.x] = clamp(w + h, x, S)), _(() => {
+			let e = h.columns[b], m = [...v.rawProps.columns || []], g = m.findIndex((m) => m[v.ID] === e[v.ID]);
+			g > -1 && (m[g] = {
+				...m[g],
 				width: C.offsetWidth
-			}, _.onColumnsChange?.(m)), e.onWidthChange?.(C.offsetWidth);
+			}, h.onColumnsChange?.(m)), e.onWidthChange?.(C.offsetWidth);
 		});
 	} }), (() => {
 		var e = _tmpl$();
 		e.$$click = (e) => e.stopPropagation();
-		var h = b;
-		return typeof h == "function" ? use(h, e) : b = e, effect(() => className(e, `in-cell__resize-handle absolute top-0 right-0 flex justify-center w-10px! ${m.x == _.columns.length - 1 ? "justify-end!" : "w-10px! translate-x-1/2"} after:w-1 cursor-w-resize z-1`)), e;
+		var g = y;
+		return typeof g == "function" ? use(g, e) : y = e, effect(() => className(e, `in-cell__resize-handle absolute top-0 right-0 flex justify-center w-10px! ${m.x == h.columns.length - 1 ? "justify-end!" : "w-10px! translate-x-1/2"} after:w-1 cursor-w-resize z-1`)), e;
 	})();
 }, RowHandle = (m) => {
-	let { props: _, store: v } = useContext(Ctx), b;
-	return usePointerDrag(() => b, { start(e, h, g) {
+	let { props: h, store: v } = useContext(Ctx), y;
+	return usePointerDrag(() => y, { start(e, g, _) {
 		e.stopPropagation();
-		let y = m.y, { min: x, max: S } = _.resizable.row, C = findParentEl(b, (e) => e.tagName === "TD").offsetHeight;
-		h((e, { oy: h }) => v[ROW][m.y] = clamp(C + h, x, S)), g(() => {
-			let e = _.data[y];
+		let b = m.y, { min: x, max: S } = h.resizable.row, C = findParentEl(y, (e) => e.tagName === "TD").offsetHeight;
+		g((e, { oy: h }) => v[ROW][m.y] = clamp(C + h, x, S)), _(() => {
+			let e = h.data[b];
 			[...v.rawProps.data || []].findIndex((m) => m[v.ID] === e[v.ID]);
 		});
-	} }), createEventListener(() => b, "dblclick", () => m.data[COL] = void 0), (() => {
-		var e = _tmpl$(), h = b;
-		return typeof h == "function" ? use(h, e) : b = e, effect(() => className(e, `in-cell__resize-handle absolute bottom-0 left-0 flex flex-col justify-center h-1! ${m.y == _.data.length - 1 ? "justify-end!" : ""} after:h-1 cursor-s-resize z-2`)), e;
+	} }), createEventListener(() => y, "dblclick", () => m.data[COL] = void 0), (() => {
+		var e = _tmpl$(), g = y;
+		return typeof g == "function" ? use(g, e) : y = e, effect(() => className(e, `in-cell__resize-handle absolute bottom-0 left-0 flex flex-col justify-center h-1! ${m.y == h.data.length - 1 ? "justify-end!" : ""} after:h-1 cursor-s-resize z-2`)), e;
 	})();
 };
 const ResizePlugin = {
@@ -71,7 +72,7 @@ const ResizePlugin = {
 			...e,
 			width: m[COL][h]
 		} : e), untrack(() => batch(() => reconcile(e, { key: m.ID })(m.__resize__cols ??= [])))),
-		Th: ({ Th: e }, { store: m }) => (m) => createComponent(e, mergeProps(m, {
+		Th: ({ Th: e }, { store: m }) => (m) => createComponent(e, mergeProps$2(m, {
 			get class() {
 				return `relative ${m.class}`;
 			},
@@ -79,12 +80,12 @@ const ResizePlugin = {
 				return [m.children, memo(() => memo(() => !!m.col.resizable)() && createComponent(ColHandle, m))];
 			}
 		})),
-		Td: ({ Td: e }, { store: m }) => m.props?.resizable?.row.enable ? (h) => createComponent(e, mergeProps(h, {
+		Td: ({ Td: e }, { store: m }) => m.props?.resizable?.row.enable ? (g) => createComponent(e, mergeProps$2(g, {
 			get class() {
-				return `relative ${h.class}`;
+				return `relative ${g.class}`;
 			},
 			get children() {
-				return [h.children, memo(() => memo(() => !!(h.x == 0 && m.props?.resizable?.row.enable))() && createComponent(RowHandle, h))];
+				return [g.children, memo(() => memo(() => !!(g.x == 0 && m.props?.resizable?.row.enable))() && createComponent(RowHandle, g))];
 			}
 		})) : e,
 		cellStyle: ({ cellStyle: e }, { store: h }) => (g) => `${unFn(e, g)};` + (h[ROW][g.y] ? `height: ${h[ROW][g.y]}px` : "")

package/dist/plugins/RowGroupPlugin.js

@@ -1,6 +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, mergeProps, style, template } from "solid-js/web";
+import { createComponent, delegateEvents, effect, insert, memo, style, template } from "solid-js/web";
 import { batch, createMemo, useContext } from "solid-js";
 import { groupBy, zipObject } from "es-toolkit";
 import { findLast } from "es-toolkit/compat";
@@ -49,22 +50,22 @@ const RowGroupPlugin = {
 			}
 			return d;
 		},
-		Td: ({ Td: d }, { store: _ }) => _.props?.rowGroup?.fields ? (v) => {
-			if (!v.data?.[GROUP]) return d(v);
+		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(d, mergeProps(v, { get children() {
+			return createComponent(f, mergeProps$2(v, { get children() {
 				return memo(() => y.columns?.findIndex((e) => !e[_.internal]) == v.x)() ? (() => {
-					var l = _tmpl$();
-					return l.$$dblclick = () => _.rowGroup.toggleExpand(v.data), insert(l, createComponent(chevron_right_default, {
+					var e = _tmpl$();
+					return e.$$dblclick = () => _.rowGroup.toggleExpand(v.data), insert(e, createComponent(chevron_right_default, {
 						class: "icon-clickable mr-2",
 						get style() {
 							return `transform: rotate(${b() ? 90 : 0}deg); opacity: .6`;
 						},
 						onClick: () => _.rowGroup.toggleExpand(v.data)
-					}), null), insert(l, () => v.data[GROUP].value, null), effect((e) => style(l, `padding-left: ${(v.data[GROUP].path.length - 1) * 16}px`, e)), l;
+					}), 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;
 			} }));
-		} : d
+		} : f
 	}
 };
 var GROUP = Symbol("row-group"), expandData = (e, l, u = []) => {

package/dist/plugins/SortPlugin.js

@@ -1,5 +1,6 @@
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { useControlled } from "../hooks/useControlled.js";
-import { createComponent, insert, memo, mergeProps, template } from "solid-js/web";
+import { createComponent, insert, memo, template } from "solid-js/web";
 import { Show, mergeProps as mergeProps$1 } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
 var _tmpl$ = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2 class=\"w-3.5 h-3.5 opacity-50 shrink-0 flex-none ml-1\"><path stroke-linecap=round stroke-linejoin=round d=\"M8 9l4-4 4 4M16 15l-4 4-4-4\">"), _tmpl$2 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M5 15l7-7 7 7\">"), _tmpl$3 = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"fill=none stroke=currentColor stroke-width=2.5 class=\"w-3.5 h-3.5 shrink-0 flex-none ml-1\"style=color:var(--c-primary,#6366f1)><path stroke-linecap=round stroke-linejoin=round d=\"M19 9l-7 7-7-7\">"), _tmpl$4 = /* @__PURE__ */ template("<div class=\"flex items-center w-full\">");
@@ -32,11 +33,11 @@ const SortPlugin = [{
 	name: "sort",
 	priority: -1,
 	rewriteProps: {
-		sort: ({ sort: c }, { store: l }) => (c = mergeProps$1({
+		sort: ({ sort: e }, { store: l }) => (e = mergeProps$1({
 			multiple: !1,
 			autoSort: !0,
 			initialValue: []
-		}, c), l.sort ??= useControlled(c, l.owner), l.sort.$setOpt(c), l.sort),
+		}, e), l.sort ??= useControlled(e, l.owner), l.sort.$setOpt(e), l.sort),
 		data: ({ data: e }, { store: c }) => {
 			let l = c.props.sort;
 			if (!l.value?.length || !l.autoSort) return e;
@@ -46,8 +47,8 @@ const SortPlugin = [{
 	}
 }, {
 	name: "sort-th",
-	rewriteProps: { Th: ({ Th: e }, { store: f }) => (m) => {
-		let h = mergeProps$1(() => f.props.sort), g = () => !!m.col.sortable && !m.col[f.internal], _ = () => g() ? h.value.find((e) => e.field === m.col.id) : void 0, v = combineProps(m, {
+	rewriteProps: { Th: ({ Th: c }, { store: f }) => (m) => {
+		let h = mergeProps$2(() => f.props.sort), g = () => !!m.col.sortable && !m.col[f.internal], _ = () => g() ? h.value.find((e) => e.field === m.col.id) : void 0, v = combineProps(m, {
 			get class() {
 				return g() ? "cursor-pointer select-none" : "";
 			},
@@ -72,7 +73,7 @@ const SortPlugin = [{
 				h.onChange([...d]);
 			}
 		});
-		return createComponent(e, mergeProps(v, { get children() {
+		return createComponent(c, mergeProps$2(v, { get children() {
 			var e = _tmpl$4();
 			return insert(e, () => m.children, null), insert(e, createComponent(Show, {
 				get when() {

package/dist/plugins/TooltipPlugin.js

@@ -1,6 +1,7 @@
 import { renderComponent } from "../components/utils.js";
+import { mergeProps as mergeProps$2 } from "../mergeProps2.js";
 import { Tooltip } from "../components/Tooltip.js";
-import { createComponent, mergeProps } from "solid-js/web";
+import { createComponent } from "solid-js/web";
 import { Show, createSignal } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
 import { offset } from "floating-ui-solid";
@@ -11,7 +12,7 @@ const TooltipPlugin = {
 			let s = u.col.tooltip;
 			if (s != null) return typeof s == "boolean" && (s = s && u.value != null ? String(u.value) : void 0), typeof s == "function" && (s = s(u)), renderComponent(s, u, l);
 		}, [f, p] = createSignal();
-		return u = combineProps({ ref: p }, u), createComponent(c, mergeProps(u, { get children() {
+		return u = combineProps({ ref: p }, u), createComponent(c, mergeProps$2(u, { get children() {
 			return createComponent(Show, {
 				get when() {
 					return d();

package/dist/plugins/TreePlugin.js

@@ -1,6 +1,7 @@
+import { mergeProps as mergeProps$1 } from "../mergeProps2.js";
 import { useSelector } from "../hooks/useSelector.js";
 import chevron_right_default from "../chevron-right.js";
-import { createComponent, effect, insert, memo, mergeProps, style, template } from "solid-js/web";
+import { createComponent, effect, insert, memo, style, template } from "solid-js/web";
 import { createLazyMemo } from "@solid-primitives/memo";
 var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center\">"), _tmpl$2 = /* @__PURE__ */ template("<span style=display:inline-block;width:16px;flex-shrink:0;margin-right:4px>");
 function flattenTree(e, t, n, r, i = 0, a = null, o = [], s = /* @__PURE__ */ new Map()) {
@@ -21,7 +22,7 @@ const TreePlugin = (c) => {
 	let p = createLazyMemo(() => c.props.columns?.findIndex((e) => !e[c.internal]) ?? -1);
 	return {
 		name: "tree",
-		store: (t) => ({
+		store: (e) => ({
 			tree: useSelector({ multiple: !0 }),
 			_treeMeta: /* @__PURE__ */ new Map(),
 			_hasChildren: !1
@@ -36,9 +37,9 @@ const TreePlugin = (c) => {
 				let n = t.props.tree.children || "children", r = t.props.rowKey, { flat: i, meta: a } = flattenTree(e, n, r, (e) => t.tree.has(e));
 				return t._treeMeta = a, t._haschildren = Object.values(Object.fromEntries(a)).some((e) => e.hasChildren), i;
 			},
-			Td: ({ Td: e }, { store: c }) => (l) => {
+			Td: ({ Td: t }, { store: c }) => (l) => {
 				let f = () => c.props.rowKey, m = () => c._treeMeta?.get(l.data?.[f()]);
-				return createComponent(e, mergeProps(l, {
+				return createComponent(t, mergeProps$1(l, {
 					onDblClick: (e) => {
 						l.onDblClick?.(e), m()?.hasChildren && c.tree.toggle(l.data?.[f()]);
 					},

package/dist/plugins/ValidatorPlugin.js

@@ -1,5 +1,6 @@
 import { isEmpty } from "../utils.js";
-import { createComponent, insert, memo, mergeProps, template } from "solid-js/web";
+import { mergeProps as mergeProps$1 } from "../mergeProps2.js";
+import { createComponent, insert, memo, template } from "solid-js/web";
 var _tmpl$ = /* @__PURE__ */ template("<div class=cell-validation-error>"), _tmpl$2 = /* @__PURE__ */ template("<span class=\"mr-1 c-red/75\">*");
 const ValidatorPlugin = {
 	name: "validator",
@@ -56,7 +57,7 @@ const ValidatorPlugin = {
 	rewriteProps: {
 		Td: ({ Td: e }, { store: a }) => (s) => {
 			let c = () => a.cellValidationErrors[s.data[a.props.rowKey]]?.[s.col.id];
-			return createComponent(e, mergeProps(s, {
+			return createComponent(e, mergeProps$1(s, {
 				get class() {
 					return s.class + " " + (c() == null ? "" : "is-invalid");
 				},
@@ -71,8 +72,8 @@ const ValidatorPlugin = {
 				}
 			}));
 		},
-		Th: ({ Th: e }, { store: n }) => (n) => createComponent(e, mergeProps(n, { get children() {
-			return [memo(() => memo(() => !!n.col.required)() && _tmpl$2()), n.children];
+		Th: ({ Th: e }, { store: r }) => (r) => createComponent(e, mergeProps$1(r, { get children() {
+			return [memo(() => memo(() => !!r.col.required)() && _tmpl$2()), r.children];
 		} }))
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intable",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "license": "MIT",
   "type": "module",
   "files": [