@pageboard/html 0.14.39 → 0.15.1

package/elements/form.js

@@ -38,7 +38,7 @@ exports.query_form = {
 					title: 'Page',
 					nullable: true,
 					type: "string",
-					format: "pathname",
+					format: "page",
 					$helper: "page"
 				},
 				parameters: {
@@ -79,7 +79,7 @@ exports.api_form = {
 	properties: {
 		name: {
 			title: 'Name',
-			description: "Used by query 'submit' or 'toggle'\nExposes /.api/form/$name",
+			description: "Used by query 'submit' or 'toggle'\nExposes /@api/form/$name",
 			type: 'string',
 			format: 'id',
 			nullable: true
@@ -101,15 +101,71 @@ exports.api_form = {
 			description: 'Choose a service',
 			$ref: '/writes'
 		},
+		request: {
+			title: 'Map inputs',
+			description: `
+				expr is supposed to be used to merge stuff into html,
+				not really to merge stuff into methods parameters
+				Also expr has a bad design because
+			  - it can be replaced by a binding element inside the block
+				- it forces the expression to be in a specific attribute,
+				  and mostly when a block has no content (so a binding cannot be used)
+				- the editor is ugly and shows fields that might not even be merged into html
+				Use cases
+				- links in anchors, images
+				- input or buttons values, checked attributes
+				- hidden attributes
+				- show/hide blocks depending on response
+				The "expr" mecanism could instead be a list of expressions like
+				[url|as:url|assign:.query.reservation:$query.reservation]
+				[url][$query|pick:text:cover|as:query]
+
+				Things to solve:
+				- do we want expr to be able to do changes outside the DOM of the block itself ? (no, this should be done by a binding element)
+				- do we want expr to change only data before merge - outside of any dom context ? Possibly ! In which case the current system is not that bad,
+				but it should not use matchdom dom plugin at all
+				- how to deal with "template" expressions when one cannot insert a binding
+				element ? Is it really something that happens ?
+
+
+
+			`,
+			type: 'object',
+			nullable: true
+		},
+		response: {
+			title: 'Map outputs',
+			description: `
+				'item.id': '[item.data.id]'
+				'item.title': '[item.content.title]'
+				// etc...
+			`,
+			type: 'object',
+			nullable: true
+		},
 		redirection: {
 			title: 'Success',
+			description: `
+				redirection can be used by client,
+				to change the page state. In which case the "url" is not an api url.
+				It can be used by the server, in which case the "url" is an api url.
+				The parameters for a page url make the query, and $query, $request, $response are available.
+				The parameters for a user api call are...?
+				The user api endpoint is a real url (/@api/xxx) that can expect
+				a body ($request) and a query ($query) too.
+				Currently client pages use a trick to redirect and submit: a specific parameter triggers a form submit on the redirected page. This makes sense in the context of page navigation - the body is filled by the form that is triggered by the parameters.
+				How can that be transposed for internal user api redirection ?
+				1. since it redirects, output mapping can be done to format the $response
+				2. in the next api call, parameters mean $query, $response becomes $request ?
+				3. this works if output can merge $query, $request as well
+			`,
 			type: 'object',
 			properties: {
 				url: {
 					title: 'Page',
 					nullable: true,
 					type: "string",
-					format: "pathname",
+					format: "page",
 					$helper: "page"
 				},
 				parameters: {
@@ -160,7 +216,7 @@ exports.api_form = {
 	contents: 'block+',
 	tag: 'form[method="post"]',
 	html: `<form is="element-form" method="post" name="[name]" masked="[masked]"
-		action="/.api/form/[name|else:$id]"
+		action="/@api/form/[name|else:$id]"
 		parameters="[$expr?.action?.parameters|as:expressions]"
 		success="[redirection.url][redirection.parameters|as:query]"
 		badrequest="[badrequest.url][badrequest.parameters|as:query]"

package/elements/input-property.js

@@ -50,7 +50,7 @@ exports.input_property = {
 			return node;
 		}
 		// list[0] = "data";
-		// /.api/form wraps it into block.data
+		// /@api/form wraps it into block.data
 		list.shift();
 		name = list.join('.');
 		const id = scope.$id;

package/elements/link.js

@@ -29,7 +29,7 @@ exports.link = {
 			nullable: true,
 			$helper: {
 				name: 'datalist',
-				url: '/.api/languages'
+				url: '/@api/languages'
 			}
 		},
 		id: {
@@ -75,7 +75,7 @@ exports.link_button = {
 			nullable: true,
 			$helper: {
 				name: 'datalist',
-				url: '/.api/languages'
+				url: '/@api/languages'
 			}
 		},
 		full: {
@@ -108,7 +108,7 @@ exports.link_button = {
 			default: null
 		}
 	},
-	contents: "text*",
+	contents: "inline*",
 	group: "block",
 	html: '<a href="[url|lang:[lang]]" hreflang="[lang]" class="ui [full|alt:fluid:] [icon] [compact] [float|post:%20floated] button"></a>',
 	stylesheets: [

package/elements/menu.js

@@ -105,7 +105,7 @@ exports.menu_item_link = {
 			nullable: true,
 			$helper: {
 				name: 'datalist',
-				url: '/.api/languages'
+				url: '/@api/languages'
 			}
 		},
 		labeled: {

package/lib/formdata.js

@@ -0,0 +1,21 @@
+/*! formdata-polyfill. MIT License. Jimmy W?rting <https://jimmy.warting.se/opensource> */
+;(function(){var h;function l(a){var b=0;return function(){return b<a.length?{done:!1,value:a[b++]}:{done:!0}}}var m="function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(a==Array.prototype||a==Object.prototype)return a;a[b]=c.value;return a};
+function n(a){a=["object"==typeof globalThis&&globalThis,a,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return c}throw Error("Cannot find global object");}var q=n(this);function r(a,b){if(b)a:{var c=q;a=a.split(".");for(var d=0;d<a.length-1;d++){var e=a[d];if(!(e in c))break a;c=c[e]}a=a[a.length-1];d=c[a];b=b(d);b!=d&&null!=b&&m(c,a,{configurable:!0,writable:!0,value:b})}}
+r("Symbol",function(a){function b(f){if(this instanceof b)throw new TypeError("Symbol is not a constructor");return new c(d+(f||"")+"_"+e++,f)}function c(f,g){this.A=f;m(this,"description",{configurable:!0,writable:!0,value:g})}if(a)return a;c.prototype.toString=function(){return this.A};var d="jscomp_symbol_"+(1E9*Math.random()>>>0)+"_",e=0;return b});
+r("Symbol.iterator",function(a){if(a)return a;a=Symbol("Symbol.iterator");for(var b="Array Int8Array Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array".split(" "),c=0;c<b.length;c++){var d=q[b[c]];"function"===typeof d&&"function"!=typeof d.prototype[a]&&m(d.prototype,a,{configurable:!0,writable:!0,value:function(){return u(l(this))}})}return a});function u(a){a={next:a};a[Symbol.iterator]=function(){return this};return a}
+function v(a){var b="undefined"!=typeof Symbol&&Symbol.iterator&&a[Symbol.iterator];return b?b.call(a):{next:l(a)}}var w;if("function"==typeof Object.setPrototypeOf)w=Object.setPrototypeOf;else{var y;a:{var z={a:!0},A={};try{A.__proto__=z;y=A.a;break a}catch(a){}y=!1}w=y?function(a,b){a.__proto__=b;if(a.__proto__!==b)throw new TypeError(a+" is not extensible");return a}:null}var B=w;function C(){this.m=!1;this.j=null;this.v=void 0;this.h=1;this.u=this.C=0;this.l=null}
+function D(a){if(a.m)throw new TypeError("Generator is already running");a.m=!0}C.prototype.o=function(a){this.v=a};C.prototype.s=function(a){this.l={D:a,F:!0};this.h=this.C||this.u};C.prototype.return=function(a){this.l={return:a};this.h=this.u};function E(a,b){a.h=3;return{value:b}}function F(a){this.g=new C;this.G=a}F.prototype.o=function(a){D(this.g);if(this.g.j)return G(this,this.g.j.next,a,this.g.o);this.g.o(a);return H(this)};
+function I(a,b){D(a.g);var c=a.g.j;if(c)return G(a,"return"in c?c["return"]:function(d){return{value:d,done:!0}},b,a.g.return);a.g.return(b);return H(a)}F.prototype.s=function(a){D(this.g);if(this.g.j)return G(this,this.g.j["throw"],a,this.g.o);this.g.s(a);return H(this)};
+function G(a,b,c,d){try{var e=b.call(a.g.j,c);if(!(e instanceof Object))throw new TypeError("Iterator result "+e+" is not an object");if(!e.done)return a.g.m=!1,e;var f=e.value}catch(g){return a.g.j=null,a.g.s(g),H(a)}a.g.j=null;d.call(a.g,f);return H(a)}function H(a){for(;a.g.h;)try{var b=a.G(a.g);if(b)return a.g.m=!1,{value:b.value,done:!1}}catch(c){a.g.v=void 0,a.g.s(c)}a.g.m=!1;if(a.g.l){b=a.g.l;a.g.l=null;if(b.F)throw b.D;return{value:b.return,done:!0}}return{value:void 0,done:!0}}
+function J(a){this.next=function(b){return a.o(b)};this.throw=function(b){return a.s(b)};this.return=function(b){return I(a,b)};this[Symbol.iterator]=function(){return this}}function K(a,b){b=new J(new F(b));B&&a.prototype&&B(b,a.prototype);return b}function L(a,b){a instanceof String&&(a+="");var c=0,d=!1,e={next:function(){if(!d&&c<a.length){var f=c++;return{value:b(f,a[f]),done:!1}}d=!0;return{done:!0,value:void 0}}};e[Symbol.iterator]=function(){return e};return e}
+r("Array.prototype.entries",function(a){return a?a:function(){return L(this,function(b,c){return[b,c]})}});
+if("undefined"!==typeof Blob&&("undefined"===typeof FormData||!FormData.prototype.keys)){var M=function(a,b){for(var c=0;c<a.length;c++)b(a[c])},N=function(a){return a.replace(/\r?\n|\r/g,"\r\n")},O=function(a,b,c){if(b instanceof Blob){c=void 0!==c?String(c+""):"string"===typeof b.name?b.name:"blob";if(b.name!==c||"[object Blob]"===Object.prototype.toString.call(b))b=new File([b],c);return[String(a),b]}return[String(a),String(b)]},P=function(a,b){if(a.length<b)throw new TypeError(b+" argument required, but only "+
+a.length+" present.");},Q="object"===typeof globalThis?globalThis:"object"===typeof window?window:"object"===typeof self?self:this,R=Q.FormData,S=Q.XMLHttpRequest&&Q.XMLHttpRequest.prototype.send,T=Q.Request&&Q.fetch,U=Q.navigator&&Q.navigator.sendBeacon,V=Q.Element&&Q.Element.prototype,W=Q.Symbol&&Symbol.toStringTag;W&&(Blob.prototype[W]||(Blob.prototype[W]="Blob"),"File"in Q&&!File.prototype[W]&&(File.prototype[W]="File"));try{new File([],"")}catch(a){Q.File=function(b,c,d){b=new Blob(b,d||{});
+Object.defineProperties(b,{name:{value:c},lastModified:{value:+(d&&void 0!==d.lastModified?new Date(d.lastModified):new Date)},toString:{value:function(){return"[object File]"}}});W&&Object.defineProperty(b,W,{value:"File"});return b}}var escape=function(a){return a.replace(/\n/g,"%0A").replace(/\r/g,"%0D").replace(/"/g,"%22")},X=function(a){this.i=[];var b=this;a&&M(a.elements,function(c){if(c.name&&!c.disabled&&"submit"!==c.type&&"button"!==c.type&&!c.matches("form fieldset[disabled] *"))if("file"===
+c.type){var d=c.files&&c.files.length?c.files:[new File([],"",{type:"application/octet-stream"})];M(d,function(e){b.append(c.name,e)})}else"select-multiple"===c.type||"select-one"===c.type?M(c.options,function(e){!e.disabled&&e.selected&&b.append(c.name,e.value)}):"checkbox"===c.type||"radio"===c.type?c.checked&&b.append(c.name,c.value):(d="textarea"===c.type?N(c.value):c.value,b.append(c.name,d))})};h=X.prototype;h.append=function(a,b,c){P(arguments,2);this.i.push(O(a,b,c))};h.delete=function(a){P(arguments,
+1);var b=[];a=String(a);M(this.i,function(c){c[0]!==a&&b.push(c)});this.i=b};h.entries=function b(){var c,d=this;return K(b,function(e){1==e.h&&(c=0);if(3!=e.h)return c<d.i.length?e=E(e,d.i[c]):(e.h=0,e=void 0),e;c++;e.h=2})};h.forEach=function(b,c){P(arguments,1);for(var d=v(this),e=d.next();!e.done;e=d.next()){var f=v(e.value);e=f.next().value;f=f.next().value;b.call(c,f,e,this)}};h.get=function(b){P(arguments,1);var c=this.i;b=String(b);for(var d=0;d<c.length;d++)if(c[d][0]===b)return c[d][1];
+return null};h.getAll=function(b){P(arguments,1);var c=[];b=String(b);M(this.i,function(d){d[0]===b&&c.push(d[1])});return c};h.has=function(b){P(arguments,1);b=String(b);for(var c=0;c<this.i.length;c++)if(this.i[c][0]===b)return!0;return!1};h.keys=function c(){var d=this,e,f,g,k,p;return K(c,function(t){1==t.h&&(e=v(d),f=e.next());if(3!=t.h){if(f.done){t.h=0;return}g=f.value;k=v(g);p=k.next().value;return E(t,p)}f=e.next();t.h=2})};h.set=function(c,d,e){P(arguments,2);c=String(c);var f=[],g=O(c,
+d,e),k=!0;M(this.i,function(p){p[0]===c?k&&(k=!f.push(g)):f.push(p)});k&&f.push(g);this.i=f};h.values=function d(){var e=this,f,g,k,p,t;return K(d,function(x){1==x.h&&(f=v(e),g=f.next());if(3!=x.h){if(g.done){x.h=0;return}k=g.value;p=v(k);p.next();t=p.next().value;return E(x,t)}g=f.next();x.h=2})};X.prototype._asNative=function(){for(var d=new R,e=v(this),f=e.next();!f.done;f=e.next()){var g=v(f.value);f=g.next().value;g=g.next().value;d.append(f,g)}return d};X.prototype._blob=function(){var d="----formdata-polyfill-"+
+Math.random(),e=[],f="--"+d+'\r\nContent-Disposition: form-data; name="';this.forEach(function(g,k){return"string"==typeof g?e.push(f+escape(N(k))+('"\r\n\r\n'+N(g)+"\r\n")):e.push(f+escape(N(k))+('"; filename="'+escape(g.name)+'"\r\nContent-Type: '+(g.type||"application/octet-stream")+"\r\n\r\n"),g,"\r\n")});e.push("--"+d+"--");return new Blob(e,{type:"multipart/form-data; boundary="+d})};X.prototype[Symbol.iterator]=function(){return this.entries()};X.prototype.toString=function(){return"[object FormData]"};
+V&&!V.matches&&(V.matches=V.matchesSelector||V.mozMatchesSelector||V.msMatchesSelector||V.oMatchesSelector||V.webkitMatchesSelector||function(d){d=(this.document||this.ownerDocument).querySelectorAll(d);for(var e=d.length;0<=--e&&d.item(e)!==this;);return-1<e});W&&(X.prototype[W]="FormData");if(S){var Y=Q.XMLHttpRequest.prototype.setRequestHeader;Q.XMLHttpRequest.prototype.setRequestHeader=function(d,e){Y.call(this,d,e);"content-type"===d.toLowerCase()&&(this.B=!0)};Q.XMLHttpRequest.prototype.send=
+function(d){d instanceof X?(d=d._blob(),this.B||this.setRequestHeader("Content-Type",d.type),S.call(this,d)):S.call(this,d)}}T&&(Q.fetch=function(d,e){e&&e.body&&e.body instanceof X&&(e.body=e.body._blob());return T.call(this,d,e)});U&&(Q.navigator.sendBeacon=function(d,e){e instanceof X&&(e=e._asNative());return U.call(this,d,e)});Q.FormData=X};})();

package/lib/object-fit-images.js

@@ -0,0 +1,243 @@
+var objectFitImages = (function () {
+	'use strict';
+
+	function getDefaultExportFromCjs (x) {
+		return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+	}
+
+	/*! npm.im/object-fit-images 3.2.4 */
+
+	var OFI = 'bfred-it:object-fit-images';
+	var propRegex = /(object-fit|object-position)\s*:\s*([-.\w\s%]+)/g;
+	var testImg = typeof Image === 'undefined' ? {style: {'object-position': 1}} : new Image();
+	var supportsObjectFit = 'object-fit' in testImg.style;
+	var supportsObjectPosition = 'object-position' in testImg.style;
+	var supportsOFI = 'background-size' in testImg.style;
+	var supportsCurrentSrc = typeof testImg.currentSrc === 'string';
+	var nativeGetAttribute = testImg.getAttribute;
+	var nativeSetAttribute = testImg.setAttribute;
+	var autoModeEnabled = false;
+
+	function createPlaceholder(w, h) {
+		return ("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='" + w + "' height='" + h + "'%3E%3C/svg%3E");
+	}
+
+	function polyfillCurrentSrc(el) {
+		if (el.srcset && !supportsCurrentSrc && window.picturefill) {
+			var pf = window.picturefill._;
+			// parse srcset with picturefill where currentSrc isn't available
+			if (!el[pf.ns] || !el[pf.ns].evaled) {
+				// force synchronous srcset parsing
+				pf.fillImg(el, {reselect: true});
+			}
+
+			if (!el[pf.ns].curSrc) {
+				// force picturefill to parse srcset
+				el[pf.ns].supported = false;
+				pf.fillImg(el, {reselect: true});
+			}
+
+			// retrieve parsed currentSrc, if any
+			el.currentSrc = el[pf.ns].curSrc || el.src;
+		}
+	}
+
+	function getStyle(el) {
+		var style = getComputedStyle(el).fontFamily;
+		var parsed;
+		var props = {};
+		while ((parsed = propRegex.exec(style)) !== null) {
+			props[parsed[1]] = parsed[2];
+		}
+		return props;
+	}
+
+	function setPlaceholder(img, width, height) {
+		// Default: fill width, no height
+		var placeholder = createPlaceholder(width || 1, height || 0);
+
+		// Only set placeholder if it's different
+		if (nativeGetAttribute.call(img, 'src') !== placeholder) {
+			nativeSetAttribute.call(img, 'src', placeholder);
+		}
+	}
+
+	function onImageReady(img, callback) {
+		// naturalWidth is only available when the image headers are loaded,
+		// this loop will poll it every 100ms.
+		if (img.naturalWidth) {
+			callback(img);
+		} else {
+			setTimeout(onImageReady, 100, img, callback);
+		}
+	}
+
+	function fixOne(el) {
+		var style = getStyle(el);
+		var ofi = el[OFI];
+		style['object-fit'] = style['object-fit'] || 'fill'; // default value
+
+		// Avoid running where unnecessary, unless OFI had already done its deed
+		if (!ofi.img) {
+			// fill is the default behavior so no action is necessary
+			if (style['object-fit'] === 'fill') {
+				return;
+			}
+
+			// Where object-fit is supported and object-position isn't (Safari < 10)
+			if (
+				!ofi.skipTest && // unless user wants to apply regardless of browser support
+				supportsObjectFit && // if browser already supports object-fit
+				!style['object-position'] // unless object-position is used
+			) {
+				return;
+			}
+		}
+
+		// keep a clone in memory while resetting the original to a blank
+		if (!ofi.img) {
+			ofi.img = new Image(el.width, el.height);
+			ofi.img.srcset = nativeGetAttribute.call(el, "data-ofi-srcset") || el.srcset;
+			ofi.img.src = nativeGetAttribute.call(el, "data-ofi-src") || el.src;
+
+			// preserve for any future cloneNode calls
+			// https://github.com/bfred-it/object-fit-images/issues/53
+			nativeSetAttribute.call(el, "data-ofi-src", el.src);
+			if (el.srcset) {
+				nativeSetAttribute.call(el, "data-ofi-srcset", el.srcset);
+			}
+
+			setPlaceholder(el, el.naturalWidth || el.width, el.naturalHeight || el.height);
+
+			// remove srcset because it overrides src
+			if (el.srcset) {
+				el.srcset = '';
+			}
+			try {
+				keepSrcUsable(el);
+			} catch (err) {
+				if (window.console) {
+					console.warn('https://bit.ly/ofi-old-browser');
+				}
+			}
+		}
+
+		polyfillCurrentSrc(ofi.img);
+
+		el.style.backgroundImage = "url(\"" + ((ofi.img.currentSrc || ofi.img.src).replace(/"/g, '\\"')) + "\")";
+		el.style.backgroundPosition = style['object-position'] || 'center';
+		el.style.backgroundRepeat = 'no-repeat';
+		el.style.backgroundOrigin = 'content-box';
+
+		if (/scale-down/.test(style['object-fit'])) {
+			onImageReady(ofi.img, function () {
+				if (ofi.img.naturalWidth > el.width || ofi.img.naturalHeight > el.height) {
+					el.style.backgroundSize = 'contain';
+				} else {
+					el.style.backgroundSize = 'auto';
+				}
+			});
+		} else {
+			el.style.backgroundSize = style['object-fit'].replace('none', 'auto').replace('fill', '100% 100%');
+		}
+
+		onImageReady(ofi.img, function (img) {
+			setPlaceholder(el, img.naturalWidth, img.naturalHeight);
+		});
+	}
+
+	function keepSrcUsable(el) {
+		var descriptors = {
+			get: function get(prop) {
+				return el[OFI].img[prop ? prop : 'src'];
+			},
+			set: function set(value, prop) {
+				el[OFI].img[prop ? prop : 'src'] = value;
+				nativeSetAttribute.call(el, ("data-ofi-" + prop), value); // preserve for any future cloneNode
+				fixOne(el);
+				return value;
+			}
+		};
+		Object.defineProperty(el, 'src', descriptors);
+		Object.defineProperty(el, 'currentSrc', {
+			get: function () { return descriptors.get('currentSrc'); }
+		});
+		Object.defineProperty(el, 'srcset', {
+			get: function () { return descriptors.get('srcset'); },
+			set: function (ss) { return descriptors.set(ss, 'srcset'); }
+		});
+	}
+
+	function hijackAttributes() {
+		function getOfiImageMaybe(el, name) {
+			return el[OFI] && el[OFI].img && (name === 'src' || name === 'srcset') ? el[OFI].img : el;
+		}
+		if (!supportsObjectPosition) {
+			HTMLImageElement.prototype.getAttribute = function (name) {
+				return nativeGetAttribute.call(getOfiImageMaybe(this, name), name);
+			};
+
+			HTMLImageElement.prototype.setAttribute = function (name, value) {
+				return nativeSetAttribute.call(getOfiImageMaybe(this, name), name, String(value));
+			};
+		}
+	}
+
+	function fix(imgs, opts) {
+		var startAutoMode = !autoModeEnabled && !imgs;
+		opts = opts || {};
+		imgs = imgs || 'img';
+
+		if ((supportsObjectPosition && !opts.skipTest) || !supportsOFI) {
+			return false;
+		}
+
+		// use imgs as a selector or just select all images
+		if (imgs === 'img') {
+			imgs = document.getElementsByTagName('img');
+		} else if (typeof imgs === 'string') {
+			imgs = document.querySelectorAll(imgs);
+		} else if (!('length' in imgs)) {
+			imgs = [imgs];
+		}
+
+		// apply fix to all
+		for (var i = 0; i < imgs.length; i++) {
+			imgs[i][OFI] = imgs[i][OFI] || {
+				skipTest: opts.skipTest
+			};
+			fixOne(imgs[i]);
+		}
+
+		if (startAutoMode) {
+			document.body.addEventListener('load', function (e) {
+				if (e.target.tagName === 'IMG') {
+					fix(e.target, {
+						skipTest: opts.skipTest
+					});
+				}
+			}, true);
+			autoModeEnabled = true;
+			imgs = 'img'; // reset to a generic selector for watchMQ
+		}
+
+		// if requested, watch media queries for object-fit change
+		if (opts.watchMQ) {
+			window.addEventListener('resize', fix.bind(null, imgs, {
+				skipTest: opts.skipTest
+			}));
+		}
+	}
+
+	fix.supportsObjectFit = supportsObjectFit;
+	fix.supportsObjectPosition = supportsObjectPosition;
+
+	hijackAttributes();
+
+	var ofi_commonJs = fix;
+
+	var ofi_commonJs$1 = /*@__PURE__*/getDefaultExportFromCjs(ofi_commonJs);
+
+	return ofi_commonJs$1;
+
+})();

package/lib/stickyfill.js

@@ -0,0 +1,546 @@
+/*!
+  * Stickyfill – `position: sticky` polyfill
+  * v. 2.1.0 | https://github.com/wilddeer/stickyfill
+  * MIT License
+  */
+
+;(function(window, document) {
+    'use strict';
+    
+    /*
+     * 1. Check if the browser supports `position: sticky` natively or is too old to run the polyfill.
+     *    If either of these is the case set `seppuku` flag. It will be checked later to disable key features
+     *    of the polyfill, but the API will remain functional to avoid breaking things.
+     */
+    
+    var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+    
+    function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+    
+    var seppuku = false;
+    
+    var isWindowDefined = typeof window !== 'undefined';
+    
+    // The polyfill can’t function properly without `window` or `window.getComputedStyle`.
+    if (!isWindowDefined || !window.getComputedStyle) seppuku = true;
+    // Dont’t get in a way if the browser supports `position: sticky` natively.
+    else {
+            (function () {
+                var testNode = document.createElement('div');
+    
+                if (['', '-webkit-', '-moz-', '-ms-'].some(function (prefix) {
+                    try {
+                        testNode.style.position = prefix + 'sticky';
+                    } catch (e) {}
+    
+                    return testNode.style.position != '';
+                })) seppuku = true;
+            })();
+        }
+    
+    /*
+     * 2. “Global” vars used across the polyfill
+     */
+    var isInitialized = false;
+    
+    // Check if Shadow Root constructor exists to make further checks simpler
+    var shadowRootExists = typeof ShadowRoot !== 'undefined';
+    
+    // Last saved scroll position
+    var scroll = {
+        top: null,
+        left: null
+    };
+    
+    // Array of created Sticky instances
+    var stickies = [];
+    
+    /*
+     * 3. Utility functions
+     */
+    function extend(targetObj, sourceObject) {
+        for (var key in sourceObject) {
+            if (sourceObject.hasOwnProperty(key)) {
+                targetObj[key] = sourceObject[key];
+            }
+        }
+    }
+    
+    function parseNumeric(val) {
+        return parseFloat(val) || 0;
+    }
+    
+    function getDocOffsetTop(node) {
+        var docOffsetTop = 0;
+    
+        while (node) {
+            docOffsetTop += node.offsetTop;
+            node = node.offsetParent;
+        }
+    
+        return docOffsetTop;
+    }
+    
+    /*
+     * 4. Sticky class
+     */
+    
+    var Sticky = function () {
+        function Sticky(node) {
+            _classCallCheck(this, Sticky);
+    
+            if (!(node instanceof HTMLElement)) throw new Error('First argument must be HTMLElement');
+            if (stickies.some(function (sticky) {
+                return sticky._node === node;
+            })) throw new Error('Stickyfill is already applied to this node');
+    
+            this._node = node;
+            this._stickyMode = null;
+            this._active = false;
+    
+            stickies.push(this);
+    
+            this.refresh();
+        }
+    
+        _createClass(Sticky, [{
+            key: 'refresh',
+            value: function refresh() {
+                if (seppuku || this._removed) return;
+                if (this._active) this._deactivate();
+    
+                var node = this._node;
+    
+                /*
+                 * 1. Save node computed props
+                 */
+                var nodeComputedStyle = getComputedStyle(node);
+                var nodeComputedProps = {
+                    position: nodeComputedStyle.position,
+                    top: nodeComputedStyle.top,
+                    display: nodeComputedStyle.display,
+                    marginTop: nodeComputedStyle.marginTop,
+                    marginBottom: nodeComputedStyle.marginBottom,
+                    marginLeft: nodeComputedStyle.marginLeft,
+                    marginRight: nodeComputedStyle.marginRight,
+                    cssFloat: nodeComputedStyle.cssFloat
+                };
+    
+                /*
+                 * 2. Check if the node can be activated
+                 */
+                if (isNaN(parseFloat(nodeComputedProps.top)) || nodeComputedProps.display == 'table-cell' || nodeComputedProps.display == 'none') return;
+    
+                this._active = true;
+    
+                /*
+                 * 3. Check if the current node position is `sticky`. If it is, it means that the browser supports sticky positioning,
+                 *    but the polyfill was force-enabled. We set the node’s position to `static` before continuing, so that the node
+                 *    is in it’s initial position when we gather its params.
+                 */
+                var originalPosition = node.style.position;
+                if (nodeComputedStyle.position == 'sticky' || nodeComputedStyle.position == '-webkit-sticky') node.style.position = 'static';
+    
+                /*
+                 * 4. Get necessary node parameters
+                 */
+                var referenceNode = node.parentNode;
+                var parentNode = shadowRootExists && referenceNode instanceof ShadowRoot ? referenceNode.host : referenceNode;
+                var nodeWinOffset = node.getBoundingClientRect();
+                var parentWinOffset = parentNode.getBoundingClientRect();
+                var parentComputedStyle = getComputedStyle(parentNode);
+    
+                this._parent = {
+                    node: parentNode,
+                    styles: {
+                        position: parentNode.style.position
+                    },
+                    offsetHeight: parentNode.offsetHeight
+                };
+                this._offsetToWindow = {
+                    left: nodeWinOffset.left,
+                    right: document.documentElement.clientWidth - nodeWinOffset.right
+                };
+                this._offsetToParent = {
+                    top: nodeWinOffset.top - parentWinOffset.top - parseNumeric(parentComputedStyle.borderTopWidth),
+                    left: nodeWinOffset.left - parentWinOffset.left - parseNumeric(parentComputedStyle.borderLeftWidth),
+                    right: -nodeWinOffset.right + parentWinOffset.right - parseNumeric(parentComputedStyle.borderRightWidth)
+                };
+                this._styles = {
+                    position: originalPosition,
+                    top: node.style.top,
+                    bottom: node.style.bottom,
+                    left: node.style.left,
+                    right: node.style.right,
+                    width: node.style.width,
+                    marginTop: node.style.marginTop,
+                    marginLeft: node.style.marginLeft,
+                    marginRight: node.style.marginRight
+                };
+    
+                var nodeTopValue = parseNumeric(nodeComputedProps.top);
+                this._limits = {
+                    start: nodeWinOffset.top + window.pageYOffset - nodeTopValue,
+                    end: parentWinOffset.top + window.pageYOffset + parentNode.offsetHeight - parseNumeric(parentComputedStyle.borderBottomWidth) - node.offsetHeight - nodeTopValue - parseNumeric(nodeComputedProps.marginBottom)
+                };
+    
+                /*
+                 * 5. Ensure that the node will be positioned relatively to the parent node
+                 */
+                var parentPosition = parentComputedStyle.position;
+    
+                if (parentPosition != 'absolute' && parentPosition != 'relative') {
+                    parentNode.style.position = 'relative';
+                }
+    
+                /*
+                 * 6. Recalc node position.
+                 *    It’s important to do this before clone injection to avoid scrolling bug in Chrome.
+                 */
+                this._recalcPosition();
+    
+                /*
+                 * 7. Create a clone
+                 */
+                var clone = this._clone = {};
+                clone.node = document.createElement('div');
+    
+                // Apply styles to the clone
+                extend(clone.node.style, {
+                    width: nodeWinOffset.right - nodeWinOffset.left + 'px',
+                    height: nodeWinOffset.bottom - nodeWinOffset.top + 'px',
+                    marginTop: nodeComputedProps.marginTop,
+                    marginBottom: nodeComputedProps.marginBottom,
+                    marginLeft: nodeComputedProps.marginLeft,
+                    marginRight: nodeComputedProps.marginRight,
+                    cssFloat: nodeComputedProps.cssFloat,
+                    padding: 0,
+                    border: 0,
+                    borderSpacing: 0,
+                    fontSize: '1em',
+                    position: 'static'
+                });
+    
+                referenceNode.insertBefore(clone.node, node);
+                clone.docOffsetTop = getDocOffsetTop(clone.node);
+            }
+        }, {
+            key: '_recalcPosition',
+            value: function _recalcPosition() {
+                if (!this._active || this._removed) return;
+    
+                var stickyMode = scroll.top <= this._limits.start ? 'start' : scroll.top >= this._limits.end ? 'end' : 'middle';
+    
+                if (this._stickyMode == stickyMode) return;
+    
+                switch (stickyMode) {
+                    case 'start':
+                        extend(this._node.style, {
+                            position: 'absolute',
+                            left: this._offsetToParent.left + 'px',
+                            right: this._offsetToParent.right + 'px',
+                            top: this._offsetToParent.top + 'px',
+                            bottom: 'auto',
+                            width: 'auto',
+                            marginLeft: 0,
+                            marginRight: 0,
+                            marginTop: 0
+                        });
+                        break;
+    
+                    case 'middle':
+                        extend(this._node.style, {
+                            position: 'fixed',
+                            left: this._offsetToWindow.left + 'px',
+                            right: this._offsetToWindow.right + 'px',
+                            top: this._styles.top,
+                            bottom: 'auto',
+                            width: 'auto',
+                            marginLeft: 0,
+                            marginRight: 0,
+                            marginTop: 0
+                        });
+                        break;
+    
+                    case 'end':
+                        extend(this._node.style, {
+                            position: 'absolute',
+                            left: this._offsetToParent.left + 'px',
+                            right: this._offsetToParent.right + 'px',
+                            top: 'auto',
+                            bottom: 0,
+                            width: 'auto',
+                            marginLeft: 0,
+                            marginRight: 0
+                        });
+                        break;
+                }
+    
+                this._stickyMode = stickyMode;
+            }
+        }, {
+            key: '_fastCheck',
+            value: function _fastCheck() {
+                if (!this._active || this._removed) return;
+    
+                if (Math.abs(getDocOffsetTop(this._clone.node) - this._clone.docOffsetTop) > 1 || Math.abs(this._parent.node.offsetHeight - this._parent.offsetHeight) > 1) this.refresh();
+            }
+        }, {
+            key: '_deactivate',
+            value: function _deactivate() {
+                var _this = this;
+    
+                if (!this._active || this._removed) return;
+    
+                this._clone.node.parentNode.removeChild(this._clone.node);
+                delete this._clone;
+    
+                extend(this._node.style, this._styles);
+                delete this._styles;
+    
+                // Check whether element’s parent node is used by other stickies.
+                // If not, restore parent node’s styles.
+                if (!stickies.some(function (sticky) {
+                    return sticky !== _this && sticky._parent && sticky._parent.node === _this._parent.node;
+                })) {
+                    extend(this._parent.node.style, this._parent.styles);
+                }
+                delete this._parent;
+    
+                this._stickyMode = null;
+                this._active = false;
+    
+                delete this._offsetToWindow;
+                delete this._offsetToParent;
+                delete this._limits;
+            }
+        }, {
+            key: 'remove',
+            value: function remove() {
+                var _this2 = this;
+    
+                this._deactivate();
+    
+                stickies.some(function (sticky, index) {
+                    if (sticky._node === _this2._node) {
+                        stickies.splice(index, 1);
+                        return true;
+                    }
+                });
+    
+                this._removed = true;
+            }
+        }]);
+    
+        return Sticky;
+    }();
+    
+    /*
+     * 5. Stickyfill API
+     */
+    
+    
+    var Stickyfill = {
+        stickies: stickies,
+        Sticky: Sticky,
+    
+        forceSticky: function forceSticky() {
+            seppuku = false;
+            init();
+    
+            this.refreshAll();
+        },
+        addOne: function addOne(node) {
+            // Check whether it’s a node
+            if (!(node instanceof HTMLElement)) {
+                // Maybe it’s a node list of some sort?
+                // Take first node from the list then
+                if (node.length && node[0]) node = node[0];else return;
+            }
+    
+            // Check if Stickyfill is already applied to the node
+            // and return existing sticky
+            for (var i = 0; i < stickies.length; i++) {
+                if (stickies[i]._node === node) return stickies[i];
+            }
+    
+            // Create and return new sticky
+            return new Sticky(node);
+        },
+        add: function add(nodeList) {
+            // If it’s a node make an array of one node
+            if (nodeList instanceof HTMLElement) nodeList = [nodeList];
+            // Check if the argument is an iterable of some sort
+            if (!nodeList.length) return;
+    
+            // Add every element as a sticky and return an array of created Sticky instances
+            var addedStickies = [];
+    
+            var _loop = function _loop(i) {
+                var node = nodeList[i];
+    
+                // If it’s not an HTMLElement – create an empty element to preserve 1-to-1
+                // correlation with input list
+                if (!(node instanceof HTMLElement)) {
+                    addedStickies.push(void 0);
+                    return 'continue';
+                }
+    
+                // If Stickyfill is already applied to the node
+                // add existing sticky
+                if (stickies.some(function (sticky) {
+                    if (sticky._node === node) {
+                        addedStickies.push(sticky);
+                        return true;
+                    }
+                })) return 'continue';
+    
+                // Create and add new sticky
+                addedStickies.push(new Sticky(node));
+            };
+    
+            for (var i = 0; i < nodeList.length; i++) {
+                var _ret2 = _loop(i);
+    
+                if (_ret2 === 'continue') continue;
+            }
+    
+            return addedStickies;
+        },
+        refreshAll: function refreshAll() {
+            stickies.forEach(function (sticky) {
+                return sticky.refresh();
+            });
+        },
+        removeOne: function removeOne(node) {
+            // Check whether it’s a node
+            if (!(node instanceof HTMLElement)) {
+                // Maybe it’s a node list of some sort?
+                // Take first node from the list then
+                if (node.length && node[0]) node = node[0];else return;
+            }
+    
+            // Remove the stickies bound to the nodes in the list
+            stickies.some(function (sticky) {
+                if (sticky._node === node) {
+                    sticky.remove();
+                    return true;
+                }
+            });
+        },
+        remove: function remove(nodeList) {
+            // If it’s a node make an array of one node
+            if (nodeList instanceof HTMLElement) nodeList = [nodeList];
+            // Check if the argument is an iterable of some sort
+            if (!nodeList.length) return;
+    
+            // Remove the stickies bound to the nodes in the list
+    
+            var _loop2 = function _loop2(i) {
+                var node = nodeList[i];
+    
+                stickies.some(function (sticky) {
+                    if (sticky._node === node) {
+                        sticky.remove();
+                        return true;
+                    }
+                });
+            };
+    
+            for (var i = 0; i < nodeList.length; i++) {
+                _loop2(i);
+            }
+        },
+        removeAll: function removeAll() {
+            while (stickies.length) {
+                stickies[0].remove();
+            }
+        }
+    };
+    
+    /*
+     * 6. Setup events (unless the polyfill was disabled)
+     */
+    function init() {
+        if (isInitialized) {
+            return;
+        }
+    
+        isInitialized = true;
+    
+        // Watch for scroll position changes and trigger recalc/refresh if needed
+        function checkScroll() {
+            if (window.pageXOffset != scroll.left) {
+                scroll.top = window.pageYOffset;
+                scroll.left = window.pageXOffset;
+    
+                Stickyfill.refreshAll();
+            } else if (window.pageYOffset != scroll.top) {
+                scroll.top = window.pageYOffset;
+                scroll.left = window.pageXOffset;
+    
+                // recalc position for all stickies
+                stickies.forEach(function (sticky) {
+                    return sticky._recalcPosition();
+                });
+            }
+        }
+    
+        checkScroll();
+        window.addEventListener('scroll', checkScroll);
+    
+        // Watch for window resizes and device orientation changes and trigger refresh
+        window.addEventListener('resize', Stickyfill.refreshAll);
+        window.addEventListener('orientationchange', Stickyfill.refreshAll);
+    
+        //Fast dirty check for layout changes every 500ms
+        var fastCheckTimer = void 0;
+    
+        function startFastCheckTimer() {
+            fastCheckTimer = setInterval(function () {
+                stickies.forEach(function (sticky) {
+                    return sticky._fastCheck();
+                });
+            }, 500);
+        }
+    
+        function stopFastCheckTimer() {
+            clearInterval(fastCheckTimer);
+        }
+    
+        var docHiddenKey = void 0;
+        var visibilityChangeEventName = void 0;
+    
+        if ('hidden' in document) {
+            docHiddenKey = 'hidden';
+            visibilityChangeEventName = 'visibilitychange';
+        } else if ('webkitHidden' in document) {
+            docHiddenKey = 'webkitHidden';
+            visibilityChangeEventName = 'webkitvisibilitychange';
+        }
+    
+        if (visibilityChangeEventName) {
+            if (!document[docHiddenKey]) startFastCheckTimer();
+    
+            document.addEventListener(visibilityChangeEventName, function () {
+                if (document[docHiddenKey]) {
+                    stopFastCheckTimer();
+                } else {
+                    startFastCheckTimer();
+                }
+            });
+        } else startFastCheckTimer();
+    }
+    
+    if (!seppuku) init();
+    
+    /*
+     * 7. Expose Stickyfill
+     */
+    if (typeof module != 'undefined' && module.exports) {
+        module.exports = Stickyfill;
+    } else if (isWindowDefined) {
+        window.Stickyfill = Stickyfill;
+    }
+    
+})(window, document);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.14.39",
+  "version": "0.15.1",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -16,7 +16,7 @@
   "dependencies": {},
   "devDependencies": {
     "nouislider": "^15.7.1",
-    "postinstall": "^0.9.0"
+    "postinstall": "^0.10.3"
   },
   "postinstall": {},
   "prepare": {

package/ui/image.js

@@ -9,27 +9,20 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 
 	#defer;
 
-	static getZoom({ w, h, rw, rh, fit }) {
-		let z = 100;
-		if (!rw && !rh) return z;
-		if (!rw) rw = rh * w / h;
-		if (!rh) rh = rw * h / w;
-		z = Math.ceil((fit == "contain" ? Math.min : Math.max)(rw / w, rh / h) * 100 * (window.devicePixelRatio || 1));
-		// svg need to be resized to scale to its intrinsic dimension
-		if (z > 100) z = 100;
-		const zstep = 5;
-		z = Math.ceil(z / zstep) * zstep;
-		return z;
-	}
 	get dimensions() {
+		// dimension in pixels of the (extracted) source image
 		let w = parseInt(this.dataset.width);
 		let h = parseInt(this.dataset.height);
-		const r = this.crop;
-		w = Math.round(w * r.w / 100);
-		h = Math.round(h * r.h / 100);
-		if (r.z != 100 && this.fit == "none") {
-			w = Math.round(w * r.z / 100);
-			h = Math.round(h * r.z / 100);
+		const { crop } = this;
+		if (crop.w != 100) {
+			w = Math.round(w * crop.w / 100);
+		}
+		if (crop.h != 100) {
+			h = Math.round(h * crop.h / 100);
+		}
+		if (crop.z != 100) {
+			w = Math.round(w * crop.z / 100);
+			h = Math.round(h * crop.z / 100);
 		}
 		return { w, h };
 	}
@@ -53,12 +46,12 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 		});
 	}
 	get crop() {
-		let [x, y, w, h, z] = (this.dataset.crop || ";;;;").split(";").map(x => parseFloat(x));
-		if (Number.isNaN(x)) x = 50;
-		if (Number.isNaN(y)) y = 50;
-		if (Number.isNaN(w)) w = 100;
-		if (Number.isNaN(h)) h = 100;
-		if (Number.isNaN(z)) z = 100;
+		const defs = [50, 50, 100, 100, 100];
+		const list = (this.dataset.crop || ";;;;").split(";").map(x => parseFloat(x));
+		for (let i = 0; i < defs.length; i++) {
+			if (Number.isNaN(list[i])) list[i] = defs[i];
+		}
+		const [x, y, w, h, z] = list;
 		return { x, y, w, h, z };
 	}
 	set crop({ x, y, w, h, z }) {
@@ -99,6 +92,44 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 		else return src;
 	}
 
+	requestSrc(srcLoc) {
+		const { crop, fit } = this;
+		const { w, h } = this.dimensions;
+		const r = {};
+		if (!Number.isNaN(w) && !Number.isNaN(h)) {
+			if (fit == "none") {
+				r.width = w;
+				r.height = h;
+			} else {
+				const rect = this.getBoundingClientRect();
+				r.width = rect.width;
+				r.height = rect.height;
+			}
+		}
+		if (!r.width && !r.height) {
+			// don't show
+			return;
+		}
+		if (crop.x != 50 || crop.y != 50 || crop.w != 100 || crop.h != 100) {
+			if (Math.round((crop.x - crop.w / 2) * 100) < 0 || Math.round((crop.x + crop.w / 2) * 100) > 10000) {
+				crop.w = 2 * Math.min(crop.x, 100 - crop.x);
+			}
+			if (Math.round((crop.y - crop.h / 2) * 100) < 0 || Math.round((crop.y + crop.h / 2) * 100) > 10000) {
+				crop.h = 2 * Math.min(crop.y, 100 - crop.y);
+			}
+			srcLoc.query.ex = `x-${crop.x}_y-${crop.y}_w-${crop.w}_h-${crop.h}`;
+		}
+
+		if (!r.width) r.width = r.height * w / h;
+		if (!r.height) r.height = r.width * h / w;
+		const clientHintWidth = Math.ceil(
+			(fit == "contain" ? Math.min : Math.max)(r.width / w, r.height / h)
+			* w * (window.devicePixelRatio || 1)
+		);
+		srcLoc.query.rs = `w-${clientHintWidth}`; // max, min ?
+		return srcLoc.toString();
+	}
+
 	reveal(state) {
 		const img = this.image;
 		if (!this.options.src) {
@@ -108,47 +139,15 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 		if (this.classList.contains('loading')) {
 			return;
 		}
-		const fit = this.fit;
-		const r = this.crop;
-
-		let loc = Page.parse(this.options.src);
-		if (loc.hostname && loc.hostname != document.location.hostname) {
-			loc = Page.parse({
-				pathname: "/.api/image",
-				query: {
-					url: this.options.src
-				}
-			});
-		}
-
-		if (r.x != 50 || r.y != 50 || r.w != 100 || r.h != 100) {
-			if (Math.round((r.x - r.w / 2) * 100) < 0 || Math.round((r.x + r.w / 2) * 100) > 10000) {
-				r.w = 2 * Math.min(r.x, 100 - r.x);
-			}
-			if (Math.round((r.y - r.h / 2) * 100) < 0 || Math.round((r.y + r.h / 2) * 100) > 10000) {
-				r.h = 2 * Math.min(r.y, 100 - r.y);
-			}
-			loc.query.ex = `x-${r.x}_y-${r.y}_w-${r.w}_h-${r.h}`;
-		}
-		const { w, h } = this.dimensions;
-		if (fit == "none") {
-			loc.query.rs = `z-${r.z}`;
-		} else if (!Number.isNaN(w) && !Number.isNaN(h)) {
-			const rect = this.getBoundingClientRect();
-			const rw = rect.width;
-			const rh = rect.height;
-			if (rw == 0 && rh == 0) {
-				// don't show
-				return;
-			}
-			loc.query.rs = "z-" + this.constructor.getZoom({ w, h, rw, rh, fit });
-		}
-		const curSrc = loc.toString();
-		if (curSrc != this.currentSrc) {
+		const srcLoc = Page.parse(this.options.src);
+		const reqSrc = this.requestSrc(srcLoc);
+		if (!reqSrc) {
+			img.setAttribute('src', '');
+		}	else if (reqSrc != this.currentSrc) {
 			this.classList.add('loading');
 			this.#defer?.resolve();
 			this.#defer = new Deferred();
-			img.setAttribute('src', curSrc);
+			img.setAttribute('src', reqSrc);
 			return this.#defer;
 		}
 	}

package/ui/input-file.js

@@ -73,9 +73,10 @@ class HTMLElementInputFile extends Page.create(HTMLInputElement) {
 			this.#defer = null;
 		};
 		const pass = (obj) => {
-			if (!obj.items || obj.items.length == 0) return fail(new Error("File rejected"));
-			const val = obj.items[0];
-			this.value = val;
+			if (!obj.hrefs?.length) {
+				return fail(new Error("File rejected"));
+			}
+			this.value = obj.hrefs[0]?.pathname;
 			field.classList.add('success');
 			field.classList.remove('loading');
 			this.#xhr = null;
@@ -124,7 +125,7 @@ class HTMLElementInputFile extends Page.create(HTMLInputElement) {
 			fail(err);
 		});
 		try {
-			xhr.open("POST", `/.api/upload/${this.id}`, true);
+			xhr.open("POST", `/@api/upload/${this.id}`, true);
 			xhr.setRequestHeader('Accept', "application/json; q=1.0");
 			xhr.send(fd);
 			this.#xhr = xhr;

package/ui/layout.js

@@ -14,48 +14,16 @@ class HTMLElementLayout extends Page.create(HTMLDivElement) {
 			this.style.backgroundImage = '';
 			return;
 		}
-		const fit = this.fit;
-		const r = this.crop;
-
-		let loc = Page.parse(this.options.src);
-		if (loc.hostname && loc.hostname != document.location.hostname) {
-			loc = Page.parse({
-				pathname: "/.api/image",
-				query: {
-					url: this.options.src
-				}
-			});
-		}
-
-		if (r.x != 50 || r.y != 50 || r.w != 100 || r.h != 100) {
-			if (Math.round((r.x - r.w / 2) * 100) < 0 || Math.round((r.x + r.w / 2) * 100) > 10000) {
-				r.w = 2 * Math.min(r.x, 100 - r.x);
-			}
-			if (Math.round((r.y - r.h / 2) * 100) < 0 || Math.round((r.y + r.h / 2) * 100) > 10000) {
-				r.h = 2 * Math.min(r.y, 100 - r.y);
-			}
-			loc.query.ex = `x-${r.x}_y-${r.y}_w-${r.w}_h-${r.h}`;
-		}
-		const {w, h} = this.dimensions;
-		if (fit == "none") {
-			loc.query.rs = `z-${r.z}`;
-		} else if (!Number.isNaN(w) && !Number.isNaN(h)) {
-			const rect = this.getBoundingClientRect();
-			const rw = rect.width;
-			const rh = rect.height;
-			if (rw == 0 && rh == 0) {
-				// don't show
-				return;
-			}
-			loc.query.rs = "z-" + HTMLElementLayout.getZoom({w, h, rw, rh, fit});
+		const srcLoc = Page.parse(this.options.src);
+		const reqSrc = this.requestSrc(srcLoc);
+		try {
+			this.currentSrc = reqSrc;
+		} catch (e) {
+			// pass
 		}
-		const curSrc = loc.toString();
-		if (curSrc != this.currentSrc) {
-			try {
-				this.currentSrc = curSrc;
-			} catch(e) {
-				// pass
-			}
+		if (!reqSrc) {
+			this.style.backgroundImage = '';
+		} else if (reqSrc != this.currentSrc) {
 			this.#defer?.resolve();
 			this.#defer = new Deferred();
 			const img = new Image();
@@ -63,8 +31,8 @@ class HTMLElementLayout extends Page.create(HTMLDivElement) {
 			img.addEventListener('error',
 				e => this.#defer.reject(new Error(this.currentSrc))
 			);
-			img.src = curSrc;
-			this.style.backgroundImage = `url("${curSrc}")`;
+			img.src = reqSrc;
+			this.style.backgroundImage = `url("${reqSrc}")`;
 			return this.#defer;
 		}
 	}
@@ -74,14 +42,13 @@ class HTMLElementLayout extends Page.create(HTMLDivElement) {
 }
 
 (function(HTMLElementImage) {
-HTMLElementLayout.getZoom = HTMLElementImage.getZoom;
-for (const name of ['crop', 'dimensions']) {
-	Object.defineProperty(
-		HTMLElementLayout.prototype,
-		name,
-		Object.getOwnPropertyDescriptor(HTMLElementImage.prototype, name)
-	);
-}
+	for (const name of ['crop', 'dimensions', 'requestSrc']) {
+		Object.defineProperty(
+			HTMLElementLayout.prototype,
+			name,
+			Object.getOwnPropertyDescriptor(HTMLElementImage.prototype, name)
+		);
+	}
 })(window.customElements.get('element-image'));
 
 Page.define(`element-layout`, HTMLElementLayout, 'div');

package/ui/pagination.js

@@ -9,7 +9,7 @@ class HTMLElementPagination extends Page.create(HTMLAnchorElement) {
 	#update(state) {
 		const { fetch } = this.dataset;
 		const node = this.ownerDocument.querySelector(
-			`element-template[action="/.api/query/${fetch}"]`
+			`element-template[action="/@api/query/${fetch}"]`
 		);
 		if (!node) {
 			console.warn("pagination does not find fetch node", fetch);