@pageboard/html 0.10.12 → 0.10.15

package/ui/form.js

@@ -33,27 +33,26 @@ class HTMLCustomFormElement extends HTMLFormElement {
 		delete state.query.submit;
 		state.finish(() => {
 			if (state.status != 200) return;
-			const e = document.createEvent('HTMLEvents');
-			e.initEvent('submit', true, true);
-			this.dispatchEvent(e);
+			this.dispatchEvent(new Event('submit', {
+				bubbles: true,
+				cancelable: true
+			}));
 		});
 	}
-	read(withDefaults) {
+	read(withDefaults = false) {
 		const fd = new FormData(this);
 		const query = {};
 		fd.forEach((val, key) => {
-			if (val == null || val == "") {
-				const cur = this.querySelectorAll(`[name="${key}"]`).slice(-1).pop();
-				if (cur.required == false) {
-					val = undefined;
-				} else {
-					val = null;
-				}
+			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];
 			if (old !== undefined) {
 				if (!Array.isArray(old)) {
-					query[key] = [old];
+					query[key] = old == null ? [] : [old];
 				}
 				if (val !== undefined) query[key].push(val);
 			} else {
@@ -61,37 +60,48 @@ class HTMLCustomFormElement extends HTMLFormElement {
 			}
 		});
 
+		// withDefaults: keep value if equals to its default
+		// else unset value
 		for (const node of this.elements) {
-			if (node.name == null || node.name == "" || node.type == "button") continue;
+			const { name, type } = node;
+			if (name == null || name == "" || type == "button") {
+				continue;
+			}
 			let val = node.value;
 			if (val == "") val = null;
-			if (node.type == "radio") {
-				if (!withDefaults && node.checked == node.defaultChecked && query[node.name] == val) {
-					query[node.name] = undefined;
-				}
-			} else if (node.type == "checkbox") {
-				if (!(node.name in query)) {
-					if (!withDefaults) query[node.name] = undefined;
-				}
-			} else if (node.type == "hidden") {
-				// always include them
-			} else {
-				let defVal = node.defaultValue;
-				if (defVal == "") defVal = null;
-				if (!withDefaults && query[node.name] == defVal) {
-					query[node.name] = undefined;
-				} else {
-					// not yet using form-associated custom input
-					query[node.name] = node.value;
-				}
-			}
-			if (query[node.name] === undefined && withDefaults) {
-				query[node.name] = null;
+			let defVal = node.defaultValue;
+			if (defVal == "") defVal = null;
+
+			switch (type) {
+				case "radio":
+					if (!withDefaults && node.checked == node.defaultChecked) {
+						if (query[name] == val) {
+							query[name] = undefined;
+						}
+					}
+					break;
+				case "checkbox":
+					if (!withDefaults) {
+						if (!(name in query)) {
+							query[name] = undefined;
+						}
+					}
+					break;
+				case "hidden":
+					break;
+				default:
+					if (withDefaults) {
+						if (query[name] === undefined) {
+							query[name] = defVal;
+						}
+					} else if (val === defVal) {
+						query[name] = node.required ? null : undefined;
+					}
 			}
 		}
+		// FIXME use e.submitter polyfill when available
+		// https://github.com/Financial-Times/polyfill-library/issues/1111
 		const btn = document.activeElement;
-		// FIXME https://github.com/whatwg/html/issues/3195 use e.submitter polyfill
-		// https://github.com/whatwg/xhr/issues/262 it's a mess
 		if (btn && btn.type == "submit" && btn.name && btn.value) {
 			query[btn.name] = btn.value;
 		}
@@ -344,6 +354,9 @@ HTMLInputElement.prototype.fill = function (val) {
 	if (val == null) val = "";
 	if (this.type == "radio" || this.type == "checkbox") {
 		this.checked = val;
+	} else if (this.type == "file") {
+		if (val == '' || val == null) this.removeAttribute('value');
+		else this.setAttribute('value', val);
 	} else {
 		this.value = val;
 	}
@@ -360,6 +373,8 @@ HTMLInputElement.prototype.reset = function () {
 HTMLInputElement.prototype.save = function () {
 	if (this.type == "radio" || this.type == "checkbox") {
 		this.defaultChecked = this.checked;
+	} else if (this.type == "file") {
+		this.defaultValue = this.getAttribute('value') || '';
 	} else {
 		this.defaultValue = this.value;
 	}
@@ -377,11 +392,13 @@ Object.defineProperty(HTMLInputElement.prototype, 'defaultValue', {
 	configurable: true,
 	enumerable: true,
 	get: function () {
+		// FIXME might not be needed anymore
 		if (this.form?.method == "get") return '';
 		else return this.getAttribute('value');
 	},
 	set: function (val) {
-		this.setAttribute('value', val);
+		if (val == '' || val == null) this.removeAttribute('value');
+		else this.setAttribute('value', val);
 	}
 });
 
@@ -464,6 +481,7 @@ Page.ready((state) => {
 					// new way
 				}
 				HTMLCustomFormElement.prototype.fill.call(form, linearizeValues(values), state.scope);
+				HTMLCustomFormElement.prototype.save.call(form);
 			}
 		} else if (action == "read") {
 			const obj = {};

package/ui/input-file.css

@@ -14,10 +14,10 @@
 .form .field > input[type="file"]:focus,
 .form .field > input[type="file"]:hover {
 	position:relative;
-	color: rgba(0 0 0 / 0%);
+	color: transparent !important;
 }
-.form .field > input[type="file"][filename]::after {
-	content:attr(filename);
+.form .field > input[type="file"][value]::after {
+	content:attr(value);
 	color: black;
 	text-align: left;
 	position: absolute;
@@ -26,11 +26,11 @@
 	padding-left: inherit;
 	padding-right: inherit;
 }
-.form .field.error > input[type="file"][filename]::after {
+.form .field.error > input[type="file"][value]::after {
 	color:inherit;
 }
 .form .field > input[type="file"]::after,
-.form .field > input[type="file"]:not([filename])::after {
+.form .field > input[type="file"]:not([value])::after {
 	content:attr(placeholder);
 	color: rgba(0 0 0 / 50%);
 	float: left;
@@ -53,6 +53,6 @@ input[type="file"]::file-selector-button {
 	z-index: 1;
 }
 
-input[type="file"][filename]::file-selector-button {
+input[type="file"][value]::file-selector-button {
 	background-image: url('data:image/svg+xml,<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg"><path d="m40.9 31.9 21-21a6.4 6.4 0 1 0-9-9l-21 21-21-21a6.4 6.4 0 1 0-9 9l21 21-21 21a6.4 6.4 0 0 0 0 9C3 63 4.6 63.8 6.2 63.8s3.3-.7 4.5-2l21-21 21 21c1.2 1.3 2.8 2 4.5 2s3.2-.7 4.5-2a6.4 6.4 0 0 0 0-9z"/></svg>');
 }

package/ui/input-file.js

@@ -1,35 +1,39 @@
 class HTMLElementInputFile extends HTMLInputElement {
 	#xhr;
 	#promise;
-	#value;
+	#defaultValue;
+
+	/* Since input[type=file] does not allow setting "value" property,
+	 * it is stored in the "value" attribute,
+	 * forcing defaultValue to be handled with a private field.
+	 * The "filename" attribute is used to display both selected value property,
+	 * and filled value attribute.
+	 */
 
 	constructor() {
 		super();
 		if (this.init) this.init();
 		this.save();
 	}
-
-	get value() {
-		return this.getAttribute('value');
+	get defaultValue() {
+		return this.#defaultValue;
 	}
-	save() {
-		this.#value = this.value;
+	set defaultValue(str) {
+		this.#defaultValue = str;
 	}
-	reset() {
-		if (this.#value != null) this.setAttribute('value', this.#value);
-		else this.removeAttribute('value');
-		this.value = this.#value;
+	get value() {
+		return this.getAttribute('value');
 	}
 	set value(str) {
-		if (str != null) {
-			this.setAttribute('filename', str.split(/\/|\\/).pop());
+		if (str) {
+			this.setAttribute('value', str);
 		} else {
-			this.removeAttribute('filename');
+			this.removeAttribute('value');
 			super.value = "";
 		}
 	}
 	captureClick(e, state) {
-		if (super.value) {
+		if (this.value) {
 			e.preventDefault();
 			if (this.#xhr) {
 				this.#xhr.abort();
@@ -72,7 +76,7 @@ class HTMLElementInputFile extends HTMLInputElement {
 			const pass = (obj) => {
 				if (!obj.items || obj.items.length == 0) return fail(new Error("File rejected"));
 				const val = obj.items[0];
-				this.setAttribute('value', val);
+				this.value = val;
 				field.classList.add('success');
 				field.classList.remove('loading');
 				this.#xhr = null;

package/ui/input-range.js

@@ -81,9 +81,10 @@ class HTMLElementInputRange extends HTMLInputElement {
 			helper.classList.remove('indeterminate');
 			if (isInt) values = values.map((n) => parseInt(n));
 			this.rangeValue = values;
-			const e = document.createEvent('HTMLEvents');
-			e.initEvent('change', true, true);
-			this.dispatchEvent(e);
+			this.dispatchEvent(new Event('change', {
+				bubbles: true,
+				cancelable: true
+			}));
 		});
 		helper.addEventListener('keydown', this, true);
 		helper.addEventListener('dblclick', this, true);
@@ -92,9 +93,10 @@ class HTMLElementInputRange extends HTMLInputElement {
 	handleEvent(e) {
 		if (e.type == "dblclick" || e.keyCode == 8 || e.keyCode == 46) {
 			this.fill();
-			const ne = document.createEvent('HTMLEvents');
-			ne.initEvent('change', true, true);
-			this.dispatchEvent(ne);
+			this.dispatchEvent(new Event('change', {
+				bubbles: true,
+				cancelable: true
+			}));
 		}
 	}
 

package/ui/item.css

@@ -23,7 +23,7 @@
 	border-radius: 0rem;
 	box-shadow: none;
 	transition: box-shadow 0.1s ease;
-	z-index: '';
+	z-index: "";
 	font-size: 1em;
 }
 .ui.items > .ui a {
@@ -50,7 +50,7 @@
 
 .ui.items > .ui::after {
 	display: block;
-	content: ' ';
+	content: " ";
 	height: 0px;
 	clear: both;
 	overflow: hidden;
@@ -74,7 +74,7 @@
 	float: none;
 	margin: 0em;
 	padding: 0em;
-	max-height: '';
+	max-height: "";
 	align-self: top;
 	width:175px;
 }
@@ -106,7 +106,7 @@
 }
 .ui.items > .ui > .content::after {
 	display: block;
-	content: ' ';
+	content: " ";
 	height: 0px;
 	clear: both;
 	overflow: hidden;
@@ -122,15 +122,15 @@
 }
 .ui.items > .ui > .content > .header {
 	display: inline-block;
-	margin: -0.21425em 0em 0em;
-	font-family: 'Lato', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+	margin: -0.2142em 0em 0em;
+	font-family: Lato, "Helvetica Neue", Arial, Helvetica, sans-serif;
 	font-weight: bold;
-	color: rgba(0, 0, 0, 0.85);
+	color: rgb(0 0 0 / 85%);
 }
 
 /* Default Header Size */
 .ui.items > .ui > .content > .header:not(.ui) {
-	font-size: 1.28571429em;
+	font-size: 1.2857em;
 }
 
 /*--------------
@@ -150,12 +150,12 @@
 
 .ui.items > .ui .content img {
 	align-self: middle;
-	width: '';
+	width: "";
 }
 .ui.items > .ui img.avatar,
 .ui.items > .ui .avatar img {
-	width: '';
-	height: '';
+	width: "";
+	height: "";
 	border-radius: 500rem;
 }
 
@@ -168,7 +168,7 @@
 	max-width: auto;
 	font-size: 1em;
 	line-height: 1.4285em;
-	color: rgba(0, 0, 0, 0.87);
+	color: rgb(0 0 0 / 87%);
 }
 
 /*--------------
@@ -187,10 +187,10 @@
 ---------------*/
 
 .ui.items > .ui .meta {
-	margin: 0.5em 0em 0.5em;
+	margin: 0.5em 0em;
 	font-size: 1em;
 	line-height: 1em;
-	color: rgba(0, 0, 0, 0.6);
+	color: rgb(0 0 0 / 60%);
 }
 .ui.items > .ui .meta * {
 	margin-right: 0.3em;
@@ -210,16 +210,16 @@
 
 /* Generic */
 .ui.items > .ui > .content a:not(.ui) {
-	color: '';
+	color: "";
 	transition: color 0.1s ease;
 }
 .ui.items > .ui > .content a:not(.ui):hover {
-	color: '';
+	color: "";
 }
 
 /* Header */
 .ui.items > .ui > .content > a.header {
-	color: rgba(0, 0, 0, 0.85);
+	color: rgb(0 0 0 / 85%);
 }
 .ui.items > .ui > .content > a.header:hover {
 	color: #1e70bf;
@@ -227,10 +227,10 @@
 
 /* Meta */
 .ui.items > .ui .meta > a:not(.ui) {
-	color: rgba(0, 0, 0, 0.4);
+	color: rgb(0 0 0 / 40%);
 }
 .ui.items > .ui .meta > a:not(.ui):hover {
-	color: rgba(0, 0, 0, 0.87);
+	color: rgb(0 0 0 / 87%);
 }
 
 /*--------------
@@ -244,11 +244,11 @@
 /* Icon */
 .ui.items > .ui > .content .favorite.icon {
 	cursor: pointer;
-	opacity: 0.75;
+	opacity: 75%;
 	transition: color 0.1s ease;
 }
 .ui.items > .ui > .content .favorite.icon:hover {
-	opacity: 1;
+	opacity: 100%;
 	color: #FFB70A;
 }
 .ui.items > .ui > .content .active.favorite.icon {
@@ -261,11 +261,11 @@
 /* Icon */
 .ui.items > .ui > .content .like.icon {
 	cursor: pointer;
-	opacity: 0.75;
+	opacity: 75%;
 	transition: color 0.1s ease;
 }
 .ui.items > .ui > .content .like.icon:hover {
-	opacity: 1;
+	opacity: 100%;
 	color: #FF2733;
 }
 .ui.items > .ui > .content .active.like.icon {
@@ -282,10 +282,10 @@
 	background: none;
 	margin: 0.5rem 0em 0em;
 	width: 100%;
-	padding: 0em 0em 0em;
+	padding: 0em;
 	top: 0em;
 	left: 0em;
-	color: rgba(0, 0, 0, 0.4);
+	color: rgb(0 0 0 / 40%);
 	box-shadow: none;
 	transition: color 0.1s ease;
 	border-top: none;
@@ -298,7 +298,7 @@
 }
 .ui.items > .ui .extra::after {
 	display: block;
-	content: ' ';
+	content: " ";
 	height: 0px;
 	clear: both;
 	overflow: hidden;
@@ -319,7 +319,7 @@
 	margin-right: 1em;
 }
 .ui.three.items > .ui > .image {
-	width: calc(33.33333333% - 1em);
+	width: calc(33.3333% - 1em);
 	margin-right: 1em;
 }
 .ui.four.items > .ui > .image {
@@ -331,11 +331,11 @@
 	margin-right: 0.75em;
 }
 .ui.six.items > .ui > .image {
-	width: calc(16.66666667% - 0.75em);
+	width: calc(16.6667% - 0.75em);
 	margin-right: 0.75em;
 }
 .ui.seven.items > .ui > .image {
-	width: calc(14.28571429% - 0.5em);
+	width: calc(14.2857% - 0.5em);
 	margin-right: 0.5em;
 }
 
@@ -409,7 +409,7 @@
 --------------------*/
 
 .ui.divided.items > .ui {
-	border-top: 1px solid rgba(34, 36, 38, 0.15);
+	border-top: 1px solid rgb(34 36 38 / 15%);
 	margin: 0em;
 	padding: 1em 0em;
 }

package/ui/layout.css

@@ -53,7 +53,7 @@
 }
 
 .inverted.layout {
-	background: rgba(0, 0, 0, 0.8);
+	background: rgb(0 0 0 / 80%);
 }
 
 .inverted.layout p {

package/ui/loading.css

@@ -21,24 +21,24 @@
 	0% {
 		width:0%;
 		margin-left:0px;
-		opacity:0.3;
+		opacity:30%;
 	}
 	50% {
 		width:20px;
 		margin-left:-10px;
-		opacity:1;
+		opacity:100%;
 	}
 	100% {
 		width:0%;
 		margin-left:0px;
-		opacity:0.3;
+		opacity:30%;
 	}
 }
 
 .loading[data-src]::after {
 	display: block;
 	animation: scanner 6s steps(3, end) infinite;
-	content: '';
+	content: "";
 	width: 20px;
 	height: 0;
 	border-top: 4px dotted #aaa;
@@ -48,17 +48,17 @@
 
 .error[data-src]::after {
 	display: block;
-	content: '∅';
+	content: "∅";
 }
 
 .waiting[data-src]::after {
 	display:block;
-	content: '?';
+	content: "?";
 }
 
 .denied[data-src]::after {
 	display:block;
-	content: '🛇';
+	content: "🛇";
 }
 
 .error[data-src],

package/ui/menu.css

@@ -11,7 +11,7 @@
 	width: auto;
 	height: auto;
 	top: 100% !important;
-	opacity: 1;
+	opacity: 100%;
 }
 
 /* menu item with icon */

package/ui/menu.js

@@ -27,15 +27,17 @@ class HTMLElementMenu extends VirtualHTMLElement {
 		const menu = this.firstElementChild;
 		const helper = this.lastElementChild;
 		helper.lastElementChild.lastElementChild.appendChild(this.toHelper(menu));
-		this.observer = new ResizeObserver((entries, observer) => {
-			window.requestAnimationFrame(() => {
-				const styles = window.getComputedStyle(this);
-				const parentWidth = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight) + this.offsetWidth;
-				const menuWidth = menu.offsetWidth;
-				this.classList.toggle('burger', parentWidth <= menuWidth);
+		state.finish(() => {
+			this.observer = new ResizeObserver((entries, observer) => {
+				window.requestAnimationFrame(() => {
+					const styles = window.getComputedStyle(this);
+					const parentWidth = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight) + this.offsetWidth;
+					const menuWidth = menu.offsetWidth;
+					this.classList.toggle('burger', parentWidth <= menuWidth);
+				});
 			});
+			this.observer.observe(this.parentNode);
 		});
-		this.observer.observe(this.parentNode);
 	}
 	close(state) {
 		if (this.observer) this.observer.disconnect();

package/ui/query-tags.js

@@ -90,9 +90,10 @@ class HTMLElementQueryTags extends VirtualHTMLElement {
 			else if (control.selected) control.selected = false;
 			else if (control.reset) control.reset();
 			else if (control.value) control.value = "";
-			const e = document.createEvent('HTMLEvents');
-			e.initEvent('submit', true, true);
-			control.form.dispatchEvent(e);
+			control.form.dispatchEvent(new Event('submit', {
+				bubbles: true,
+				cancelable: true
+			}));
 		}
 		label.remove();
 	}

package/ui/rating.css

@@ -24,7 +24,7 @@ element-rating .icon {
 	height: auto;
 	transition: opacity 0.1s ease, background 0.1s ease, text-shadow 0.1s ease, color 0.1s ease;
 	backface-visibility: hidden;
-	color: rgba(0, 0, 0, 0.15);
+	color: rgb(0 0 0 / 15%);
 }
 element-rating .icon:last-child {
 	padding-right:0;
@@ -40,20 +40,20 @@ element-rating .icon::before {
 
 /* Active Icon */
 element-rating .active.icon {
-	color: rgba(0, 0, 0, 0.85);
+	color: rgb(0 0 0 / 85%);
 }
 
 /* Selected Icon */
 element-rating .icon.selected,
 element-rating .icon.selected.active {
-	color: rgba(0, 0, 0, 0.87);
+	color: rgb(0 0 0 / 87%);
 }
 
 /* Star */
 
 /* Inactive */
 element-rating.star .icon {
-	color: rgba(0, 0, 0, 0.15);
+	color: rgb(0 0 0 / 15%);
 	text-shadow: none;
 }
 
@@ -73,7 +73,7 @@ element-rating.star .icon.selected.active {
 /* Heart */
 
 element-rating.heart .icon {
-	color: rgba(0, 0, 0, 0.15);
+	color: rgb(0 0 0 / 15%);
 	text-shadow: none !important;
 }
 
@@ -101,10 +101,10 @@ element-rating.disabled .icon {
 
 /* Selected Rating */
 element-rating.selected .active.icon {
-	opacity: 1;
+	opacity: 100%;
 }
 element-rating .icon.selected,
 element-rating.selected .icon.selected {
-	opacity: 1;
+	opacity: 100%;
 }