intable 0.0.11 → 0.0.13

package/dist/components/Menu.js

@@ -1,5 +1,5 @@
-import { unFn } from "../utils.js";
 import { useSignle2 } from "../hooks/index.js";
+import { unFn } from "../utils.js";
 import { createRender } from "./Render.js";
 import { VDir } from "../hooks/useDir.js";
 import { Popover } from "./Popover.js";
@@ -64,13 +64,13 @@ function Menu(k) {
 					return [offset({ mainAxis: 4 })];
 				} }));
 			}), children(() => A.children), (() => {
-				var E = _tmpl$(), D = E.firstChild;
-				use(pointerHover, E, () => z);
+				var i = _tmpl$(), D = i.firstChild;
+				use(pointerHover, i, () => z);
 				var O = N;
-				return typeof O == "function" ? use(O, E) : N = E, spread(E, mergeProps(() => combineProps({ class: `li flex aic rd-2 ${M() ? "my-1 p-1" : "mx-1 pl-1 pr-4 py-1"} ${unFn(A.isActive) && "active"}` }, j), { "on:click": H }), !1, !0), insert(D, (() => {
+				return typeof O == "function" ? use(O, i) : N = i, spread(i, mergeProps(() => combineProps({ class: `li flex aic rd-2 ${M() ? "my-1 p-1" : "mx-1 pl-1 pr-4 py-1"} ${unFn(A.isActive) && "active"}` }, j), { "on:click": H }), !1, !0), insert(D, (() => {
 					var i = memo(() => !!V.loading);
 					return () => i() ? createComponent(loading_default, {}) : A.icon;
-				})()), insert(E, () => A.label, null), insert(E, (() => {
+				})()), insert(i, () => A.label, null), insert(i, (() => {
 					var i = memo(() => !!(R() && A.children));
 					return () => i() && createComponent(I, {
 						ref: L,
@@ -79,7 +79,7 @@ function Menu(k) {
 							return A.children;
 						}
 					});
-				})(), null), effect(() => className(D, `flex aic ${M() ? "" : k.density == "comfortable" ? "ml-1 mr-2.5" : "ml-.5 mr-1"} `)), E;
+				})(), null), effect(() => className(D, `flex aic ${M() ? "" : k.density == "comfortable" ? "ml-1 mr-2.5" : "ml-.5 mr-1"} `)), i;
 			})();
 		},
 		processProps: (i) => {

package/dist/index.js

@@ -1,5 +1,4 @@
 import { unFn } from "./utils.js";
-import { toReactive, useMemo, useMemoState } from "./hooks/index.js";
 import './style.css';;/* empty css      */
 /* empty css      */
 import { CellSelectionPlugin } from "./plugins/CellSelectionPlugin.js";
@@ -18,13 +17,13 @@ import { CellMergePlugin } from "./plugins/CellMergePlugin.js";
 import { TreePlugin } from "./plugins/TreePlugin.js";
 import { HeaderGroupPlugin } from "./plugins/HeaderGroup.js";
 import { createComponent, insert, memo, mergeProps, spread, template, use } from "solid-js/web";
-import { For, batch, createComputed, createContext, createEffect, createMemo, createSignal, getOwner, mapArray, mergeProps as mergeProps$1, on, onCleanup, onMount, runWithOwner, untrack, useContext } from "solid-js";
+import { $PROXY, For, batch, createComputed, createContext, createEffect, createMemo, createSignal, getOwner, mapArray, mergeProps as mergeProps$1, on, onCleanup, onMount, runWithOwner, untrack, useContext } from "solid-js";
 import { createMutable, reconcile } from "solid-js/store";
 import { combineProps } from "@solid-primitives/props";
 import { createLazyMemo } from "@solid-primitives/memo";
 import { createElementSize, createResizeObserver, makeResizeObserver } from "@solid-primitives/resize-observer";
 import { createScrollPosition } from "@solid-primitives/scroll";
-import { difference, mapValues, memoize, sumBy } from "es-toolkit";
+import { difference, isEqual, memoize, sumBy } from "es-toolkit";
 var _tmpl$ = /* @__PURE__ */ template("<table>"), _tmpl$2 = /* @__PURE__ */ template("<thead>"), _tmpl$3 = /* @__PURE__ */ template("<tbody>"), _tmpl$4 = /* @__PURE__ */ template("<tr>"), _tmpl$5 = /* @__PURE__ */ template("<th>"), _tmpl$6 = /* @__PURE__ */ template("<td>"), _tmpl$7 = /* @__PURE__ */ template("<div tabindex=-1><div class=data-table__layers></div><table class=data-table--table>");
 const Ctx = createContext({
 	props: {},
@@ -36,25 +35,28 @@ const Ctx = createContext({
 			return q;
 		},
 		get plugins() {
-			return Z();
+			return Q();
 		}
-	}), X = memoize((W) => runWithOwner(J, () => unFn(W, Y))), Z = createMemo(() => [
+	}), X = memoize((q) => runWithOwner(J, () => unFn(q, Y))), Q = createMemo(() => [
 		...defaultsPlugins,
 		...q.plugins || [],
 		RenderPlugin
-	].map(X).sort((h, W) => (W.priority || 0) - (h.priority || 0)));
-	createComputed((h) => {
-		let W = difference(Z(), h);
+	].map(X).sort((v, q) => (q.priority || 0) - (v.priority || 0)));
+	createComputed((v) => {
+		let q = difference(Q(), v);
 		return runWithOwner(J, () => {
-			W.forEach((h) => Object.assign(Y, h.store?.(Y)));
-		}), Z();
-	}, []);
-	let Q = mapArray(Z, () => createSignal());
-	Y.props = useMemoState(() => Q()[Q().length - 1][0]() || q), createComputed(mapArray(Z, (h, K) => {
-		let J = createMemo(() => Q()[K() - 1]?.[0]() || q), X = mergeProps$1(J, toReactive(mapValues(h.rewriteProps || {}, (h) => useMemo(() => h(J(), { store: Y })))));
-		Q()[K()][1](X);
-	})), onMount(() => {
-		createEffect(mapArray(Z, (h) => h.onMount?.(Y)));
+			q.forEach((v) => Object.assign(Y, v.store?.(Y)));
+		}), Q();
+	}, []), Y.props = (() => {
+		let v = getOwner(), J = {}, X = (q) => J[q] ??= runWithOwner(v, () => createMemo(() => Z(q)));
+		function Z(v) {
+			return createMemo(() => Q().map((q) => q.rewriteProps?.[v]).filter((v) => v), void 0, { equals: isEqual })().reduce((q, J) => J({ [v]: q }, { store: Y }), q[v]);
+		}
+		return new Proxy({}, { get(v, q, J) {
+			return q == $PROXY ? J : X(q)();
+		} });
+	})(), onMount(() => {
+		createEffect(mapArray(Q, (v) => v.onMount?.(Y)));
 	});
 	let $ = createMutable({
 		props: Y.props,
@@ -70,61 +72,61 @@ const Ctx = createContext({
 	});
 };
 var THead = () => {
-	let { props: h } = useContext(Ctx);
-	return createComponent(h.Thead, { get children() {
-		return createComponent(h.Tr, { get children() {
-			return createComponent(h.EachCells, {
+	let { props: v } = useContext(Ctx);
+	return createComponent(v.Thead, { get children() {
+		return createComponent(v.Tr, { get children() {
+			return createComponent(v.EachCells, {
 				get each() {
-					return h.columns || [];
+					return v.columns || [];
 				},
-				children: (W, G) => createComponent(h.Th, {
+				children: (q, J) => createComponent(v.Th, {
 					get col() {
-						return W();
+						return q();
 					},
 					get x() {
-						return G();
+						return J();
 					},
 					get children() {
-						return W().name;
+						return q().name;
 					}
 				})
 			});
 		} });
 	} });
 }, TBody = () => {
-	let { props: h } = useContext(Ctx);
-	return createComponent(h.Tbody, { get children() {
-		return createComponent(h.EachRows, {
+	let { props: v } = useContext(Ctx);
+	return createComponent(v.Tbody, { get children() {
+		return createComponent(v.EachRows, {
 			get each() {
-				return h.data;
+				return v.data;
 			},
-			children: (W, G) => createComponent(h.Tr, {
+			children: (q, J) => createComponent(v.Tr, {
 				get y() {
-					return G();
+					return J();
 				},
 				get data() {
-					return W();
+					return q();
 				},
 				get children() {
-					return createComponent(h.EachCells, {
+					return createComponent(v.EachCells, {
 						get each() {
-							return h.columns;
+							return v.columns;
 						},
-						children: (K, q) => createComponent(h.Td, {
+						children: (Y, X) => createComponent(v.Td, {
 							get col() {
-								return K();
+								return Y();
 							},
 							get x() {
-								return q();
+								return X();
 							},
 							get y() {
-								return G();
+								return J();
 							},
 							get data() {
-								return W();
+								return q();
 							},
 							get children() {
-								return W()[K().id];
+								return q()[Y().id];
 							}
 						})
 					});
@@ -134,52 +136,52 @@ var THead = () => {
 	} });
 }, src_default = Intable;
 function BasePlugin() {
-	let W = {
+	let q = {
 		col: null,
 		data: null
-	}, G = (h) => (() => {
-		var W = _tmpl$();
-		return spread(W, h, !1, !1), W;
-	})(), K = (h) => (() => {
-		var W = _tmpl$2();
-		return spread(W, h, !1, !1), W;
-	})(), q = (h) => (() => {
-		var W = _tmpl$3();
-		return spread(W, h, !1, !1), W;
-	})(), J = (h) => (() => {
-		var G = _tmpl$4();
-		return spread(G, mergeProps(h, W), !1, !1), G;
-	})(), Y = (h) => (() => {
-		var G = _tmpl$5();
-		return spread(G, mergeProps(h, W), !1, !1), G;
-	})(), X = (h) => (() => {
-		var G = _tmpl$6();
-		return spread(G, mergeProps(h, W), !1, !1), G;
+	}, J = (v) => (() => {
+		var q = _tmpl$();
+		return spread(q, v, !1, !1), q;
+	})(), Y = (v) => (() => {
+		var q = _tmpl$2();
+		return spread(q, v, !1, !1), q;
+	})(), X = (v) => (() => {
+		var q = _tmpl$3();
+		return spread(q, v, !1, !1), q;
+	})(), Z = (v) => (() => {
+		var J = _tmpl$4();
+		return spread(J, mergeProps(v, q), !1, !1), J;
+	})(), Q = (v) => (() => {
+		var J = _tmpl$5();
+		return spread(J, mergeProps(v, q), !1, !1), J;
+	})(), $ = (v) => (() => {
+		var J = _tmpl$6();
+		return spread(J, mergeProps(v, q), !1, !1), J;
 	})();
 	return {
 		name: "base",
 		priority: Infinity,
-		store: (h) => {
-			let W = makeResizeObserver((W) => {
-				for (let G of W) {
-					let W = G.target, { inlineSize: K, blockSize: q } = G.borderBoxSize[0], J = h.ths.indexOf(W);
-					J >= 0 && W.parentElement && (h.thSizes[J] = {
-						width: K,
-						height: q
+		store: (v) => {
+			let q = makeResizeObserver((q) => {
+				for (let J of q) {
+					let q = J.target, { inlineSize: Y, blockSize: X } = J.borderBoxSize[0], Z = v.ths.indexOf(q);
+					Z >= 0 && q.parentElement && (v.thSizes[Z] = {
+						width: Y,
+						height: X
 					});
 				}
-			}), G = makeResizeObserver((W) => {
-				for (let G of W) {
-					let W = G.target, { inlineSize: K, blockSize: q } = G.borderBoxSize[0], J = h.trs.indexOf(W);
-					J >= 0 && W.parentElement && (h.trSizes[J] = {
-						width: K,
-						height: q
+			}), J = makeResizeObserver((q) => {
+				for (let J of q) {
+					let q = J.target, { inlineSize: Y, blockSize: X } = J.borderBoxSize[0], Z = v.trs.indexOf(q);
+					Z >= 0 && q.parentElement && (v.trSizes[Z] = {
+						width: Y,
+						height: X
 					});
 				}
 			});
 			return {
-				thObs: W,
-				trObs: G,
+				thObs: q,
+				trObs: J,
 				ths: [],
 				thSizes: [],
 				trs: [],
@@ -190,177 +192,177 @@ function BasePlugin() {
 			};
 		},
 		rewriteProps: {
-			data: ({ data: h = [] }) => h,
-			columns: ({ columns: h = [] }) => h,
-			newRow: ({ newRow: h = () => ({}) }) => h,
-			Table: ({ Table: h = G }, { store: W }) => (W) => {
-				let [G, K] = createSignal(), { props: q } = useContext(Ctx);
-				return W = combineProps({
-					ref: K,
+			data: ({ data: v = [] }) => v,
+			columns: ({ columns: v = [] }) => v,
+			newRow: ({ newRow: v = () => ({}) }) => v,
+			Table: ({ Table: v = J }, { store: q }) => (q) => {
+				let [J, Y] = createSignal(), { props: X } = useContext(Ctx);
+				return q = combineProps({
+					ref: Y,
 					get class() {
-						return `data-table ${q.class} ${q.border && "data-table--border"} data-table--${q.size}`;
+						return `data-table ${X.class} ${X.border && "data-table--border"} data-table--${X.size}`;
 					},
 					get style() {
-						return q.style;
+						return X.style;
 					}
-				}, W), createComponent(h, W);
+				}, q), createComponent(v, q);
 			},
-			Thead: ({ Thead: h = K }, { store: W }) => (G) => (G = combineProps({ ref: (h) => W.thead = h }, G), createComponent(h, G)),
-			Tbody: ({ Tbody: h = q }, { store: W }) => (G) => (G = combineProps({ ref: (h) => W.tbody = h }, G), createComponent(h, G)),
-			Tr: ({ Tr: h = J }, { store: W }) => (G) => {
-				let [K, q] = createSignal();
-				return G = combineProps({ ref: q }, G), createEffect(() => {
-					let { y: h } = G;
-					h != null && (W.trs[h] = K(), W.trObs.observe(K()), onCleanup(() => {
-						W.trSizes[h] = W.trs[h] = void 0, W.trObs.unobserve(K());
+			Thead: ({ Thead: v = Y }, { store: q }) => (J) => (J = combineProps({ ref: (v) => q.thead = v }, J), createComponent(v, J)),
+			Tbody: ({ Tbody: v = X }, { store: q }) => (J) => (J = combineProps({ ref: (v) => q.tbody = v }, J), createComponent(v, J)),
+			Tr: ({ Tr: v = Z }, { store: q }) => (J) => {
+				let [Y, X] = createSignal();
+				return J = combineProps({ ref: X }, J), createEffect(() => {
+					let { y: v } = J;
+					v != null && (q.trs[v] = Y(), q.trObs.observe(Y()), onCleanup(() => {
+						q.trSizes[v] = q.trs[v] = void 0, q.trObs.unobserve(Y());
 					}));
-				}), createComponent(h, G);
+				}), createComponent(v, J);
 			},
-			Th: ({ Th: W = Y }, { store: G }) => (K) => {
-				let [q, J] = createSignal(), { props: Y } = useContext(Ctx), X = combineProps(K, { ref: J }, {
+			Th: ({ Th: q = Q }, { store: J }) => (Y) => {
+				let [X, Z] = createSignal(), { props: Q } = useContext(Ctx), $ = combineProps(Y, { ref: Z }, {
 					get class() {
-						return unFn(Y.cellClass, K);
+						return unFn(Q.cellClass, Y);
 					},
 					get style() {
-						return unFn(Y.cellStyle, K);
+						return unFn(Q.cellStyle, Y);
 					}
 				}, {
 					get class() {
-						return K.col.class;
+						return Y.col.class;
 					},
 					get style() {
-						return K.col.style;
+						return Y.col.style;
 					}
 				}, { get style() {
-					return K.col.width ? `width: ${K.col.width}px` : "";
+					return Y.col.width ? `width: ${Y.col.width}px` : "";
 				} });
 				return createEffect(() => {
-					if (K.covered || (K.colspan ?? 1) != 1) return;
-					let { x: h } = K;
-					G.ths[h] = q(), G.thObs.observe(q()), onCleanup(() => {
-						G.thSizes[h] = G.ths[h] = void 0, G.thObs.unobserve(q());
+					if (Y.covered || (Y.colspan ?? 1) != 1) return;
+					let { x: v } = Y;
+					J.ths[v] = X(), J.thObs.observe(X()), onCleanup(() => {
+						J.thSizes[v] = J.ths[v] = void 0, J.thObs.unobserve(X());
 					});
-				}), createComponent(W, mergeProps(X, { get children() {
-					return K.children;
+				}), createComponent(q, mergeProps($, { get children() {
+					return Y.children;
 				} }));
 			},
-			Td: ({ Td: W = X }, { store: G }) => (G) => {
-				let { props: K } = useContext(Ctx), q = combineProps(G, {
+			Td: ({ Td: q = $ }, { store: J }) => (J) => {
+				let { props: Y } = useContext(Ctx), X = combineProps(J, {
 					get class() {
-						return unFn(K.cellClass, G);
+						return unFn(Y.cellClass, J);
 					},
 					get style() {
-						return unFn(K.cellStyle, G);
+						return unFn(Y.cellStyle, J);
 					}
 				}, {
 					get class() {
-						return G.col.class;
+						return J.col.class;
 					},
 					get style() {
-						return G.col.style;
+						return J.col.style;
 					}
 				}, { get style() {
-					return G.col.width ? `width: ${G.col.width}px` : "";
+					return J.col.width ? `width: ${J.col.width}px` : "";
 				} });
-				return createComponent(W, mergeProps(q, { get children() {
-					return G.children;
+				return createComponent(q, mergeProps(X, { get children() {
+					return J.children;
 				} }));
 			},
-			EachRows: ({ EachRows: h }) => h || ((h) => createComponent(For, {
+			EachRows: ({ EachRows: v }) => v || ((v) => createComponent(For, {
 				get each() {
-					return h.each;
+					return v.each;
 				},
-				children: (W, G) => h.children(() => W, G)
+				children: (q, J) => v.children(() => q, J)
 			})),
-			EachCells: ({ EachCells: h }) => h || ((h) => createComponent(For, {
+			EachCells: ({ EachCells: v }) => v || ((v) => createComponent(For, {
 				get each() {
-					return h.each;
+					return v.each;
 				},
-				children: (W, G) => h.children(() => W, G)
+				children: (q, J) => v.children(() => q, J)
 			})),
-			renderer: ({ renderer: h = (h) => h }) => h
+			renderer: ({ renderer: v = (v) => v }) => v
 		}
 	};
 }
 var IndexPlugin = {
 	name: "index",
 	priority: -Infinity,
-	store: (h) => ({ $index: {
+	store: (v) => ({ $index: {
 		name: "",
 		id: Symbol("index"),
 		fixed: "left",
-		[h.internal]: 1,
+		[v.internal]: 1,
 		width: 40,
 		style: "text-align: center",
 		class: "index",
-		render: solidComponent((h) => memo(() => h.y + 1))
+		render: solidComponent((v) => memo(() => v.y + 1))
 	} }),
-	rewriteProps: { columns: ({ columns: h }, { store: W }) => W.props?.index ? [W.$index, ...h || []] : h }
+	rewriteProps: { columns: ({ columns: v }, { store: q }) => q.props?.index ? [q.$index, ...v || []] : v }
 }, StickyHeaderPlugin = {
 	name: "sticky-header",
-	rewriteProps: { Thead: ({ Thead: h }) => (W) => {
-		let { props: G } = useContext(Ctx);
-		return W = combineProps({ get class() {
-			return G.stickyHeader ? "sticky-header" : "";
-		} }, W), createComponent(h, W);
+	rewriteProps: { Thead: ({ Thead: v }) => (q) => {
+		let { props: J } = useContext(Ctx);
+		return q = combineProps({ get class() {
+			return J.stickyHeader ? "sticky-header" : "";
+		} }, q), createComponent(v, q);
 	} }
-}, FixedColumnPlugin = (W) => {
-	let G = createLazyMemo(() => {
-		let h = {};
-		for (let [G, K] of W.props.columns.entries()) K.fixed === "left" && (h[G] = sumBy(W.thSizes.slice(0, G), (h) => h?.width || 0)), K.fixed === "right" && (h[G] = sumBy(W.thSizes.slice(G + 1), (h) => h?.width || 0));
-		return h;
-	}), K = createLazyMemo(() => W.props.columns.filter((h) => h.fixed == "left").length - 1), q = createLazyMemo(() => W.props.columns.length - W.props.columns.filter((h) => h.fixed == "right").length);
+}, FixedColumnPlugin = (q) => {
+	let J = createLazyMemo(() => {
+		let v = {};
+		for (let [J, Y] of q.props.columns.entries()) Y.fixed === "left" && (v[J] = sumBy(q.thSizes.slice(0, J), (v) => v?.width || 0)), Y.fixed === "right" && (v[J] = sumBy(q.thSizes.slice(J + 1), (v) => v?.width || 0));
+		return v;
+	}), Y = createLazyMemo(() => q.props.columns.filter((v) => v.fixed == "left").length - 1), X = createLazyMemo(() => q.props.columns.length - q.props.columns.filter((v) => v.fixed == "right").length);
 	return {
 		name: "fixed-column",
 		rewriteProps: {
-			columns: ({ columns: h }) => [
-				...h?.filter((h) => h.fixed == "left") || [],
-				...h?.filter((h) => !h.fixed) || [],
-				...h?.filter((h) => h.fixed == "right") || []
+			columns: ({ columns: v }) => [
+				...v?.filter((v) => v.fixed == "left") || [],
+				...v?.filter((v) => !v.fixed) || [],
+				...v?.filter((v) => v.fixed == "right") || []
 			],
-			cellClass: ({ cellClass: W }) => (G) => (unFn(W, G) || "") + (G.col.fixed ? ` fixed-${G.col.fixed} ${G.x == K() ? "is-last" : ""} ${G.x == q() ? "is-first" : ""}` : ""),
-			cellStyle: ({ cellStyle: W }) => (K) => (unFn(W, K) || "") + (K.col.fixed ? `; ${K.col.fixed}: ${G()[K.x]}px` : "")
+			cellClass: ({ cellClass: q }) => (J) => (unFn(q, J) || "") + (J.col.fixed ? ` fixed-${J.col.fixed} ${J.x == Y() ? "is-last" : ""} ${J.x == X() ? "is-first" : ""}` : ""),
+			cellStyle: ({ cellStyle: q }) => (Y) => (unFn(q, Y) || "") + (Y.col.fixed ? `; ${Y.col.fixed}: ${J()[Y.x]}px` : "")
 		}
 	};
-}, FitColWidthPlugin = (h) => {
-	let W = createMutable({ width: 0 });
-	createResizeObserver(() => h.scroll_el, (h, G, K) => W.width = K.contentBoxSize[0].inlineSize);
-	let G = createMutable([]), K = !1;
-	return createEffect(on(() => [W.width, h.props.columns.map((h) => h.width)], async () => {
-		if (!W.width || K) return;
-		G.length = 0, K = !0, await Promise.resolve();
-		let q = (W.width - h.table.getBoundingClientRect().width) / h.props.columns.filter((h) => !h.width).length, J = h.props.columns.map((W, G) => W.width ? null : { width: Math.max((h.ths[G]?.getBoundingClientRect().width || 0) + q, 80) });
-		G.push(...J), K = !1;
+}, FitColWidthPlugin = (v) => {
+	let q = createMutable({ width: 0 });
+	createResizeObserver(() => v.scroll_el, (v, J, Y) => q.width = Y.contentBoxSize[0].inlineSize);
+	let J = createMutable([]), Y = !1;
+	return createEffect(on(() => [q.width, v.props.columns.map((v) => v.width)], async () => {
+		if (!q.width || Y) return;
+		J.length = 0, Y = !0, await Promise.resolve();
+		let X = (q.width - v.table.getBoundingClientRect().width) / v.props.columns.filter((v) => !v.width).length, Z = v.props.columns.map((q, J) => q.width ? null : { width: Math.max((v.ths[J]?.getBoundingClientRect().width || 0) + X, 80) });
+		J.push(...Z), Y = !1;
 	})), {
 		name: "fit-col-width",
 		priority: -Infinity,
-		rewriteProps: { columns: ({ columns: h }, { store: W }) => (h = h.map((h, K) => ({
-			...h,
-			...G?.[K],
-			[W.ID]: h[W.ID] ??= Symbol()
-		})), untrack(() => batch(() => reconcile(h, { key: W.ID })(W.__fit_col_width__cols ??= [])))) }
+		rewriteProps: { columns: ({ columns: v }, { store: q }) => (v = v.map((v, Y) => ({
+			...v,
+			...J?.[Y],
+			[q.ID]: v[q.ID] ??= Symbol()
+		})), untrack(() => batch(() => reconcile(v, { key: q.ID })(q.__fit_col_width__cols ??= [])))) }
 	};
 };
 const ScrollPlugin = {
 	name: "scroll",
 	priority: Infinity,
-	rewriteProps: { Table: (h, { store: W }) => (h) => {
-		let G = createScrollPosition(() => W.scroll_el), K = createElementSize(() => W.scroll_el), q = createMemo(() => {
-			let h = W.scroll_el;
-			if (!h) return;
-			let q = G.x == 0, J = G.x >= h.scrollWidth - (K.width || 0);
-			return q && J ? "" : !q && !J ? "is-scroll-mid" : q ? "is-scroll-left" : J ? "is-scroll-right" : "";
+	rewriteProps: { Table: (v, { store: q }) => (v) => {
+		let J = createScrollPosition(() => q.scroll_el), Y = createElementSize(() => q.scroll_el), X = createMemo(() => {
+			let v = q.scroll_el;
+			if (!v) return;
+			let X = J.x == 0, Z = J.x >= v.scrollWidth - (Y.width || 0);
+			return X && Z ? "" : !X && !Z ? "is-scroll-mid" : X ? "is-scroll-left" : Z ? "is-scroll-right" : "";
 		});
-		h = combineProps(h, {
-			ref: (h) => W.scroll_el = h,
+		v = combineProps(v, {
+			ref: (v) => q.scroll_el = v,
 			class: "data-table--scroll-view"
 		}, { get class() {
-			return q();
+			return X();
 		} });
-		let J = mapArray(() => W.plugins.flatMap((h) => h.layers ?? []), (h) => createComponent(h, W));
+		let Z = mapArray(() => q.plugins.flatMap((v) => v.layers ?? []), (v) => createComponent(v, q));
 		return (() => {
-			var G = _tmpl$7(), K = G.firstChild, q = K.nextSibling;
-			return spread(G, h, !1, !0), insert(K, J), use((h) => W.table = h, q), insert(q, () => h.children), G;
+			var J = _tmpl$7(), Y = J.firstChild, X = Y.nextSibling;
+			return spread(J, v, !1, !0), insert(Y, Z), use((v) => q.table = v, X), insert(X, () => v.children), J;
 		})();
 	} }
 }, defaultsPlugins = [

package/dist/plugins/DiffPlugin.js

@@ -51,7 +51,7 @@ const DiffPlugin = {
 				}
 				if (i) return e;
 			}
-			return diffArrays(s, e, { comparator: (e, i) => e[a] == i[a] }).flatMap((e) => e.added ? e.value.map((e) => (e[NEW] = 1, e)) : e.removed ? o.removed ? e.value.map((e) => ({
+			return diffArrays(s, e, { comparator: (e, i) => e == i || e[a] == i[a] }).flatMap((e) => e.added ? e.value.map((e) => (e[NEW] = 1, e)) : e.removed ? o.removed ? e.value.map((e) => ({
 				...e,
 				[DEL]: 1,
 				[i.internal]: 1

package/dist/plugins/MenuPlugin.js

@@ -1,6 +1,6 @@
+import { useMemoAsync } from "../hooks/index.js";
 import { findParent } from "../tree.js";
 import "../utils.js";
-import { useMemoAsync } from "../hooks/index.js";
 import { Menu } from "../components/Menu.js";
 import { createComponent, memo, mergeProps } from "solid-js/web";
 import { batch, createMemo, createSignal, mapArray } from "solid-js";
@@ -12,7 +12,7 @@ const MenuPlugin = {
 	name: "menu",
 	priority: Infinity,
 	store: (e) => ({}),
-	rewriteProps: { Table: ({ Table: e }, { store: s }) => (f) => {
+	rewriteProps: { Table: ({ Table: n }, { store: s }) => (f) => {
 		let [p, g] = createSignal(), _ = mapArray(() => s.plugins || [], (e) => createMemo(() => e.menus?.(s))), v = createMemo(() => _().flatMap((e) => e() || [])), [y, b] = createSignal();
 		function x(e) {
 			e.preventDefault(), b({
@@ -43,7 +43,7 @@ const MenuPlugin = {
 		return f = combineProps({
 			tabindex: -1,
 			onContextMenu: x
-		}, f), createComponent(e, mergeProps(f, { get children() {
+		}, f), createComponent(n, mergeProps(f, { get children() {
 			return [memo(() => memo(() => !!y())() && createComponent(Menu, {
 				ref: g,
 				get style() {
@@ -70,28 +70,28 @@ const MenuPlugin = {
 			cb: () => e.commands.deleteRows(range(...((e) => [e[0], e[1] + 1])([e.selected.start[1], e.selected.end[1]].sort((e, n) => e - n))))
 		}
 	],
-	commands: (n) => ({
+	commands: (e) => ({
 		rowEquals(e, n) {
 			return e == n;
 		},
-		rowIndexOf(e, r) {
-			return e.findIndex((e) => n.commands.rowEquals(e, r));
+		rowIndexOf(n, r) {
+			return n.findIndex((n) => e.commands.rowEquals(n, r));
 		},
-		rowChange(e, r) {
-			let i = [...n.rawProps.data || []];
-			r = r == null ? n.commands.rowIndexOf(i, e) : i.findIndex((e) => e == n.props.data[r]), r > -1 && (i[r] = e, n.props.onDataChange?.(i));
+		rowChange(n, r) {
+			let i = [...e.rawProps.data || []];
+			r = r == null ? e.commands.rowIndexOf(i, n) : i.findIndex((n) => n == e.props.data[r]), r > -1 && (i[r] = n, e.props.onDataChange?.(i));
 		},
-		addRows(e, r, i = !0) {
-			addRows(n, e, r, i);
+		addRows(n, r, i = !0) {
+			addRows(e, n, r, i);
 		},
-		deleteRows(e) {
-			let { rowKey: r, data: i } = n.props, a = [...n.rawProps.data || []], o = new Set(e.map((e) => i[e]));
-			remove(a, (e) => o.has(e)), n.props?.onDataChange?.(a);
+		deleteRows(n) {
+			let { rowKey: r, data: i } = e.props, a = [...e.rawProps.data || []], o = new Set(n.map((e) => i[e]));
+			remove(a, (e) => o.has(e)), e.props?.onDataChange?.(a);
 		},
 		moveRows(r, i) {
-			let { data: a } = n.props, o = r.map((e) => a[e]).filter((e) => e && !e?.[n.internal]);
+			let { data: a } = e.props, o = r.map((e) => a[e]).filter((n) => n && !n?.[e.internal]);
 			if (!o.length) return;
-			let s = i >= 0 && i < a.length ? a[i] : null, { rowKey: c } = n.props, l = n.props.tree?.children || Symbol(), u = new Set(o.map((e) => e[c])), d = [];
+			let s = i >= 0 && i < a.length ? a[i] : null, { rowKey: c } = e.props, l = e.props.tree?.children || Symbol(), u = new Set(o.map((e) => e[c])), d = [];
 			function f(e) {
 				return e.reduce((e, n) => {
 					if (u.has(n[c])) return d.push(n), e;
@@ -105,12 +105,12 @@ const MenuPlugin = {
 					return e.push(n), e;
 				}, []);
 			}
-			let p = f([...n.rawProps.data || []]), m = findParent(p, (e) => e[c] === s?.[c])?.children ?? p, h = s ? m.findIndex((e) => e[c] === s[c]) : -1;
-			if (h > -1 ? m.splice(h, 0, d) : m.push(...d), n.selected) {
-				let e = Math.max(0, i - o.length);
-				n.selected.start = [0, e], n.selected.end = [Infinity, e + d.length - 1];
+			let p = f([...e.rawProps.data || []]), m = findParent(p, (e) => e[c] === s?.[c])?.children ?? p, h = s ? m.findIndex((e) => e[c] === s[c]) : -1;
+			if (h > -1 ? m.splice(h, 0, d) : m.push(...d), e.selected) {
+				let n = Math.max(0, i - o.length);
+				e.selected.start = [0, n], e.selected.end = [Infinity, n + d.length - 1];
 			}
-			n.props?.onDataChange?.(p);
+			e.props?.onDataChange?.(p);
 		}
 	})
 };

package/dist/plugins/ResizePlugin.js

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

package/dist/utils.js

@@ -1,5 +1,5 @@
-import { tree_exports } from "./tree.js";
 import { useMemoAsync } from "./hooks/index.js";
+import { tree_exports } from "./tree.js";
 import { delay, isFunction, isPlainObject, isPromise } from "es-toolkit";
 function file2base64(e) {
 	return new Promise((y, b) => {
@@ -51,8 +51,8 @@ async function findAsync(e, y) {
 	for (let b = 0; b < e.length; b++) if (await y(e[b], b)) return e[b];
 }
 var cache = /* @__PURE__ */ new WeakMap();
-function resolveOptions(e) {
-	let b = e;
+function resolveOptions(y) {
+	let b = y;
 	return isFunction(b) && (b = b()), isPromise(b) ? (cache.has(b) || cache.set(b, useMemoAsync(() => b.then((e) => e.map((e) => resolveOptions(e))))), cache.get(b)()) : (isPlainObject(b) && (b = Object.entries(b).map(([e, y]) => ({
 		value: e,
 		label: y,

package/package.json

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