@pageboard/html 0.11.7 → 0.11.8

package/elements/fieldsets.js

@@ -32,7 +32,7 @@ exports.fieldset = {
 		}
 	},
 	contents: "fieldset_legend block+",
-	html: '<fieldset class="[plain|?]" data-name="[name]" data-value="[value]" is="element-fieldset"></fieldset>',
+	html: '<fieldset class="[plain|?]" data-name="[name|split:.|slice:1|join:.]" data-value="[value]" is="element-fieldset"></fieldset>',
 	scripts: ["../ui/fieldset.js"],
 	stylesheets: ['../ui/fieldset.css']
 };

package/elements/image.js

@@ -132,7 +132,7 @@ exports.image = {
 		class="[display.fit|or:none] [display.horizontal|or:] [display.vertical|or:]"
 		alt="[alt]"
 		data-src="[url|or:[$element.resources.empty]]"
-		data-crop="[crop.x];[crop.y];[crop.width];[crop.height];[crop.zoom]"
+		data-crop="[crop.x|or:50];[crop.y|or:50];[crop.width|or:100];[crop.height|or:100];[crop.zoom|or:100]"
 	>
 		<div block-content="legend"></div>
 	</element-image>`,

package/elements/input-property.js

@@ -80,13 +80,17 @@ exports.input_property = {
 				cases = null;
 				discKey = null;
 			} else {
+				if (prop.type == "array" && prop.items && !Array.isArray(prop.items)) {
+					prop = prop.items;
+				}
 				if (prop.select && prop.select.$data == `0/${propKey}`) {
 					cases = prop.selectCases;
 				} else if (prop.discriminator && prop.discriminator.propertyName == propKey) {
 					cases = prop.oneOf;
 					discKey = propKey;
 				}
-				prop = (prop.items && prop.items.properties || prop.properties || {})[propKey] || null;
+				if (prop.properties) prop = prop.properties;
+				prop = prop[propKey];
 			}
 			if (prop == null) break;
 		}

package/lib/nouislider.js

@@ -714,6 +714,7 @@
         var hover = entry.indexOf("hover") >= 0;
         var unconstrained = entry.indexOf("unconstrained") >= 0;
         var dragAll = entry.indexOf("drag-all") >= 0;
+        var smoothSteps = entry.indexOf("smooth-steps") >= 0;
         if (fixed) {
             if (parsed.handles !== 2) {
                 throw new Error("noUiSlider: 'fixed' behaviour must be used with 2 handles");
@@ -728,6 +729,7 @@
             tap: tap || snap,
             drag: drag,
             dragAll: dragAll,
+            smoothSteps: smoothSteps,
             fixed: fixed,
             snap: snap,
             hover: hover,
@@ -1472,6 +1474,14 @@
                     scope_Body.removeEventListener("selectstart", preventDefault);
                 }
             }
+            if (options.events.smoothSteps) {
+                data.handleNumbers.forEach(function (handleNumber) {
+                    setHandle(handleNumber, scope_Locations[handleNumber], true, true, false, false);
+                });
+                data.handleNumbers.forEach(function (handleNumber) {
+                    fireEvent("update", handleNumber);
+                });
+            }
             data.handleNumbers.forEach(function (handleNumber) {
                 fireEvent("change", handleNumber);
                 fireEvent("set", handleNumber);
@@ -1771,7 +1781,7 @@
             });
         }
         // Split out the handle positioning logic so the Move event can use it, too
-        function checkHandlePosition(reference, handleNumber, to, lookBackward, lookForward, getValue) {
+        function checkHandlePosition(reference, handleNumber, to, lookBackward, lookForward, getValue, smoothSteps) {
             var distance;
             // For sliders with multiple handles, limit movement to the other handle.
             // Apply the margin option by adding it to the handle positions.
@@ -1810,7 +1820,9 @@
                     to = Math.min(to, distance);
                 }
             }
-            to = scope_Spectrum.getStep(to);
+            if (!smoothSteps) {
+                to = scope_Spectrum.getStep(to);
+            }
             // Limit percentage to the 0 - 100 range
             to = limit(to);
             // Return false if handle can't move
@@ -1830,6 +1842,7 @@
             var proposals = locations.slice();
             // Store first handle now, so we still have it in case handleNumbers is reversed
             var firstHandle = handleNumbers[0];
+            var smoothSteps = options.events.smoothSteps;
             var b = [!upward, upward];
             var f = [upward, !upward];
             // Copy handleNumbers so we don't change the dataset
@@ -1842,7 +1855,7 @@
             // Step 1: get the maximum percentage that any of the handles can move
             if (handleNumbers.length > 1) {
                 handleNumbers.forEach(function (handleNumber, o) {
-                    var to = checkHandlePosition(proposals, handleNumber, proposals[handleNumber] + proposal, b[o], f[o], false);
+                    var to = checkHandlePosition(proposals, handleNumber, proposals[handleNumber] + proposal, b[o], f[o], false, smoothSteps);
                     // Stop if one of the handles can't move.
                     if (to === false) {
                         proposal = 0;
@@ -1860,7 +1873,8 @@
             var state = false;
             // Step 2: Try to set the handles with the found percentage
             handleNumbers.forEach(function (handleNumber, o) {
-                state = setHandle(handleNumber, locations[handleNumber] + proposal, b[o], f[o]) || state;
+                state =
+                    setHandle(handleNumber, locations[handleNumber] + proposal, b[o], f[o], false, smoothSteps) || state;
             });
             // Step 3: If a handle moved, fire events
             if (state) {
@@ -1905,9 +1919,9 @@
         }
         // Test suggested values and apply margin, step.
         // if exactInput is true, don't run checkHandlePosition, then the handle can be placed in between steps (#436)
-        function setHandle(handleNumber, to, lookBackward, lookForward, exactInput) {
+        function setHandle(handleNumber, to, lookBackward, lookForward, exactInput, smoothSteps) {
             if (!exactInput) {
-                to = checkHandlePosition(scope_Locations, handleNumber, to, lookBackward, lookForward, false);
+                to = checkHandlePosition(scope_Locations, handleNumber, to, lookBackward, lookForward, false, smoothSteps);
             }
             if (to === false) {
                 return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "description": "",
   "main": "index.js",
   "scripts": {

package/ui/fieldset-list.js

@@ -29,15 +29,25 @@ class WalkIndex {
 
 class HTMLElementFieldsetList extends VirtualHTMLElement {
 	#size;
+	#initialSize;
 	#prefix;
 	#model;
 	#walk;
 
 	fill(values, scope) {
 		const list = this.#listFromValues({ ...values });
+		if (this.#initialSize == null) this.#initialSize = list.length;
 		this.#resize(list.length, scope);
 	}
 
+	reset() {
+		this.#resize(this.#initialSize, {}); // missing scope
+	}
+
+	save() {
+		this.#initialSize = this.#size;
+	}
+
 	#prepare() {
 		this.ownTpl.prerender();
 		if (this.isContentEditable) return;
@@ -105,8 +115,24 @@ class HTMLElementFieldsetList extends VirtualHTMLElement {
 		for (const node of inputs) {
 			if (node.name.startsWith(prefix)) {
 				node.name = `${prefix}[$field.index].${node.name.substring(prefix.length)}`;
+				if (node.id?.startsWith('for-' + prefix)) {
+					node.id = `for-${prefix}[$field.index].${node.id.substring(4 + prefix.length)}`;
+				}
 			}
 		}
+		const conditionalFieldsets = tpl.querySelectorAll('[is="element-fieldset"]');
+		for (const node of conditionalFieldsets) {
+			if (node.dataset.name?.startsWith(prefix)) {
+				node.dataset.name = `${prefix}[$field.index].${node.dataset.name.substring(prefix.length)}`;
+			}
+		}
+		const labels = tpl.querySelectorAll('label[for]');
+		for (const node of labels) {
+			if (node.htmlFor?.startsWith('for-' + prefix)) {
+				node.htmlFor = `for-${prefix}[$field.index].${node.htmlFor.substring(4 + prefix.length)}`;
+			}
+		}
+
 		const subtpl = inputs.ancestor();
 		if (!subtpl) {
 			console.warn("fieldset-list should contain input[name]", this);

package/ui/fieldset.js

@@ -10,12 +10,13 @@ class HTMLCustomFieldSetElement extends HTMLFieldSetElement {
 
 	#update() {
 		if (this.isContentEditable || !this.options.name) return;
-		const name = this.options.name.split(".").slice(1).join('.');
-		const val = this.form?.read(true)?.[name];
+		const val = this.form?.read(true)?.[this.options.name];
 		this.disabled = this.hidden = val != this.options.value;
 	}
 
 	patch(state) {
+		// before/after form#fill
+		this.#update();
 		state.finish(() => this.#update());
 	}
 	setup() {

package/ui/form.js

@@ -43,10 +43,6 @@ class HTMLCustomFormElement extends HTMLFormElement {
 		const fd = new FormData(this);
 		const query = {};
 		fd.forEach((val, key) => {
-			const cur = this.querySelectorAll(`[name="${key}"]`).slice(-1).pop();
-			if (cur.type == "file") {
-				val = cur.value;
-			}
 			if (val == "") val = null;
 			// build array-like values
 			const old = query[key];
@@ -79,6 +75,9 @@ class HTMLCustomFormElement extends HTMLFormElement {
 			if (defVal == "") defVal = null;
 
 			switch (type) {
+				case "file":
+					query[name] = val;
+					break;
 				case "radio":
 					if (!withDefaults && node.checked == node.defaultChecked) {
 						if (query[name] == val) {
@@ -172,11 +171,17 @@ class HTMLCustomFormElement extends HTMLFormElement {
 		return vars;
 	}
 	save() {
+		for (const node of this.querySelectorAll("element-fieldset-list")) {
+			node.save();
+		}
 		for (const node of this.elements) {
 			if (node.save) node.save();
 		}
 	}
 	reset() {
+		for (const node of this.querySelectorAll("element-fieldset-list")) {
+			node.reset();
+		}
 		for (const node of this.elements) {
 			if (node.reset) node.reset();
 		}

package/ui/menu.css

@@ -45,14 +45,17 @@
 	display: flex;
 	flex-direction: column;
 }
+.right.burger .popup.item > .placer {
+	left: auto;
+	right:0;
+}
 .right.popup.item > .placer > div {
 	left:auto;
 	right:0;
 }
 .fixed.popup.item > .placer > div {
-	position:fixed;
-	max-width: 100%;
-	max-height: 100%;
+	max-width: 100vw;
+	max-height: 100vh;
 }
 .center.popup.item > .placer > div {
 	transform: translateX(-50%);

package/ui/menu.js

@@ -57,7 +57,7 @@ class HTMLElementMenu extends VirtualHTMLElement {
 			} else {
 				const padding = this.offsetTop + this.offsetHeight;
 				const menu = tosser.lastElementChild.lastElementChild;
-				menu.style.maxHeight = `calc(100% - ${padding}px)`;
+				menu.style.maxHeight = `calc(100vh - ${padding}px)`;
 			}
 		} else if (item) {
 			this.active = item != this.active ? item : null;