@pageboard/html 0.11.6 → 0.11.7

package/elements/input-property.js

@@ -41,6 +41,7 @@ exports.input_property = {
 	fuse: function(node, d, scope) {
 		const view = scope.$view;
 		const doc = scope.$doc;
+		const dateFormats = ["date", "time", "date-time"];
 		let name = d.name;
 		if (!name) {
 			return node;
@@ -242,8 +243,40 @@ exports.input_property = {
 					label: prop.title
 				}
 			}));
-		} else if (propType.type == "string" && ["date", "time", "date-time"].includes(propType.format)) {
+		} else if (propType.type == "object" && Object.keys(propType.properties).sort().join(' ') == "end start" && dateFormats.includes(propType.properties.start.format) && dateFormats.includes(propType.properties.end.format)) {
 			node.appendChild(view.render({
+				id,
+				type: 'input_date_slot',
+				data: {
+					nameStart: name,
+					nameEnd: name,
+					format: propType.properties.start.format.replace('-', ''),
+					disabled: d.disabled,
+					required: required,
+					step: propType.properties.start.step
+				},
+				content: {
+					label: prop.title
+				}
+			}));
+		} else if (propType.type == "string" && dateFormats.includes(propType.format)) {
+			if (d.multiple) node.appendChild(view.render({
+				id,
+				type: 'input_date_slot',
+				data: {
+					nameStart: name,
+					nameEnd: name,
+					format: propType.format.replace('-', ''),
+					default: propType.default,
+					disabled: d.disabled,
+					required: required,
+					step: propType.step
+				},
+				content: {
+					label: prop.title
+				}
+			}));
+			else node.appendChild(view.render({
 				id,
 				type: 'input_date_time',
 				data: {

package/elements/inputs.js

@@ -233,7 +233,7 @@ exports.input_range = {
 	menu: "form",
 	group: "block",
 	context: 'form//',
-	properties: {
+	properties: Object.assign({}, exports.input_number.properties, {
 		multiple: {
 			title: 'Multiple',
 			type: 'boolean',
@@ -242,10 +242,14 @@ exports.input_range = {
 		pips: {
 			title: 'Pips',
 			type: 'boolean',
-			default: true
+			default: false
 		},
-		...exports.input_number.properties
-	},
+		step: {
+			title: 'Step',
+			type: "number",
+			default: 10
+		}
+	}),
 	contents: {
 		id: 'label',
 		nodes: 'inline*'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "formdata-polyfill": "^4.0.10",
-    "nouislider": "^15.5.1",
+    "nouislider": "^15.6.0",
     "object-fit-images": "^3.2.4",
     "postinstall-bundle": "^0.7.4"
   },

package/ui/fieldset-list.js

@@ -122,6 +122,12 @@ class HTMLElementFieldsetList extends VirtualHTMLElement {
 				while (node.previousSibling) node.previousSibling.remove();
 				node = node.parentNode;
 			}
+			{
+				const hidden = tpl.ownerDocument.createElement('input');
+				hidden.type = "hidden";
+				hidden.name = prefix.slice(0, -1);
+				tpl.appendChild(hidden);
+			}
 		}
 		tpl = tpl.fuse({ $fieldset }, scope);
 

package/ui/fieldset.css

@@ -11,7 +11,7 @@ fieldset.plain {
 fieldset.plain > legend {
 	display:none;
 }
-fieldset:not(.plain) > legend {
+fieldset:not(.plain) > legend:not(:empty) {
 	padding-left:0.1em;
 	padding-right:0.2em;
 }

package/ui/form.js

@@ -51,10 +51,16 @@ class HTMLCustomFormElement extends HTMLFormElement {
 			// build array-like values
 			const old = query[key];
 			if (old !== undefined) {
-				if (!Array.isArray(old)) {
-					query[key] = old == null ? [] : [old];
+				if (old == null) {
+					if (val == null) {
+						// keep it that way
+					} else {
+						query[key] = [];
+					}
+				} else if (val != null) {
+					if (!Array.isArray(old)) query[key] = [old];
+					query[key].push(val);
 				}
-				if (val !== undefined) query[key].push(val);
 			} else {
 				query[key] = val;
 			}
@@ -119,9 +125,16 @@ class HTMLCustomFormElement extends HTMLFormElement {
 			if (name in query && !vars.includes(name)) vars.push(name);
 			const val = query[name];
 			const str = ((v) => {
-				if (v == null) return "";
-				else if (typeof v == "object") return v;
-				else return v.toString();
+				if (v == null) {
+					return "";
+				} else if (Array.isArray(v)) {
+					if (["radio", "checkbox"].includes(elem.type)) return v;
+					else return v.shift();
+				} else if (typeof v == "object") {
+					return v;
+				} else {
+					return v.toString();
+				}
 			})(val);
 			switch (elem.type) {
 				case 'submit':

package/ui/input-date-slot.js

@@ -29,11 +29,14 @@ class HTMLElementInputDateSlot extends VirtualHTMLElement {
 		const [startEl, endEl] = this.#inputs();
 		const isStart = input == startEl;
 
-		let start = startEl.valueAsDate;
+		const start = startEl.valueAsDate;
 		let end = endEl.valueAsDate;
 		if (!start && !end) return;
-		if (!start) start = new Date(end);
-		else if (!end) end = new Date(start);
+		if (!start) {
+			endEl.valueAsDate = null;
+			return;
+		}
+		if (!end) end = new Date(start);
 		let startPart, endPart;
 		let equal = true;
 		for (const Part of ['FullYear', 'Month', 'Date', 'Hours', 'Minutes', 'Seconds']) {

package/ui/input-date.js

@@ -26,7 +26,7 @@ class HTMLElementInputDate extends HTMLInputElement {
 		return d;
 	}
 	set valueAsDate(d) {
-		let t = d.getTime();
+		let t = d?.getTime();
 		if (!d || Number.isNaN(t)) {
 			super.value = "";
 			return;

package/ui/input-range.js

@@ -16,11 +16,12 @@ class HTMLElementInputRange extends HTMLInputElement {
 		max: (x) => parseFloat(x) || 100,
 		value: (x) => this.parse(x),
 		step: (x) => parseFloat(x) || 1,
-		multiple: true,
-		pips: true,
+		multiple: false,
+		pips: false
 	};
 
 	get helper() {
+		if (!this.parentNode) return null;
 		let node = this.parentNode.querySelector('.noUi-target');
 		if (!node) {
 			node = this.ownerDocument.createElement('div');
@@ -43,19 +44,35 @@ class HTMLElementInputRange extends HTMLInputElement {
 		this.rangeValue = this.constructor.parse(str);
 		this.updateSlider();
 	}
+	convertOptions(opts) {
+		return {
+			step: Math.max(opts.step ?? 10, Math.round((opts.max - opts.min) / 10)),
+			range: {
+				min: opts.min ?? 0,
+				max: opts.max ?? 100
+			},
+			pips: opts.pips ? {
+				mode: 'steps',
+				density: 100
+			} : false,
+		};
+	}
 	updateSlider() {
 		const helper = this.helper;
-		if (!helper.noUiSlider) return;
-		let [start, stop] = this.options.value || [];
+		const slider = helper?.noUiSlider;
+		if (!slider) return;
+		const opts = this.options;
+		let [start, stop] = opts.value || [];
 		let indet = false;
 		if (start == null) {
-			start = this.options.min;
-			if (stop == null) stop = this.options.max;
+			start = opts.min;
+			if (stop == null) stop = opts.max;
 			indet = true;
 		}
 		if (stop == null) stop = start;
 
-		helper.noUiSlider.set([start, stop]);
+		slider.set([start, stop]);
+		slider.updateOptions(this.convertOptions(opts));
 		helper.classList.toggle('indeterminate', indet);
 	}
 	patch(state) {
@@ -64,19 +81,12 @@ class HTMLElementInputRange extends HTMLInputElement {
 	setup(state) {
 		const opts = this.options;
 		const helper = this.helper;
-		if (!helper.noUiSlider) window.noUiSlider.create(helper, {
+		if (!helper) return;
+		if (!helper.noUiSlider) window.noUiSlider.create(helper, Object.assign({
 			start: opts.multiple ? [null, null] : [null],
-			step: opts.step,
-			range: {
-				min: opts.min,
-				max: opts.max
-			},
-			pips: opts.pips ? {
-				mode: 'steps',
-				density: 100
-			} : false,
 			connect: true
-		}).on('change', (values) => {
+		}, this.convertOptions(opts))).on('change', (values) => {
+			if (this.isContentEditable) return;
 			const isInt = parseInt(opts.step) == opts.step;
 			helper.classList.remove('indeterminate');
 			if (isInt) values = values.map((n) => parseInt(n));
@@ -91,6 +101,7 @@ class HTMLElementInputRange extends HTMLInputElement {
 		this.patch(state);
 	}
 	handleEvent(e) {
+		if (this.isContentEditable) return;
 		if (e.type == "dblclick" || e.keyCode == 8 || e.keyCode == 46) {
 			this.fill();
 			this.dispatchEvent(new Event('change', {
@@ -102,6 +113,7 @@ class HTMLElementInputRange extends HTMLInputElement {
 
 	close() {
 		const helper = this.helper;
+		if (!helper) return;
 		if (helper.noUiSlider) helper.noUiSlider.destroy();
 		helper.removeEventListener('keydown', this, true);
 		helper.removeEventListener('dblclick', this, true);