intable 0.0.22 → 0.0.23

package/dist/components/Filter.js

@@ -0,0 +1,97 @@
+import { Popover } from "./Popover.js";
+import { AndOrFields, RuleValueEditor, isValueFreeOp, newRule } from "./AndOrFields.js";
+import filter_default from "../filter.js";
+import { addEventListener, className, createComponent, delegateEvents, effect, insert, template, use } from "solid-js/web";
+import { Show } from "solid-js";
+import { isEqual } from "es-toolkit";
+import { autoPlacement, offset } from "floating-ui-solid";
+var _tmpl$ = /* @__PURE__ */ template("<div class=\"mt-1 flex gap-1.5\"><button aria-label=筛选 title=筛选>"), _tmpl$2 = /* @__PURE__ */ template("<div class=\"filter-input min-w-24 op-60 select-none\">"), _tmpl$3 = /* @__PURE__ */ template("<div class=\"tt-menu p-4! z-2\">");
+function isRuleNode(e) {
+	return e ? "field" in e : !1;
+}
+function firstRule(e) {
+	if (e) {
+		if (isRuleNode(e)) return e;
+		for (let _ of e.children ?? []) {
+			let e = firstRule(_);
+			if (e) return e;
+		}
+	}
+}
+const Filter = (y) => {
+	let b, x = () => y.tree, C = () => firstRule(x()), w = () => isValueFreeOp(C()?.op), T = (e) => {
+		if (isEqual({
+			...x(),
+			value: e
+		}, newRule(y.col))) {
+			y.setTree();
+			return;
+		}
+		if (!x()) {
+			y.setTree(newRule(y.col, { value: e }));
+			return;
+		}
+		let _ = firstRule(x());
+		_ && (_.value = e);
+	};
+	return (() => {
+		var v = _tmpl$(), S = v.firstChild;
+		v.$$click = (e) => e.stopPropagation(), addEventListener(v, "pointerdown", (e) => e.stopPropagation()), addEventListener(v, "keydown", (e) => e.stopPropagation()), insert(v, createComponent(Show, {
+			get when() {
+				return !w();
+			},
+			get fallback() {
+				return _tmpl$2();
+			},
+			get children() {
+				return createComponent(RuleValueEditor, {
+					get field() {
+						return y.col;
+					},
+					get op() {
+						return C()?.op;
+					},
+					class: "filter-input",
+					get value() {
+						return C()?.value ?? "";
+					},
+					get enum() {
+						return y.col.enum;
+					},
+					onChange: (e) => T(String(e ?? ""))
+				});
+			}
+		}), S);
+		var E = b;
+		return typeof E == "function" ? use(E, S) : b = S, insert(S, createComponent(filter_default, { class: "size-3.5 op-75" })), insert(v, createComponent(Popover, {
+			trigger: "click",
+			strategy: "fixed",
+			placement: "bottom",
+			get middleware() {
+				return [offset({ mainAxis: 6 }), autoPlacement({
+					boundary: document.body,
+					alignment: "start"
+				})];
+			},
+			reference: b,
+			get floating() {
+				return (() => {
+					var e = _tmpl$3();
+					return insert(e, createComponent(AndOrFields, {
+						get fields() {
+							return [y.col];
+						},
+						get value() {
+							return x() ?? newRule(y.col);
+						},
+						onChange: (e) => y.setTree(isEqual(e, newRule(y.col)) ? void 0 : e),
+						newRule: () => newRule(y.col),
+						hideFields: !0
+					})), e;
+				})();
+			}
+		}), null), effect(() => className(S, `filter-input w-a! flex items-center justify-center ${x() && "bg-blue/20! c-blue b-#00000000!"}`)), v;
+	})();
+};
+delegateEvents(["click"]);
+export { Filter };

package/dist/filter.js

@@ -0,0 +1,6 @@
+import { spread, template } from "solid-js/web";
+var _tmpl$ = /* @__PURE__ */ template("<svg viewBox=\"0 0 24 24\"width=1.2em height=1.2em><path fill=none stroke=currentColor stroke-linecap=round stroke-linejoin=round stroke-width=2 d=\"M22 3H2l8 9.46V19l4 2v-8.54z\">"), filter_default = (n = {}) => (() => {
+	var r = _tmpl$();
+	return spread(r, n, !0, !0), r;
+})();
+export { filter_default as default };

package/dist/hooks/index.js

@@ -111,7 +111,10 @@ function useMouseDown(h) {
 }
 function useClicked(h) {
 	let [B, V] = createSignal(!1), H = () => castArray(access(h));
-	return createEventListener(() => H().map((h) => h?.getRootNode()), "click", (h) => V(H().some((B) => B?.contains(h.target)))), B;
+	return createEventListener(() => H().map((h) => h?.getRootNode()), "click", (h) => {
+		let B = h.composedPath();
+		V(H().some((h) => B.includes(h)));
+	}), B;
 }
 function useMutation(h, B, V) {
 	let H = createSignal(V());

package/dist/hooks/useVirtualizer.js

@@ -1,96 +1,92 @@
+import { throttlePromise } from "../utils.js";
 import { createComputed, createMemo, createSignal, mergeProps, untrack } from "solid-js";
 import { createElementSize } from "@solid-primitives/resize-observer";
 import { createScrollPosition } from "@solid-primitives/scroll";
-import { uniqBy } from "es-toolkit";
+import { keyBy, uniqBy } from "es-toolkit";
 var FenwickTree = class e {
 	constructor(e) {
 		this.n = e, this.tree = new Float64Array(e + 1);
 	}
-	add(e, a) {
-		for (e += 1; e <= this.n; e += e & -e) this.tree[e] += a;
+	add(e, s) {
+		for (e += 1; e <= this.n; e += e & -e) this.tree[e] += s;
 	}
 	sum(e) {
-		let a = 0;
-		for (e += 1; e > 0; e -= e & -e) a += this.tree[e];
-		return a;
+		let s = 0;
+		for (e += 1; e > 0; e -= e & -e) s += this.tree[e];
+		return s;
 	}
 	total() {
 		return this.n > 0 ? this.sum(this.n - 1) : 0;
 	}
 	findByOffset(e) {
-		let a = 0;
-		for (let o = 1 << Math.floor(Math.log2(this.n || 1)); o > 0; o >>= 1) a + o <= this.n && this.tree[a + o] <= e && (a += o, e -= this.tree[a]);
-		return Math.min(a, this.n - 1);
+		let s = 0;
+		for (let c = 1 << Math.floor(Math.log2(this.n || 1)); c > 0; c >>= 1) s + c <= this.n && this.tree[s + c] <= e && (s += c, e -= this.tree[s]);
+		return Math.min(s, this.n - 1);
 	}
-	static build(a) {
-		let o = a.length, s = new e(o);
-		for (let e = 0; e < o; e++) {
-			s.tree[e + 1] += a[e];
-			let c = e + 1 + (e + 1 & -(e + 1));
-			c <= o && (s.tree[c] += s.tree[e + 1]);
+	static build(s) {
+		let c = s.length, l = new e(c);
+		for (let e = 0; e < c; e++) {
+			l.tree[e + 1] += s[e];
+			let u = e + 1 + (e + 1 & -(e + 1));
+			u <= c && (l.tree[u] += l.tree[e + 1]);
 		}
-		return s;
+		return l;
 	}
 };
-function useVirtualizer(l) {
-	l = mergeProps({
+function useVirtualizer(d) {
+	d = mergeProps({
 		overscan: 0,
 		batch: 0,
 		enable: !0
-	}, l);
-	let u = createElementSize(l.getScrollElement), d = createScrollPosition(l.getScrollElement), f = createMemo(() => l.horizontal ? d.x : d.y), p = createMemo(() => l.horizontal ? u.width : u.height), m = [], h = new FenwickTree(0), [g, _] = createSignal(void 0, { equals: !1 });
+	}, d);
+	let f = createElementSize(d.getScrollElement), p = createScrollPosition(d.getScrollElement), m = createMemo(() => d.horizontal ? p.x : p.y), h = createMemo(() => d.horizontal ? f.width : f.height), g = [], _ = new FenwickTree(0), [v, y] = createSignal(void 0, { equals: !1 }), b = throttlePromise(queueMicrotask), x = () => b().then(y);
 	createComputed(() => {
-		let { count: e } = l;
+		let { count: e } = d;
 		untrack(() => {
-			if (e !== m.length) {
-				if (e > m.length) for (let a = m.length; a < e; a++) m.push(l.estimateSize(a));
-				else m.length = e;
-				h = FenwickTree.build(m.slice(0, e)), _();
+			if (e !== g.length) {
+				if (e > g.length) for (let s = g.length; s < e; s++) g.push(d.estimateSize(s));
+				else g.length = e;
+				_ = FenwickTree.build(g.slice(0, e)), x();
 			}
 		});
 	});
-	let v = (e) => ({
+	let S = (e) => ({
 		index: e,
-		start: e > 0 ? h.sum(e - 1) : 0,
-		end: h.sum(e)
-	}), y = createMemo((e) => {
-		g();
-		let { batch: a, overscan: o = 0 } = l, s = h.findByOffset(f()) - o;
-		return a && (s > e ? s = s <= e + a ? e : s > e + a * 2 ? s : e + a : s -= a), Math.max(s, 0);
-	}, 0), b = createMemo((e) => {
-		g();
-		let { batch: a, overscan: o = 0 } = l, s = h.findByOffset(f() + p()) + o;
-		return a && (s < e ? s = s >= e - a ? e : s < e - a * 2 ? s : e - a : s += a), Math.min(s, l.count - 1);
-	}, 0), x = createMemo(() => {
-		if (g(), !l.enable) return Array.from({ length: l.count }, (e, a) => v(a));
+		start: _.sum(e - 1),
+		end: _.sum(e)
+	}), C = createMemo((e) => {
+		v();
+		let { batch: s, overscan: c = 0 } = d, l = _.findByOffset(m()) - c;
+		return s && (l > e ? l = l <= e + s ? e : l > e + s * 2 ? l : e + s : l -= s), Math.max(l, 0);
+	}, 0), w = createMemo((e) => {
+		v();
+		let { batch: s, overscan: c = 0 } = d, l = _.findByOffset(m() + h()) + c;
+		return s && (l < e ? l = l >= e - s ? e : l < e - s * 2 ? l : e - s : l += s), Math.min(l, d.count - 1);
+	}, 0), T = createMemo(() => {
+		if (v(), !d.enable) return Array.from({ length: d.count }, (e, s) => S(s));
 		let e = [];
-		for (let a = y(); a <= b(); a++) e.push(v(a));
-		return l.extras && (e.push(...l.extras(y(), b())?.map((e) => v(e)) || []), e = uniqBy(e, (e) => e.index).sort((e, a) => e.index - a.index)), e;
+		for (let s = C(); s <= w(); s++) e.push(S(s));
+		return d.extras && (e.push(...d.extras(C(), w())?.map((e) => S(e)) || []), e = uniqBy(e, (e) => e.index)), e;
 	});
 	return {
-		options: l,
-		startIdx: y,
-		endIdx: b,
-		getTotalSize: () => (g(), h.total()),
-		resizeItem: (e, a) => {
-			let o = m[e] ?? 0;
-			if (o !== a) {
-				if (e < y()) {
-					let e = l.getScrollElement();
-					(l.horizontal ? e.scrollLeft : e.scrollTop) !== 0 && (l.horizontal ? e.scrollLeft += a - o : e.scrollTop += a - o);
+		options: d,
+		startIdx: C,
+		endIdx: w,
+		getTotalSize: () => (v(), _.total()),
+		resizeItem: (e, s) => {
+			let c = g[e] ?? 0;
+			if (c !== s) {
+				if (e < C()) {
+					let e = d.getScrollElement();
+					(d.horizontal ? e.scrollLeft : e.scrollTop) !== 0 && (d.horizontal ? e.scrollLeft += s - c : e.scrollTop += s - c);
 				}
-				h.add(e, a - o), m[e] = a, _();
+				_.add(e, s - c), g[e] = s, x();
 			}
 		},
-		getVirtualItems: x,
+		getVirtualItems: T,
 		getVirtualItem: (() => {
-			let e = createMemo(() => {
-				g();
-				let e = {};
-				for (let a of x()) e[a.index] = a;
-				return e;
-			});
-			return (a) => e()[a];
+			let e = createMemo(() => keyBy(T(), (e) => e.index));
+			return (s) => e()[s];
 		})()
 	};
 }

package/dist/index.d.ts

@@ -116,7 +116,7 @@ export type TDProps = {
 export type TD = Component<TDProps>;
 type Obj = Record<string | symbol, any>;
 export interface TableColumn extends Obj {
-    id?: any;
+    id: any;
     name?: string;
     width?: number;
     fixed?: 'left' | 'right';

package/dist/index.js

@@ -18,7 +18,7 @@ import { TreePlugin } from "./plugins/TreePlugin.js";
 import { HeaderGroupPlugin } from "./plugins/HeaderGroup.js";
 import { ValidatorPlugin } from "./plugins/ValidatorPlugin.js";
 import { createComponent, insert, memo, mergeProps, spread, template, use } from "solid-js/web";
-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 { $PROXY, For, batch, 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";
@@ -38,17 +38,17 @@ const Ctx = createContext({
 		get plugins() {
 			return Z();
 		}
-	}), X = memoize((q) => runWithOwner(J, () => unFn(q, Y))), Z = createMemo(() => [
-		...defaultsPlugins,
-		...q.plugins || [],
-		RenderPlugin
-	].map(X).sort((v, q) => (q.priority || 0) - (v.priority || 0)));
-	createComputed((v) => {
-		let q = difference(Z(), v);
+	}), X = memoize((q) => runWithOwner(J, () => unFn(q, Y))), Z = createMemo((v) => {
+		let Z = [
+			...defaultsPlugins,
+			...q.plugins || [],
+			RenderPlugin
+		].map(X).sort((v, q) => (q.priority || 0) - (v.priority || 0)), $ = difference(Z, v);
 		return runWithOwner(J, () => {
-			q.forEach((v) => Object.assign(Y, v.store?.(Y)));
-		}), Z();
-	}, []), Y.props = (() => {
+			$.forEach((v) => Object.assign(Y, v.store?.(Y)));
+		}), Z;
+	}, []);
+	Y.props = (() => {
 		let v = getOwner(), J = {}, X = (q) => J[q] ??= runWithOwner(v, () => createMemo(() => Q(q)));
 		function Q(v) {
 			return createMemo(() => Z().map((q) => q.rewriteProps?.[v]).filter((v) => v), void 0, { equals: isEqual })().reduce((q, J) => J({ [v]: q }, { store: Y }), q[v]);
@@ -167,21 +167,25 @@ function BasePlugin() {
 		priority: Infinity,
 		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
-					});
-				}
-			}), 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
-					});
-				}
+				batch(() => {
+					for (let J of q) {
+						let q = J.target, { inlineSize: Y, blockSize: X } = J.borderBoxSize[0], Z = q.getAttribute("x");
+						Z >= 0 && q.parentElement && (v.thSizes[Z] = {
+							width: Y,
+							height: X
+						});
+					}
+				});
+			}), J = makeResizeObserver(async (q) => {
+				batch(() => {
+					for (let J of q) {
+						let q = J.target, { inlineSize: Y, blockSize: X } = J.borderBoxSize[0], Z = q.getAttribute("y");
+						Z >= 0 && q.parentElement && (v.trSizes[Z] = {
+							width: Y,
+							height: X
+						});
+					}
+				});
 			});
 			return {
 				thObs: q,

package/dist/plugins/CommandPlugin.js

@@ -1,43 +1,41 @@
 import { createComponent } from "solid-js/web";
 import { createMemo, getOwner, runWithOwner } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
+import { createLazyMemo } from "@solid-primitives/memo";
 import { createEventListener } from "@solid-primitives/event-listener";
 import { createKeybindingsHandler } from "tinykeys";
 const CommandPlugin = {
 	name: "command",
 	priority: Infinity,
 	store: (e) => {
-		let a = getOwner(), o = createMemo(() => e.plugins.reduce((n, r) => Object.assign(n, runWithOwner(a, () => r.commands?.(e, { ...n }))), {}));
-		return {
-			get commands() {
-				return o();
-			},
-			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.table.querySelector(`[x="${n}"][y="${r}"]`);
-				a && a.scrollIntoView({
+		let r = getOwner(), o = createLazyMemo(() => e.plugins.reduce((i, o) => Object.assign(i, runWithOwner(r, () => o.commands?.(e, { ...i }))), {}));
+		return Object.defineProperty(e, "commands", { get: () => o() }), {
+			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.table.querySelector(`[x="${r}"][y="${i}"]`);
+				o && o.scrollIntoView({
 					behavior: "smooth",
-					...i
+					...a
 				});
 			},
-			scrollCellIfNeeded(n, r, i = !1) {
-				n = typeof n == "object" ? e.props.columns.indexOf(n) : n, r = typeof r == "object" ? e.props.data.indexOf(r) : r;
-				let a = e.table.querySelector(`[x="${n}"][y="${r}"]`);
-				a && (a.scrollIntoViewIfNeeded(i), a.focus());
+			scrollCellIfNeeded(r, i, a = !1) {
+				r = typeof r == "object" ? e.props.columns.indexOf(r) : r, i = typeof i == "object" ? e.props.data.indexOf(i) : i;
+				let o = e.table.querySelector(`[x="${r}"][y="${i}"]`);
+				o && (o.scrollIntoViewIfNeeded(a), o.focus());
 			}
 		};
 	},
 	rewriteProps: { Table: ({ Table: s }, { store: c }) => (l) => {
 		let u = getOwner(), d = createMemo(() => {
 			let e = {};
-			for (let n of c.plugins) {
-				let r = runWithOwner(u, () => n.keybindings?.(c));
-				r && Object.assign(e, r);
+			for (let r of c.plugins) {
+				let i = runWithOwner(u, () => r.keybindings?.(c));
+				i && Object.assign(e, i);
 			}
-			let n = c.props?.keybindings;
-			if (n) for (let [r, i] of Object.entries(n)) i === !1 ? delete e[r] : typeof i == "function" && (e[r] = i);
-			return createKeybindingsHandler(Object.fromEntries(Object.entries(e).map(([e, n]) => [e, (e) => {
-				e.preventDefault(), n(e);
+			let r = c.props?.keybindings;
+			if (r) for (let [i, a] of Object.entries(r)) a === !1 ? delete e[i] : typeof a == "function" && (e[i] = a);
+			return createKeybindingsHandler(Object.fromEntries(Object.entries(e).map(([e, r]) => [e, (e) => {
+				e.preventDefault(), r(e);
 			}])));
 		});
 		return createEventListener(() => c.scroll_el, "keydown", (e) => d()(e)), l = combineProps({ tabindex: -1 }, l), createComponent(s, l);

package/dist/plugins/EditablePlugin.js

@@ -19,7 +19,7 @@ const EditablePlugin = {
 		Td: ({ Td: e }, { store: h }) => (_) => {
 			let v, { props: x } = useContext(Ctx), S = createMemo(() => unFn(x.editable, _)), [w, T] = createSignal(!1), A = "", j = createMemo(() => (([e, h]) => _.x == e && _.y == h)(h.selected.start || [])), M = createMemo(() => j() && S() && !w()), [N, P] = createSignal(!1), F = createAsyncMemo(() => {
 				if (w()) {
-					let e = !1, g = _.data[_.col.id], v = ((e) => typeof e == "string" ? h.editors[e] : e)(_.col.editor || "text"), y = {
+					let e = !1, g = _.data[_.col.id], v = ((e) => typeof e == "string" ? h.editors[e] : e)(_.col.editor ?? _.col.type ?? "text"), y = {
 						props: _.col.editorProps,
 						col: _.col,
 						eventKey: A,
@@ -32,20 +32,16 @@ const EditablePlugin = {
 						onChange: (e) => w() && I(e).catch(() => {})
 					}, b = v(y);
 					return onCleanup(() => {
-						if (!e && b.getValue() !== g) {
-							let e = [...x.data];
-							e[_.y] = {
-								...e[_.y],
-								[_.col.id]: b.getValue()
-							}, x.onDataChange?.(e);
-						}
-						e || I(b.getValue()).catch(() => {}), b.destroy();
+						!e && b.getValue() !== g && h.commands.rowChange({
+							...x.data[_.y],
+							[_.col.id]: b.getValue()
+						}), e || I(b.getValue()).catch(() => {}), A = "", b.destroy();
 					}), [y, b];
 				}
 			});
 			async function I(e) {
 				try {
-					P(!0), console.log("validate", e), await h.validateCell(e, _.data, _.col);
+					P(!0), await h.validateCell(e, _.data, _.col);
 				} finally {
 					P(!1);
 				}

package/dist/plugins/FilterPlugin.d.ts

@@ -0,0 +1,14 @@
+import type { Plugin } from '..';
+import type { AndOrNode } from '../components/AndOr';
+declare module '../index' {
+    interface TableProps {
+        filterable?: boolean;
+    }
+    interface TableColumn {
+        filterable?: boolean;
+    }
+    interface TableStore {
+        filters: Record<string, AndOrNode>;
+    }
+}
+export declare const FilterPlugin: Plugin;

package/dist/plugins/FilterPlugin.js

@@ -0,0 +1,138 @@
+import { normalizeType } from "../components/AndOrFields.js";
+import { Filter } from "../components/Filter.js";
+import { createComponent, memo, mergeProps } from "solid-js/web";
+import { Show } from "solid-js";
+function isBlank(e) {
+	return e == null || String(e).trim() === "";
+}
+function toNum(e) {
+	let u = Number(e);
+	return Number.isNaN(u) ? null : u;
+}
+function toDateTs(e) {
+	if (isBlank(e)) return null;
+	let u = new Date(String(e)).getTime();
+	return Number.isNaN(u) ? null : u;
+}
+function toBool(e) {
+	if (typeof e == "boolean") return e;
+	if (typeof e == "number") return e !== 0;
+	let u = String(e ?? "").trim().toLowerCase();
+	return [
+		"1",
+		"true",
+		"yes",
+		"y",
+		"on"
+	].includes(u) ? !0 : [
+		"0",
+		"false",
+		"no",
+		"n",
+		"off",
+		""
+	].includes(u) ? !1 : !!e;
+}
+function isRuleNode(e) {
+	return "field" in e;
+}
+function hasActiveRule(e) {
+	return !!e.op;
+}
+function hasActiveTree(e) {
+	return e ? isRuleNode(e) ? hasActiveRule(e) : (e.children ?? []).some(hasActiveTree) : !1;
+}
+function matchFilter(e, u, d) {
+	let f = u.op;
+	if (f === "blank") return isBlank(e);
+	if (f === "noblank") return !isBlank(e);
+	if (f === "true") return toBool(e);
+	if (f === "false") return !toBool(e);
+	let p = u.value;
+	if (d === "number") {
+		let u = toNum(e), d = toNum(p);
+		if (u == null || d == null) return !1;
+		if (f === "eq") return u === d;
+		if (f === "lt") return u < d;
+		if (f === "gt") return u > d;
+		if (f === "lte") return u <= d;
+		if (f === "gte") return u >= d;
+	}
+	if (d === "date") {
+		let u = toDateTs(e), d = toDateTs(p);
+		if (u == null || d == null) return !1;
+		if (f === "eq") return u === d;
+		if (f === "lt") return u < d;
+		if (f === "gt") return u > d;
+		if (f === "lte") return u <= d;
+		if (f === "gte") return u >= d;
+	}
+	let m = String(e ?? "").toLowerCase(), v = String(p ?? "").toLowerCase();
+	return f === "eq" ? m === v : f === "neq" ? m !== v : f === "startwith" ? m.startsWith(v) : f === "endwith" ? m.endsWith(v) : m.includes(v);
+}
+function getFilterTree(e, u) {
+	return e[u.id];
+}
+function setFilterTree(e, u, d) {
+	if (!d) {
+		delete e[u.id];
+		return;
+	}
+	e[u.id] = d;
+}
+function evaluateFilterTree(e, u, d) {
+	if (isRuleNode(u)) return hasActiveRule(u) ? matchFilter(e, u, d) : !0;
+	let f = (u.children ?? []).filter(hasActiveTree);
+	return f.length ? u.op === "or" ? f.some((u) => evaluateFilterTree(e, u, d)) : f.every((u) => evaluateFilterTree(e, u, d)) : !0;
+}
+function passesFilters(u, d, f, p, m) {
+	return f.every((f) => {
+		if (f[m] || !(f.filterable ?? p)) return !0;
+		let h = getFilterTree(d, f);
+		return !h || !hasActiveTree(h) ? !0 : evaluateFilterTree(u[f.id], h, normalizeType(f));
+	});
+}
+const FilterPlugin = {
+	name: "filter",
+	store: () => ({ filters: {} }),
+	rewriteProps: {
+		data: ({ data: e }, { store: u }) => {
+			if (!e) return e;
+			let { filters: d } = u, { columns: f = [], filterable: p } = u.props;
+			return Object.values(d).some(hasActiveTree) ? e.filter((e) => passesFilters(e, d, f, p, u.internal)) : e;
+		},
+		onDataChange: ({ onDataChange: e }, { store: u }) => (d) => {
+			let f = u.rawProps.data ?? [], { columns: p = [], filterable: m } = u.props;
+			if (!Object.values(u.filters).some(hasActiveTree)) {
+				e?.(d);
+				return;
+			}
+			let h = [...f], g = 0;
+			f.forEach((e, f) => {
+				passesFilters(e, u.filters, p, m, u.internal) && (h[f] = d[g++]);
+			}), e?.(h);
+		},
+		Th: ({ Th: e }, { store: h }) => (g) => {
+			let _ = () => !!(g.col.filterable ?? h.props.filterable) && !g.col[h.internal];
+			return createComponent(e, mergeProps(g, { get children() {
+				return [memo(() => g.children), createComponent(Show, {
+					get when() {
+						return _();
+					},
+					get children() {
+						return createComponent(Filter, {
+							get col() {
+								return g.col;
+							},
+							get tree() {
+								return getFilterTree(h.filters, g.col);
+							},
+							setTree: (e) => setFilterTree(h.filters, g.col, e)
+						});
+					}
+				})];
+			} }));
+		}
+	}
+};
+export { FilterPlugin };

package/dist/plugins/MenuPlugin.js

@@ -71,15 +71,16 @@ const MenuPlugin = {
 		}
 	],
 	commands: (e) => ({
-		rowEquals(e, r) {
-			return e == r;
+		rowEquals(r, i) {
+			let a = e.props.rowKey;
+			return r == i || a != null && r?.[a] == i?.[a];
 		},
 		rowIndexOf(r, i) {
 			return r.findIndex((r) => e.commands.rowEquals(r, i));
 		},
 		rowChange(r, i) {
 			let a = [...e.rawProps.data || []];
-			i = i == null ? e.commands.rowIndexOf(a, r) : a.findIndex((r) => r == e.props.data[i]), i > -1 && (a[i] = r, e.props.onDataChange?.(a));
+			i = i == null ? e.commands.rowIndexOf(a, r) : a.findIndex((r) => e.commands.rowEquals(r, e.props.data[i])), i > -1 && (a[i] = r, e.props.onDataChange?.(a));
 		},
 		addRows(r, i, a = !0) {
 			addRows(e, r, i, a);

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

@@ -4,6 +4,7 @@ declare module '../../index' {
     interface TableProps {
     }
     interface TableColumn {
+        type?: string;
         render?: Render;
         enum?: Record<string, any> | {
             label?: string;

package/dist/plugins/RenderPlugin/index.js

@@ -10,7 +10,7 @@ const RenderPlugin = {
 	store: () => ({ renders: { ...renders } }),
 	rewriteProps: { Td: ({ Td: e }, { store: p }) => (m) => createComponent(e, mergeProps(m, { get children() {
 		return (() => {
-			let e = ((e) => typeof e == "string" ? p.renders[e] : e)(m.col.render) || text;
+			let e = ((e) => typeof e == "string" ? p.renders[e] : e)(m.col.render ?? m.col.type) || text;
 			return renderComponent(e, mergeProps$1(m, { onChange: (e) => p.commands.rowChange({
 				...m.data,
 				[m.col.id]: e