intable 0.0.36 → 0.0.38

package/dist/utils.js

@@ -2,62 +2,62 @@ 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((x, S) => {
-		let C = new FileReader();
-		C.readAsDataURL(e), C.onload = () => x(C.result);
+	return new Promise((S, C) => {
+		let w = new FileReader();
+		w.readAsDataURL(e), w.onload = () => S(w.result);
 	});
 }
 function chooseFile(e) {
-	return new Promise((x, S) => {
-		let C = document.createElement("input");
-		C.type = "file", C.accept = e?.accept, C.multiple = e?.multiple, C.onchange = () => {
-			C.files && C.files.length > 0 && x(C.multiple ? [...C.files] : C.files[0]);
-		}, C.oncancel = S, C.click();
+	return new Promise((S, C) => {
+		let w = document.createElement("input");
+		w.type = "file", w.accept = e?.accept, w.multiple = e?.multiple, w.onchange = () => {
+			w.files && w.files.length > 0 && S(w.multiple ? [...w.files] : w.files[0]);
+		}, w.oncancel = C, w.click();
 	});
 }
 function chooseImage() {
 	return chooseFile({ accept: "image/*" });
 }
 async function print(e) {
-	let x = document.createElement("iframe");
-	x.srcdoc = `${[...document.querySelectorAll("style"), ...document.querySelectorAll("link[rel=\"stylesheet\"]")].map((e) => e.outerHTML).join("\n")}\n\n${e}`, Object.assign(x.style, {
+	let S = document.createElement("iframe");
+	S.srcdoc = `${[...document.querySelectorAll("style"), ...document.querySelectorAll("link[rel=\"stylesheet\"]")].map((e) => e.outerHTML).join("\n")}\n\n${e}`, Object.assign(S.style, {
 		position: "fixed",
 		display: "none"
-	}), document.body.append(x), await new Promise((e) => x.contentWindow.addEventListener("load", e, { once: !0 })), await delay(300), x.contentWindow.print(), x.remove();
+	}), document.body.append(S), await new Promise((e) => S.contentWindow.addEventListener("load", e, { once: !0 })), await delay(300), S.contentWindow.print(), S.remove();
 }
-function mergeRect(e, x) {
+function mergeRect(e, S) {
 	return DOMRect.fromRect({
-		x: Math.min(e.x, x.x),
-		y: Math.min(e.y, x.y),
-		width: Math.max(e.right, x.right) - Math.min(e.x, x.x),
-		height: Math.max(e.bottom, x.bottom) - Math.min(e.y, x.y)
+		x: Math.min(e.x, S.x),
+		y: Math.min(e.y, S.y),
+		width: Math.max(e.right, S.right) - Math.min(e.x, S.x),
+		height: Math.max(e.bottom, S.bottom) - Math.min(e.y, S.y)
 	});
 }
 function getStyles(e = document) {
 	return [...e.querySelectorAll("style"), ...e.querySelectorAll("link[rel=\"stylesheet\"]")].map((e) => e.outerHTML).join("\n");
 }
-const unFn = (e, ...x) => typeof e == "function" ? e(...x) : e, log = (...e) => (console.log(...e), e[0]), toArr = (e) => Array.isArray(e) ? e : e == null ? [] : [e], isEmpty = (e) => e == null || e === "" || Array.isArray(e) && e.length === 0 || typeof e == "object" && Object.keys(e).length === 0, parseStyle = (e) => e ? e.split(";").reduce((e, x) => ((([x, S]) => e[x.trim()] = S.trim())(x.split(":")), e), {}) : {};
-function findret(e, x) {
-	for (let S = 0; S < e.length; S++) {
-		let C = x(e[S], S);
-		if (C != null) return C;
+const unFn = (e, ...S) => typeof e == "function" ? e(...S) : e, log = (...e) => (console.log(...e), e[0]), toArr = (e) => Array.isArray(e) ? e : e == null ? [] : [e], isEmpty = (e) => e == null || e === "" || Array.isArray(e) && e.length === 0 || typeof e == "object" && Object.keys(e).length === 0, parseStyle = (e) => e ? e.split(";").reduce((e, S) => ((([S, C]) => e[S.trim()] = C.trim())(S.split(":")), e), {}) : {};
+function findret(e, S) {
+	for (let C = 0; C < e.length; C++) {
+		let w = S(e[C], C);
+		if (w != null) return w;
 	}
 }
 function emptyObject(e) {
-	for (let x of Object.keys(e)) delete e[x];
+	for (let S of Object.keys(e)) delete e[S];
 	return e;
 }
-async function findAsync(e, x) {
-	for (let S = 0; S < e.length; S++) if (await x(e[S], S)) return e[S];
+async function findAsync(e, S) {
+	for (let C = 0; C < e.length; C++) if (await S(e[C], C)) return e[C];
 }
 var cache = /* @__PURE__ */ new WeakMap();
-function resolveOptions(x) {
-	let S = x;
-	return isFunction(S) && (S = S()), isPromise(S) ? (cache.has(S) || cache.set(S, useMemoAsync(() => S.then((e) => e.map((e) => resolveOptions(e))))), cache.get(S)()) : (isPlainObject(S) && (S = Object.entries(S).map(([e, x]) => ({
+function resolveOptions(S) {
+	let C = S;
+	return isFunction(C) && (C = C()), isPromise(C) ? (cache.has(C) || cache.set(C, useMemoAsync(() => C.then((e) => e.map((e) => resolveOptions(e))))), cache.get(C)()) : (isPlainObject(C) && (C = Object.entries(C).map(([e, S]) => ({
 		value: e,
-		label: x,
-		...x
-	}))), S?.map((e) => resolveOpt(e)) || []);
+		label: S,
+		...S
+	}))), C?.map((e) => resolveOpt(e)) || []);
 }
 function resolveOpt(e) {
 	return isPlainObject(e) ? e : Array.isArray(e) ? {
@@ -69,14 +69,18 @@ function resolveOpt(e) {
 	};
 }
 function throttlePromise(e) {
-	let x = !1, S;
+	let S = !1, C;
 	return () => {
-		let C = new Promise(function(e) {
-			S = e;
+		let w = new Promise(function(e) {
+			C = e;
 		});
-		return x ? C : (x = !0, e(() => {
-			S(), x = !1, S = null;
-		}), C);
+		return S ? w : (S = !0, e(() => {
+			C(), S = !1, C = null;
+		}), w);
 	};
 }
-export { chooseFile, chooseImage, emptyObject, file2base64, findAsync, findret, getStyles, isEmpty, log, mergeRect, parseStyle, print, resolveOptions, throttlePromise, toArr, tree_exports as tree, unFn };
+function change2(e, S) {
+	for (let C in e) C in S || delete e[C];
+	return Object.assign(e, S), e;
+}
+export { change2, chooseFile, chooseImage, emptyObject, file2base64, findAsync, findret, getStyles, isEmpty, log, mergeRect, parseStyle, print, resolveOptions, throttlePromise, toArr, tree_exports as tree, unFn };

package/dist/wc.js

@@ -1,7 +1,9 @@
-import { useMemoState } from "./hooks/index.js";
+import { createShallowState, useMemoState } from "./hooks/index.js";
+import { change2 } from "./utils.js";
 import { Intable } from "./index.js";
 import { createComponent } from "solid-js/web";
-import { createEffect, createSignal } from "solid-js";
+import { createEffect, createSignal, getOwner, runWithOwner } from "solid-js";
+import { isPlainObject, mapValues } from "es-toolkit";
 import { customElement, noShadowDOM } from "solid-element";
 const TableElement = customElement("wc-table", {
 	options: {},
@@ -13,9 +15,9 @@ const TableElement = customElement("wc-table", {
 	},
 	theme: "",
 	noShadow: !0
-}, (a, { element: o }) => {
-	a.noShadow && noShadowDOM();
-	let s = useMemoState(() => a.options);
-	return createComponent(Intable, s);
+}, (u, { element: d }) => {
+	u.noShadow && noShadowDOM();
+	let f = getOwner(), p = {}, m = useMemoState(() => mapValues(u.options, (c, l) => isPlainObject(c) ? (runWithOwner(f, () => p[l] ??= createShallowState({})), change2(p[l], c)) : c));
+	return createComponent(Intable, m);
 });
 export { TableElement };

package/package.json

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