@pageboard/html 0.14.5 → 0.14.6

package/package.json

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

package/ui/fieldset-list.js

@@ -37,8 +37,10 @@ class HTMLElementFieldsetList extends Page.Element {
 	fill(values, scope) {
 		if (scope.$write || this.prefix == null) return;
 		// unflatten array-values
+		const vars = [];
 		for (const [key, val] of Object.entries(values)) {
 			if (!this.#prefixed(key)) continue;
+			vars.push(key);
 			if (Array.isArray(val)) {
 				for (let i = 0; i < val.length; i++) {
 					values[key + '.' + i] = val[i];
@@ -49,6 +51,7 @@ class HTMLElementFieldsetList extends Page.Element {
 		const list = this.#listFromValues({ ...values });
 		if (this.#initialSize == null) this.#initialSize = list.length;
 		this.#resize(list.length, scope);
+		return vars;
 	}
 
 	reset() {

package/ui/form.js

@@ -31,6 +31,7 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 			if (action == "toggle") {
 				action = val ? "enable" : "disable";
 			}
+			const isQuery = ctx.expr.path[0] == "$query" && ctx.expr.path.length == 1;
 
 			state.finish(() => {
 				if (action == "enable") {
@@ -41,7 +42,10 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 					if (val == null) {
 						form.reset?.();
 					} else if (typeof val == "object") {
-						form.fill?.(this.linearizeValues(val), state.scope);
+						const vars = form.fill?.(this.linearizeValues(val), state.scope) ?? [];
+						if (isQuery) {
+							for (const name of vars) state.vars[name] = true;
+						}
 						form.save?.();
 					}
 				}
@@ -222,14 +226,15 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 	}
 	fill(query, scope) {
 		// fieldset-list are not custom inputs yet
+		const vars = [];
 		for (const node of this.querySelectorAll("element-fieldset-list")) {
-			node.fill?.(query, scope);
+			if (node.fill) vars.push(...node.fill(query, scope));
 		}
-		const vars = [];
+
 		for (const elem of this.elements) {
 			const name = elem.name;
 			if (!name) continue;
-			if (name in query && !vars.includes(name)) vars.push(name);
+			if (name in query) vars.push(name);
 			const val = query[name];
 			if (val === undefined) {
 				elem.reset?.();