intable 0.0.3 → 0.0.5

package/dist/hooks/useSelector.d.ts

@@ -0,0 +1,16 @@
+interface UseSelectorOpt<T> {
+    value?: T;
+    onChange?: (v: T) => void;
+    multiple?: boolean;
+    selectable?: (v: any) => boolean;
+}
+export declare function useSelector<T = any>(opt: UseSelectorOpt<T>): {
+    clear: () => void;
+    set: (v: T) => void;
+    has: (key: T | Set<T>) => boolean;
+    add: (v: T) => void;
+    del: (v: T) => void;
+    toggle: (v: T) => void;
+    readonly value: any;
+};
+export {};

package/dist/hooks/useSelector.js

@@ -0,0 +1,35 @@
+import { createMemo, createSelector, createSignal } from "solid-js";
+function useSelector(r) {
+	let { value: i, onChange: a, multiple: o = !1, selectable: s } = r, [c, l] = createSignal((() => o ? i ? new Set(Array.isArray(i) ? i : [i]) : /* @__PURE__ */ new Set() : i)()), u = (e) => s ? s(e) : !0, d = () => {
+		o ? (l(/* @__PURE__ */ new Set()), a?.([])) : (l(void 0), a?.(void 0));
+	}, f = (e) => {
+		if (u(e)) if (o) {
+			let n = new Set(Array.isArray(e) ? e : [e]);
+			l(n), a?.(Array.from(n));
+		} else l(e), a?.(e);
+	}, p = createSelector(c, (e, n) => o ? n.has(e) : e === n), m = (e) => {
+		if (u(e)) if (o) {
+			let n = new Set(c());
+			n.add(e), l(n), a?.(Array.from(n));
+		} else l(e), a?.(e);
+	}, h = (e) => {
+		if (o) {
+			let n = new Set(c());
+			n.delete(e), l(n), a?.(Array.from(n));
+		} else c() === e && (l(void 0), a?.(void 0));
+	}, g = (e) => {
+		p(e) ? h(e) : m(e);
+	}, _ = createMemo(() => o ? Array.from(c()) : c());
+	return {
+		clear: d,
+		set: f,
+		has: p,
+		add: m,
+		del: h,
+		toggle: g,
+		get value() {
+			return _();
+		}
+	};
+}
+export { useSelector };

package/dist/hooks/useSort.js

@@ -3,104 +3,81 @@ import { Portal, createComponent, memo, mergeProps, spread, template } from "sol
 import { createMutable, reconcile } from "solid-js/store";
 import { createEventListenerMap } from "@solid-primitives/event-listener";
 import { access } from "@solid-primitives/utils";
-var _tmpl$ = /* @__PURE__ */ template(`<div>`);
-const useSort = (el, opt) => {
-	opt = mergeProps({ enable: true }, opt);
-	let count = 0;
-	createEventListenerMap(() => opt.enable ? access(el) : void 0, {
-		async pointerdown(e) {
-			const _c = count;
-			const drag = await findAsync(e.composedPath(), (e$1) => e$1 instanceof HTMLElement && opt.draggable(e$1));
-			if (_c != count) return;
-			if (!drag) return;
-			e.stopPropagation();
-			state.drag = drag;
-			state.drag?.setAttribute("draggable", "true");
+var _tmpl$ = /* @__PURE__ */ template("<div>");
+const useSort = (l, f) => {
+	f = mergeProps({ enable: !0 }, f);
+	let p = 0;
+	createEventListenerMap(() => f.enable ? access(l) : void 0, {
+		async pointerdown(i) {
+			let a = p, o = await findAsync(i.composedPath(), (e) => e instanceof HTMLElement && f.draggable(e));
+			a == p && o && (i.stopPropagation(), h.drag = o, h.drag?.setAttribute("draggable", "true"));
 		},
 		pointerup() {
-			count++;
-			dragend();
+			p++, m();
 		},
 		pointermove() {
-			count++;
+			p++;
 		},
 		dragstart(e) {
 			e.dataTransfer.setDragImage(document.createElement("img"), 0, 0);
 		},
 		dragover(e) {
-			if (!state.drag) return;
-			const over = state.over = e.composedPath().filter((e$1) => e$1 instanceof HTMLElement).find((e$1) => opt.dragover(e$1)) ?? state.over;
-			if (!over) return;
-			e.preventDefault();
-			e.stopPropagation();
-			const children = opt.children(over);
-			if (children) {
-				let i = 0, d = Infinity, s = "";
-				children.forEach((el$1, ii) => {
-					const display = getComputedStyle(el$1).display;
-					const __ = ["table-cell", "inline"].some((e$1) => display.includes(e$1));
-					const rect = el$1.getBoundingClientRect();
-					if (__) {
-						let dd = Math.sqrt((e.clientX - rect.x) ** 2 + (e.clientY - rect.y + rect.height / 2) ** 2);
-						if (dd < d) i = ii, d = dd, s = "l";
-						dd = Math.sqrt((e.clientX - rect.right) ** 2 + (e.clientY - rect.y + rect.height / 2) ** 2);
-						if (dd < d) i = ii, d = dd, s = "r";
+			if (!h.drag) return;
+			let i = h.over = e.composedPath().filter((e) => e instanceof HTMLElement).find((e) => f.dragover(e)) ?? h.over;
+			if (!i) return;
+			e.preventDefault(), e.stopPropagation();
+			let a = f.children(i);
+			if (a) {
+				let i = 0, o = Infinity, s = "";
+				a.forEach((a, c) => {
+					let l = getComputedStyle(a).display, u = ["table-cell", "inline"].some((e) => l.includes(e)), d = a.getBoundingClientRect();
+					if (u) {
+						let a = Math.sqrt((e.clientX - d.x) ** 2 + (e.clientY - d.y + d.height / 2) ** 2);
+						a < o && (i = c, o = a, s = "l"), a = Math.sqrt((e.clientX - d.right) ** 2 + (e.clientY - d.y + d.height / 2) ** 2), a < o && (i = c, o = a, s = "r");
 					} else {
-						let dd = Math.sqrt((e.clientY - rect.y) ** 2 + (e.clientX - rect.x + rect.width / 2) ** 2);
-						if (dd < d) i = ii, d = dd, s = "t";
-						dd = Math.sqrt((e.clientY - rect.bottom) ** 2 + (e.clientX - rect.x + rect.width / 2) ** 2);
-						if (dd < d) i = ii, d = dd, s = "b";
+						let a = Math.sqrt((e.clientY - d.y) ** 2 + (e.clientX - d.x + d.width / 2) ** 2);
+						a < o && (i = c, o = a, s = "t"), a = Math.sqrt((e.clientY - d.bottom) ** 2 + (e.clientX - d.x + d.width / 2) ** 2), a < o && (i = c, o = a, s = "b");
 					}
 				});
-				const rect1 = children[i].getBoundingClientRect();
-				const x = s == "l" || s == "r", y = s == "t" || s == "b";
-				const size = 3;
-				state.style = {
-					width: `${y ? rect1.width : size}px`,
-					height: `${y ? size : rect1.height}px`,
-					translate: `${y ? rect1.x : (s == "l" ? rect1.x : rect1.right) - size / 2}px ${x ? rect1.y : (s == "t" ? rect1.y : rect1.bottom) - size / 2}px`
-				};
-				state.rel = children[i];
-				state.type = s == "l" || s == "t" ? "before" : "after";
+				let c = a[i].getBoundingClientRect(), l = s == "l" || s == "r", u = s == "t" || s == "b";
+				h.style = {
+					width: `${u ? c.width : 3}px`,
+					height: `${u ? 3 : c.height}px`,
+					translate: `${u ? c.x : (s == "l" ? c.x : c.right) - 3 / 2}px ${l ? c.y : (s == "t" ? c.y : c.bottom) - 3 / 2}px`
+				}, h.rel = a[i], h.type = s == "l" || s == "t" ? "before" : "after";
 			} else {
-				const rect1 = over.getBoundingClientRect();
-				state.style = {
-					width: rect1.width,
-					height: rect1.height,
-					translate: `${rect1.x}px ${rect1.y}px`
-				};
-				state.rel = over;
-				state.type = "inner";
+				let e = i.getBoundingClientRect();
+				h.style = {
+					width: e.width,
+					height: e.height,
+					translate: `${e.x}px ${e.y}px`
+				}, h.rel = i, h.type = "inner";
 			}
 		},
 		dragend() {
-			dragend();
+			m();
 		}
 	});
-	function dragend() {
-		state.drag?.removeAttribute("draggable");
-		if (state.drag && state.rel) opt.dragend?.();
-		reconcile({})(state);
+	function m() {
+		h.drag?.removeAttribute("draggable"), h.drag && h.rel && f.dragend?.(), reconcile({})(h);
 	}
-	const state = createMutable({
+	let h = createMutable({
 		style: void 0,
 		drag: void 0,
 		over: void 0,
 		rel: void 0,
 		type: ""
 	});
-	memo(() => memo(() => !!state.style)() && createComponent(Portal, {
+	return memo(() => memo(() => !!h.style)() && createComponent(Portal, {
 		get mount() {
-			return access(el);
+			return access(l);
 		},
 		get children() {
-			var _el$ = _tmpl$();
-			spread(_el$, mergeProps(() => opt.guideLine, { get style() {
-				return state.style;
-			} }), false, false);
-			return _el$;
+			var e = _tmpl$();
+			return spread(e, mergeProps(() => f.guideLine, { get style() {
+				return h.style;
+			} }), !1, !1), e;
 		}
-	}));
-	return state;
+	})), h;
 };
 export { useSort };

package/dist/hooks/useVirtualizer.js

@@ -3,89 +3,64 @@ import { createMutable } from "solid-js/store";
 import { keyBy, uniqBy } from "es-toolkit";
 import { createElementSize } from "@solid-primitives/resize-observer";
 import { createScrollPosition } from "@solid-primitives/scroll";
-function useVirtualizer(opt) {
-	opt = mergeProps({
+function useVirtualizer(d) {
+	d = mergeProps({
 		overscan: 0,
 		batch: 0,
-		enable: true
-	}, opt);
-	const size = createElementSize(opt.getScrollElement);
-	const pos = createScrollPosition(opt.getScrollElement);
-	const y = createMemo(() => opt.horizontal ? pos.x : pos.y);
-	const h = createMemo(() => opt.horizontal ? size.width : size.height);
-	const y2 = createMemo(() => y() + h());
-	const sizes = createMutable(Array(opt.count));
+		enable: !0
+	}, 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 = createMemo(() => m() + h()), _ = createMutable(Array(d.count));
 	createComputed(() => {
-		const { count } = opt;
+		let { count: e } = d;
 		untrack(() => {
-			for (let i = 0; i < count; i++) sizes[i] ||= opt.estimateSize(i);
+			for (let o = 0; o < e; o++) _[o] ||= d.estimateSize(o);
 		});
 	});
-	const [items, setItems] = createSignal([]);
+	let [v, y] = createSignal([]);
 	createRenderEffect(() => {
-		const { count } = opt;
-		let arr = Array(count);
-		let t = 0;
-		for (let i = 0; i < count; i++) {
-			arr[i] = {
-				start: t,
-				end: t + sizes[i],
-				index: i
-			};
-			t = arr[i].end;
-		}
-		setItems(arr);
+		let { count: e } = d, o = Array(e), s = 0;
+		for (let c = 0; c < e; c++) o[c] = {
+			start: s,
+			end: s + _[c],
+			index: c
+		}, s = o[c].end;
+		y(o);
 	});
-	const start = createMemo((prev) => {
-		const { batch: batch$1, overscan = 0 } = opt;
-		let i = findClosestIndex(items(), (e) => e.start > y() ? -1 : e.end < y() ? 1 : 0);
-		i -= overscan;
-		if (batch$1) if (i > prev) i = i <= prev + batch$1 ? prev : i > prev + batch$1 * 2 ? i : prev + batch$1;
-		else i -= batch$1;
-		return Math.max(i, 0);
-	}, 0);
-	const end = createMemo((prev) => {
-		const { batch: batch$1, overscan = 0 } = opt;
-		let i = findClosestIndex(items(), (e) => e.start > y2() ? -1 : e.end < y2() ? 1 : 0);
-		i += overscan;
-		if (batch$1) if (i < prev) i = i >= prev - batch$1 ? prev : i < prev - batch$1 * 2 ? i : prev - batch$1;
-		else i += batch$1;
-		return Math.min(i, opt.count - 1);
-	}, 0);
-	const items2 = createMemo(() => {
-		if (!opt.enable) return items();
-		let arr = items().slice(start(), end() + 1);
-		if (opt.extras) {
-			arr.push(...opt.extras()?.map((i) => items()[i]) || []);
-			arr = uniqBy(arr, (e) => e.index).sort((a, b) => a.index - b.index);
-		}
-		return arr;
+	let b = createMemo((e) => {
+		let { batch: o, overscan: s = 0 } = d, c = C(v(), (e) => e.start > m() ? -1 : e.end < m() ? 1 : 0);
+		return c -= s, o && (c > e ? c = c <= e + o ? e : c > e + o * 2 ? c : e + o : c -= o), Math.max(c, 0);
+	}, 0), x = createMemo((e) => {
+		let { batch: o, overscan: s = 0 } = d, c = C(v(), (e) => e.start > g() ? -1 : e.end < g() ? 1 : 0);
+		return c += s, o && (c < e ? c = c >= e - o ? e : c < e - o * 2 ? c : e - o : c += o), Math.min(c, d.count - 1);
+	}, 0), S = createMemo(() => {
+		if (!d.enable) return v();
+		let e = v().slice(b(), x() + 1);
+		return d.extras && (e.push(...d.extras()?.map((e) => v()[e]) || []), e = uniqBy(e, (e) => e.index).sort((e, o) => e.index - o.index)), e;
 	});
-	function findClosestIndex(arr, fn) {
-		let l = 0, r = arr.length - 1;
-		while (l < r) {
-			const m = l + Math.floor((r - l) / 2);
-			const v = fn(arr[m]);
-			if (v < 0 && r != m) r = m;
-			else if (v > 0 && l != m) l = m;
-			else return m;
+	function C(e, o) {
+		let s = 0, c = e.length - 1;
+		for (; s < c;) {
+			let l = s + Math.floor((c - s) / 2), u = o(e[l]);
+			if (u < 0 && c != l) c = l;
+			else if (u > 0 && s != l) s = l;
+			else return l;
 		}
-		return l;
+		return s;
 	}
 	return {
-		options: opt,
-		getTotalSize: () => items()[items().length - 1]?.end || 0,
-		resizeItem: (i, size$1) => {
-			if (i <= start() && size$1 != sizes[i]) {
-				const el = opt.getScrollElement();
-				if ((opt.horizontal ? el.scrollLeft : el.scrollTop) != 0) opt.horizontal ? el.scrollLeft += size$1 - sizes[i] : el.scrollTop += size$1 - sizes[i];
+		options: d,
+		getTotalSize: () => v()[v().length - 1]?.end || 0,
+		resizeItem: (e, o) => {
+			if (e <= b() && o != _[e]) {
+				let s = d.getScrollElement();
+				(d.horizontal ? s.scrollLeft : s.scrollTop) != 0 && (d.horizontal ? s.scrollLeft += o - _[e] : s.scrollTop += o - _[e]);
 			}
-			sizes[i] = size$1;
+			_[e] = o;
 		},
-		getVirtualItems: items2,
+		getVirtualItems: S,
 		getVirtualItem: (() => {
-			const keybyed = createMemo(() => keyBy(items2(), (e) => e.index));
-			return (i) => keybyed()[i];
+			let e = createMemo(() => keyBy(S(), (e) => e.index));
+			return (o) => e()[o];
 		})()
 	};
 }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { For, type JSX, type Component } from 'solid-js';
+import { type JSX, type Component } from 'solid-js';
 import 'virtual:uno.css';
 import './style.scss';
 import './plugins/CellSelectionPlugin';
@@ -10,6 +10,8 @@ import './plugins/CommandPlugin';
 import './plugins/RowSelectionPlugin';
 import './plugins/ResizePlugin';
 import './plugins/DragPlugin';
+import './plugins/RowGroupPlugin';
+import './plugins/ExpandPlugin';
 export declare const Ctx: import("solid-js").Context<{
     props: TableProps2;
     store: TableStore;
@@ -19,12 +21,17 @@ 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 Each<T = any> = (props: {
+    each: T[];
+    children: (e: () => any, i: () => number) => JSX.Element;
+}) => JSX.Element;
 type ProcessProps = {
     [K in keyof TableProps]?: (prev: TableProps2, ctx: {
         store: TableStore;
     }) => TableProps[K];
 };
 export interface Plugin {
+    name?: string;
     priority?: number;
     store?: (store: TableStore) => Partial<TableStore> | void;
     rewriteProps?: ProcessProps;
@@ -52,8 +59,8 @@ export interface TableProps {
         data?: any;
         children: JSX.Element;
     }>;
-    EachRows?: typeof For;
-    EachCells?: typeof For<TableColumn[], JSX.Element>;
+    EachRows?: Each;
+    EachCells?: Each<TableColumn>;
     cellClass?: ((props: Omit<TDProps, 'y' | 'data'> & {
         y?: number;
         data?: any;
@@ -113,7 +120,7 @@ export interface TableStore extends Obj {
     }>[];
     internal: symbol;
     raw: symbol;
-    props?: TableProps2;
+    props: TableProps2;
     rawProps: TableProps;
     plugins: Plugin[];
 }