intable 0.0.43 → 0.0.45

package/dist/index.d.ts

@@ -114,16 +114,17 @@ export type THProps = {
     colspan?: number;
     style?: any;
 };
-export type TDProps = {
+interface TDProps {
     x: number;
     y: number;
     data: any;
     col: TableColumn;
     value?: any;
+    onChange?: (v: any) => void;
     children?: JSX.Element;
     rowspan?: number;
     colspan?: number;
-};
+}
 type Obj = Record<string | symbol, any>;
 export interface TableColumn extends Obj {
     id: any;

package/dist/index.js

@@ -109,40 +109,44 @@ var THead = () => {
 		} });
 	} });
 }, TBody = () => {
-	let { props: _ } = useContext(Ctx);
+	let { props: _, store: K } = useContext(Ctx);
 	return createComponent(_.Tbody, { get children() {
 		return createComponent(_.EachRows, {
 			get each() {
 				return _.data;
 			},
-			children: (K, q) => createComponent(_.Tr, {
+			children: (q, J) => createComponent(_.Tr, {
 				get y() {
-					return q();
+					return J();
 				},
 				get data() {
-					return K();
+					return q();
 				},
 				get children() {
 					return createComponent(_.EachCells, {
 						get each() {
 							return _.columns;
 						},
-						children: (J, Y) => createComponent(_.Td, {
+						children: (Y, X) => createComponent(_.Td, {
 							get col() {
-								return J();
+								return Y();
 							},
 							get x() {
-								return Y();
+								return X();
 							},
 							get y() {
-								return q();
+								return J();
 							},
 							get data() {
-								return K();
+								return q();
 							},
 							get value() {
-								return K()[J().id];
-							}
+								return q()[Y().id];
+							},
+							onChange: (_) => K.commands.rowChange({
+								...q(),
+								[Y().id]: _
+							})
 						})
 					});
 				}
@@ -153,7 +157,8 @@ var THead = () => {
 function BasePlugin() {
 	let _ = {
 		col: null,
-		data: null
+		data: null,
+		onChange: null
 	}, K = (_) => (() => {
 		var K = _tmpl$();
 		return spread(K, _, !1, !1), K;
@@ -273,23 +278,19 @@ function BasePlugin() {
 				}), createComponent(_, q);
 			},
 			Th: ({ Th: _ = Q }, { store: K }) => (J) => {
-				let [Y, X] = createSignal(), { props: Z } = useContext(Ctx), Q = combineProps(J, { ref: X }, {
-					get class() {
-						return unFn(Z.cellClass, J);
-					},
-					get style() {
-						return unFn(Z.cellStyle, J);
-					}
-				}, {
+				let [Y, X] = createSignal(), { props: Z } = useContext(Ctx), Q = combineProps(J, {
+					ref: X,
 					get class() {
-						return J.col.class;
+						return [unFn(Z.cellClass, J), J.col.class].filter(Boolean).join(" ");
 					},
 					get style() {
-						return J.col.style;
+						return [
+							unFn(Z.cellStyle, J),
+							J.col.style,
+							J.col.width && `width: ${J.col.width}px; max-width: ${J.col.width}px`
+						].filter(Boolean).join(";");
 					}
-				}, { get style() {
-					return J.col.width ? `width: ${J.col.width}px; max-width: ${J.col.width}px` : "";
-				} });
+				});
 				return createEffect(() => {
 					if (J.covered || (J.colspan ?? 1) != 1) return;
 					let { x: _ } = J;
@@ -303,24 +304,17 @@ function BasePlugin() {
 			Td: ({ Td: _ = $ }, { store: K }) => (K) => {
 				let { props: J } = useContext(Ctx), Y = combineProps(K, {
 					get class() {
-						return unFn(J.cellClass, K);
+						return [unFn(J.cellClass, K), K.col.class].filter(Boolean).join(" ");
 					},
 					get style() {
-						return unFn(J.cellStyle, K);
+						return [
+							unFn(J.cellStyle, K),
+							K.col.style,
+							K.col.width && `width: ${K.col.width}px; max-width: ${K.col.width}px`
+						].filter(Boolean).join(";");
 					}
-				}, {
-					get class() {
-						return K.col.class;
-					},
-					get style() {
-						return K.col.style;
-					}
-				}, { get style() {
-					return K.col.width ? `width: ${K.col.width}px; max-width: ${K.col.width}px` : "";
-				} });
-				return createComponent(_, mergeProps(Y, { get children() {
-					return K.children;
-				} }));
+				});
+				return createComponent(_, Y);
 			},
 			EachRows: ({ EachRows: _ }) => _ || ((_) => createComponent(For, {
 				get each() {

package/dist/plugins/RenderPlugin/index.js

@@ -1,31 +1,27 @@
 import { renderComponent, solidComponent } from "../../components/utils.js";
 import { resolveOptions, toArr } from "../../utils.js";
 import { Checkbox, Files } from "./components.js";
-import { createComponent, insert, memo, mergeProps, template } from "solid-js/web";
-import { mergeProps as mergeProps$1 } from "solid-js";
+import { createComponent, insert, mergeProps, template } from "solid-js/web";
 var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center h-full\">");
 const RenderPlugin = {
 	name: "render",
 	priority: -Infinity,
 	store: () => ({ renders: { ...renders } }),
-	rewriteProps: { Td: ({ Td: p }, { store: m }) => (h) => createComponent(p, mergeProps(h, { get children() {
+	rewriteProps: { Td: ({ Td: d }, { store: f }) => (p) => createComponent(d, mergeProps(p, { get children() {
 		return (() => {
-			let p = ((e) => typeof e == "string" ? m.renders[e] : e)(h.col.render ?? h.col.type) || text;
-			return renderComponent(p, mergeProps$1(h, { onChange: (e) => m.commands.rowChange({
-				...h.data,
-				[h.col.id]: e
-			}) }), m);
+			let d = ((e) => typeof e == "string" ? f.renders[e] : e)(p.col.render ?? p.col.type);
+			return d ? renderComponent(d, p, f) : text(p);
 		})();
 	} })) }
 };
-var text = (e) => memo(() => memo(() => !!e.col.enum)() ? toArr(e.value).map((p) => resolveOptions(e.col.enum).find((e) => e.value == p)?.label ?? p).join(", ") : e.value);
+var text = (e) => e.col.enum ? toArr(e.value).map((d) => resolveOptions(e.col.enum).find((e) => e.value == d)?.label ?? d).join(", ") : e.value;
 const renders = {
 	text,
 	number: text,
 	date: text,
 	checkbox: (e) => (() => {
-		var p = _tmpl$();
-		return insert(p, createComponent(Checkbox, {
+		var d = _tmpl$();
+		return insert(d, createComponent(Checkbox, {
 			class: "",
 			get value() {
 				return e.value;
@@ -33,7 +29,7 @@ const renders = {
 			get onChange() {
 				return e.onChange;
 			}
-		})), p;
+		})), d;
 	})(),
 	file: (e) => createComponent(Files, {
 		get value() {

package/dist/test.d.ts

@@ -0,0 +1,4 @@
+import { type JSX } from 'solid-js';
+import 'virtual:uno.css';
+import './style.scss';
+export declare const TestTable: (props: any) => JSX.Element;

package/dist/test.js

@@ -0,0 +1,40 @@
+import './style.css';import './__uno.css';/* empty css      */
+/* empty css      */
+import { createComponent, effect, insert, setAttribute, template } from "solid-js/web";
+import { For } from "solid-js";
+var _tmpl$ = /* @__PURE__ */ template("<table><thead><tr></tr></thead><thead>"), _tmpl$2 = /* @__PURE__ */ template("<th>"), _tmpl$3 = /* @__PURE__ */ template("<tr>"), _tmpl$4 = /* @__PURE__ */ template("<td>");
+const TestTable = (o) => (() => {
+	var u = _tmpl$(), d = u.firstChild, f = d.firstChild, p = d.nextSibling;
+	return insert(f, createComponent(For, {
+		get each() {
+			return o.columns;
+		},
+		children: (e) => (() => {
+			var i = _tmpl$2();
+			return insert(i, () => e.name), i;
+		})()
+	})), insert(p, createComponent(For, {
+		get each() {
+			return o.data;
+		},
+		children: (c, l) => (() => {
+			var u = _tmpl$3();
+			return setAttribute(u, "data", c), insert(u, createComponent(For, {
+				get each() {
+					return o.columns;
+				},
+				children: (e, o) => (() => {
+					var s = _tmpl$4();
+					return setAttribute(s, "data", c), insert(s, () => c[e.id]), effect((e) => {
+						var i = o(), a = l();
+						return i !== e.e && setAttribute(s, "x", e.e = i), a !== e.t && setAttribute(s, "y", e.t = a), e;
+					}, {
+						e: void 0,
+						t: void 0
+					}), s;
+				})()
+			})), effect(() => setAttribute(u, "y", l())), u;
+		})()
+	})), u;
+})();
+export { TestTable };

package/package.json

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