@pageboard/html 0.14.21 → 0.14.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.14.21",
+  "version": "0.14.23",
   "description": "",
   "main": "index.js",
   "repository": {

package/ui/fieldset-list.js

@@ -164,28 +164,28 @@ class HTMLElementFieldsetList extends Page.Element {
 			}
 		});
 
-		const view = this.ownView;
-		view.textContent = '';
-		view.appendChild(tpl);
-
 		if (placeholder) {
-			for (const node of view.querySelectorAll(`[name^="${this.#prefixStr}"]`)) {
+			for (const node of tpl.querySelectorAll(`[name^="${this.#prefixStr}"]`)) {
 				node.disabled = true;
 			}
 		}
 
-		view.querySelectorAll(this.#selector('up')).forEach((node, i) => {
+		tpl.querySelectorAll(this.#selector('up')).forEach((node, i) => {
 			node.disabled = i == 0;
 		});
-		view.querySelectorAll(this.#selector('down')).forEach((node, i, arr) => {
+		tpl.querySelectorAll(this.#selector('down')).forEach((node, i, arr) => {
 			node.disabled = i == arr.length - 1;
 		});
-		view.querySelectorAll(this.#selector('del')).forEach((node) => {
+		tpl.querySelectorAll(this.#selector('del')).forEach((node) => {
 			node.disabled = this.#list.length <= min;
 		});
-		view.querySelectorAll(this.#selector('add')).forEach((node) => {
+		tpl.querySelectorAll(this.#selector('add')).forEach((node) => {
 			node.disabled = this.#list.length >= max;
 		});
+
+		const view = this.ownView;
+		view.textContent = '';
+		view.appendChild(tpl);
 	}
 
 	#parts(key) {

package/ui/fieldset.js

@@ -13,8 +13,23 @@ class HTMLElementFieldSet extends Page.create(HTMLFieldSetElement) {
 
 	fill(query) {
 		if (this.isContentEditable || !this.options?.name || !this.form) return;
-		if (!query) query = this.form.read(true);
-		const val = query[this.options.name];
+		const { name } = this.options;
+		if (!query) {
+			query = {};
+			for (const node of this.form.querySelectorAll(
+				`[name="${name}"]`
+			)) {
+				if (node.type == "checkbox") {
+					throw new Error("Unsupported checkbox in fiedset condition: " + this.options.name);
+				}
+				if (node.type == "radio") {
+					if (node.checked) query[name] = node.value;
+				} else {
+					query[name] = node.value;
+				}
+			}
+		}
+		const val = query[name];
 		const disabled = this.disabled = this.hidden = !this.#compare(val);
 		for (const node of this.querySelectorAll('[name]')) {
 			node.disabled = disabled;
@@ -22,13 +37,12 @@ class HTMLElementFieldSet extends Page.create(HTMLFieldSetElement) {
 	}
 
 	patch(state) {
-		// before/after form#fill
-		this.fill(null);
-		state.finish(() => this.fill(null));
+		// initialize
+		this.fill();
 	}
 	handleAllChange(e, state) {
 		if (this.form?.contains(e.target)) {
-			this.fill(null);
+			this.fill();
 		}
 	}
 }

package/ui/layout.css

@@ -68,8 +68,7 @@
 	}
 
 	&.column {
-		> img,
-		&.left > img {
+		> img, &.left > img {
 			align-self:flex-start;
 		}
 		&.hcenter > img {