@pageboard/html 0.17.0 → 0.17.1

package/package.json

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

package/ui/form.js

@@ -315,7 +315,6 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 		}
 
 		const scope = state.scope.copy();
-		scope.$request = form.read(true, e.submitter);
 		try {
 			const prelist = Array.from(form.elements)
 				.filter(node => Boolean(node.presubmit) && !node.disabled);
@@ -323,10 +322,14 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 			for (const node of prelist) {
 				await node.presubmit(state);
 			}
-			form.enable();
-			scope.$request = form.read(true, e.submitter);
-			form.disable();
-			form.classList.add('loading');
+		} catch (err) {
+			scope.$response = err;
+		}
+		form.enable();
+		scope.$request = form.read(true, e.submitter);
+		form.disable();
+		form.classList.add('loading');
+		try {
 			scope.$response = await state.fetch(
 				form.method,
 				e.submitter?.getAttribute('formaction') || form.action,
@@ -386,34 +389,35 @@ Page.define(`element-form`, HTMLElementForm, 'form');
 
 /* these methods must be available even on non-upgraded elements */
 HTMLFormElement.prototype.enable = function () {
-	for (let i = 0; i < this.elements.length; i++) {
-		const elem = this.elements[i];
+	for (const elem of this.elements) {
+		if (elem.matches('fieldset')) continue;
+		const fieldset = elem.closest('fieldset');
+		if (fieldset?.disabled) continue;
 		elem.disabled = false;
 		if (elem.hasAttribute('disabled')) elem.removeAttribute('disabled');
 	}
 };
 HTMLFormElement.prototype.disable = function () {
-	for (let i = 0; i < this.elements.length; i++) {
-		const elem = this.elements[i];
+	for (const elem of this.elements) {
+		if (elem.matches('fieldset')) continue;
 		elem.disabled = true;
 	}
 };
 
 HTMLSelectElement.prototype.fill = function (val) {
 	if (!Array.isArray(val)) val = [val];
-	for (let i = 0; i < this.options.length; i++) {
-		const opt = this.options[i];
+	for (const opt of this.options) {
 		opt.selected = val.includes(opt.value);
 	}
 };
 HTMLSelectElement.prototype.reset = function () {
-	for (let i = 0; i < this.options.length; i++) {
-		this.options[i].selected = this.options[i].defaultSelected;
+	for (const opt of this.options) {
+		opt.selected = opt.defaultSelected;
 	}
 };
 HTMLSelectElement.prototype.save = function () {
-	for (let i = 0; i < this.options.length; i++) {
-		this.options[i].defaultSelected = this.options[i].selected;
+	for (const opt of this.options) {
+		opt.defaultSelected = opt.selected;
 	}
 };