intable 0.0.22 → 0.0.24

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

@@ -24,7 +24,7 @@ type Requireds<T, K extends keyof T> = Pri<Omit<T, K> & Required<Pick<T, K>>>;
 type Pri<T> = {
     [K in keyof T]: T[K];
 };
-type TableProps2 = Requireds<TableProps, ('Table' | 'Thead' | 'Tbody' | 'Tr' | 'Th' | 'Td' | 'EachRows' | 'EachCells' | 'rowKey' | 'data' | 'columns' | 'newRow')>;
+type TableProps2 = Requireds<TableProps, ('Scroll' | 'Table' | 'Thead' | 'Tbody' | 'Tr' | 'Th' | 'Td' | 'EachRows' | 'EachCells' | 'rowKey' | 'data' | 'columns' | 'newRow')>;
 type Each<T = any> = (props: {
     each: T[];
     children: (e: () => T, i: () => number) => JSX.Element;
@@ -65,6 +65,7 @@ export interface TableProps {
     rowKey?: any;
     size?: string;
     newRow?: (i: number) => any;
+    Scroll?: Component<any>;
     Table?: Component<any>;
     Thead?: Component<any>;
     Tbody?: Component<any>;
@@ -78,6 +79,7 @@ export interface TableProps {
     }>;
     EachRows?: Each;
     EachCells?: Each<TableColumn>;
+    Footer?: Component<any>;
     cellClass?: ((props: Omit<TDProps, 'y' | 'data'> & {
         y?: number;
         data?: any;
@@ -116,7 +118,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';
@@ -150,5 +152,4 @@ export interface TableStore extends Obj {
 export declare const Intable: (props: TableProps) => JSX.Element;
 export default Intable;
 declare function BasePlugin(): Plugin$0;
-export declare const ScrollPlugin: Plugin;
 export declare const defaultsPlugins: (Plugin$0 | typeof BasePlugin)[];