@pageboard/html 0.12.11 → 0.12.13

package/package.json

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

package/ui/form.js

@@ -41,17 +41,7 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 					if (val == null) {
 						form.reset();
 					} else if (typeof val == "object") {
-						let values = val;
-						if (val.id && val.data) {
-							// old way
-							values = { ...val.data };
-							for (const key of Object.keys(val)) {
-								if (key != "data") values['$' + key] = val[key];
-							}
-						} else {
-							// new way
-						}
-						form.fill(this.linearizeValues(values), state.scope);
+						form.fill(this.linearizeValues(val), state.scope);
 						form.save();
 					}
 				}
@@ -208,7 +198,7 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 	fill(query, scope) {
 		// fieldset-list are not custom inputs yet
 		for (const node of this.querySelectorAll("element-fieldset-list")) {
-			node.fill(query, scope);
+			node.fill?.(query, scope);
 		}
 		const vars = [];
 		for (const elem of this.elements) {
@@ -223,7 +213,7 @@ class HTMLElementForm extends Page.create(HTMLFormElement) {
 			}
 		}
 		for (const node of this.querySelectorAll('fieldset[is="element-fieldset"]')) {
-			node.fill(query, scope);
+			node.fill?.(query, scope);
 		}
 		return vars;
 	}

package/ui/image.js

@@ -162,6 +162,7 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 		const curSrc = loc.toString();
 		if (curSrc != this.currentSrc) {
 			this.classList.add('loading');
+			this.#defer?.resolve();
 			this.#defer = new Deferred();
 			img.setAttribute('src', curSrc);
 			return this.#defer;
@@ -181,6 +182,9 @@ const HTMLElementImageConstructor = Superclass => class extends Superclass {
 	placeholder(error) {
 		this.image.removeAttribute('src');
 	}
+	close() {
+		this.#defer?.resolve();
+	}
 };
 
 const HTMLElementImage = HTMLElementImageConstructor(Page.Element);

package/ui/layout.js

@@ -56,6 +56,7 @@ class HTMLElementLayout extends Page.create(HTMLDivElement) {
 			} catch(e) {
 				// pass
 			}
+			this.#defer?.resolve();
 			this.#defer = new Deferred();
 			const img = new Image();
 			img.addEventListener('load', this.#defer.resolve);
@@ -65,6 +66,9 @@ class HTMLElementLayout extends Page.create(HTMLDivElement) {
 			return this.#defer;
 		}
 	}
+	close() {
+		this.#defer?.resolve();
+	}
 }
 
 (function(HTMLElementImage) {

package/ui/tab-helper.js

@@ -11,19 +11,26 @@ Page.extend('element-tabs', class TabsHelper {
 		if (this.observer) this.observer.disconnect();
 	}
 	mutate(record, state) {
-		const items = this.items;
-		const tabs = this.tabs;
+		const { items, tabs } = this;
 		if (!items || !tabs) return;
+		const { editor } = state.scope;
+		if (!editor) return;
+		const { utils } = editor;
+		const { tr } = editor.state;
 		for (const node of record.addedNodes) {
-			tabs.insertBefore(state.scope.$view.render({
-				type: 'tab'
-			}), tabs.children[items.children.indexOf(node) + 1]);
+			const cur = tabs.children[items.children.indexOf(node) - 1];
+			if (!cur) continue;
+			const sel = utils.selectDomTr(tr, cur);
+			utils.insertTr(tr, editor.render({ type: 'tab' }), sel);
 		}
 		for (let i = 0; i < record.removedNodes.length; i++) {
 			const pos = record.target.childNodes.indexOf(record.previousSibling) + 1 + i;
-			const child = tabs.childNodes[pos];
-			if (child) child.remove();
+			const cur = tabs.childNodes[pos];
+			if (!cur) continue;
+			const sel = utils.selectDomTr(tr, cur);
+			utils.deleteTr(tr, sel);
 		}
+		editor.dispatch(tr);
 	}
 	handleClick(e, state) {
 		const item = e.target.closest('[block-type="tab_item"]');

package/ui/tab.css

@@ -8,6 +8,12 @@ element-tabs {
 	overflow:hidden;
 	margin:0;
 }
+element-tabs > .ui.tabular.menu {
+	flex-wrap:wrap;
+}
+element-tabs > .ui.tabular.menu::after {
+	content:none;
+}
 element-tabs > .ui.tabular.menu + div[block-content="tabs"] > .segment {
 	border-top: none;
 	margin:0 0 1rem;