domma-cms 1.10.13 → 1.10.14

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.10.14] - 2026-10-24
+
+- **Docs 2.14.1**: the Version history panel's clean-ups listen with `modal.once('close')`, ready for domma-js 0.58.
+- The mail reader's "when this panel closes" cleanup listens with the component's own `on('close')`, ready for domma-js 0.58, which drops the modal's old unprefixed `close` event. Behaviour is unchanged: once per close by the X, backdrop, Escape or a button, after any "discard changes?" guard.
+
 ## [1.10.13] - 2026-10-24
 
 - **Built against domma-js 0.57.0** - see [its release notes](https://github.com/pinpointzero73/domma/releases/tag/v0.57.0).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.10.13",
+  "version": "1.10.14",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/_lib/admin/mail/when-closed.js

@@ -1,23 +1,14 @@
 /**
  * Run code when a Domma modal or slideover actually closes.
  *
- * NOT `component.on('close', fn)`: Domma's Component.on() only calls
- * `options[event]` when that happens to be a function, so it silently does
- * nothing - every "on close" cleanup in the mail client written that way
- * (editor teardown, resize handles, address suggesters, settling a dialog's
- * promise when it was closed by its X) never ran.
+ * Both are Domma components (0.55+), so `component.on('close', fn)` is the
+ * hook: it fires once per close - the X, the backdrop, Escape and close()
+ * alike - after any "discard changes?" guard has let it through, and a modal
+ * opened inside this one closing does not count. The modal's unprefixed
+ * `close` DOM event this used to listen for is gone in domma-js 0.58.
  *
- * Two kinds of component, two hooks:
- *
- * - A slideover is a class whose close() reads `options.onClose` at the moment
- *   it closes - so chaining that fires only when a close really happens, after
- *   any "discard changes?" guard has let it through.
- * - E.modal is a `<domma-modal>` web component. Its handle's `options` is the
- *   element's `_options` - usually undefined, so the old code returned without
- *   hooking anything - and close() never reads it: it dispatches a `close` DOM
- *   event instead - for the X, the backdrop, Escape and close() alike. Chaining
- *   `onClose` there did nothing at all, which is how a modal shut with Escape
- *   left its promise unsettled (Email Pro saw it). The event is what fires.
+ * Anything without on() (a plain object, an older handle) falls back to
+ * chaining `options.onClose`.
  *
  * @module _lib/admin/mail/when-closed
  *
@@ -26,27 +17,13 @@
  * @returns {void}
  */
 export function whenClosed(component, fn) {
-    const opts = component?.options;
-    const el = component?.element;
-    // The web component (`<domma-modal>` - a custom element's tag has a
-    // hyphen). Its handle's `options` is the element's `_options`, which is
-    // often not even set, so it cannot be what decides.
-    const custom = typeof el?.tagName === 'string' && el.tagName.includes('-');
-    if (el && typeof el.addEventListener === 'function' && (custom || !opts || el._options === opts)) {
-        // Once per close: the X sits in the modal's shadow root, so its click
-        // also reaches the host's backdrop handler and close() emits twice.
-        // Re-armed when the modal opens again.
-        let fired = false;
-        el.addEventListener('open', (event) => { if (event.target === el) fired = false; });
-        el.addEventListener('close', (event) => {
-            // `close` bubbles and is composed: a modal opened INSIDE this one
-            // closing must not count as this one closing.
-            if (event.target !== el || fired) return;
-            fired = true;
+    if (typeof component?.on === 'function') {
+        component.on('close', () => {
             try { fn(component); } catch { /* one cleanup failing must not stop the next */ }
         });
         return;
     }
+    const opts = component?.options;
     if (!opts) return;
     const previous = opts.onClose;
     opts.onClose = (instance) => {

package/plugins/docs/CLAUDE.md

@@ -316,3 +316,9 @@ by `inspectPdf`, text read, filed where the person may file, into their Recent).
 `tier: free`, no `closedSource` - no licence is needed or checked any more (the engine only checks a
 `closedSource` plugin). Included in every hosted plan and free to self-host; not `bundle: false`, so the next
 `make sync-free-tier` ships it in the engine. Docs Pro and Wiki Pro stay paid and still `requires: ["docs"]`.
+
+## 2.14.1 (2026-10-24): close hooks for domma-js 0.58
+
+The version-history modal's cleanups (destroy after close, the context menu, the editor's refresh after a
+restore) listen with `modal.once('close', fn)` instead of the modal element's unprefixed `close` DOM event,
+which domma-js 0.58 removes. Same behaviour: once per close, whichever way it was closed.

package/plugins/docs/admin/lib/versions.js

@@ -44,10 +44,10 @@ export class VersionHistory {
         });
         modal.element.appendChild(this._build(docId, versions, modal, {session, canRestore}));
         // A closed modal is hidden, not removed: take it out once its close has run (2.10).
-        modal.element.addEventListener('close', () => setTimeout(() => {
+        modal.once('close', () => setTimeout(() => {
             try { modal.destroy?.(); } catch { /* gone */ }
             modal.element?.remove();
-        }, 400), {once: true});
+        }, 400));
         modal.open();
         this.modal = modal;
         return modal;
@@ -116,7 +116,7 @@ export class VersionHistory {
                 return items;
             }
         });
-        modal.element.addEventListener('close', () => menu?.destroy?.(), {once: true});
+        modal.once('close', () => menu?.destroy?.());
         return wrap;
     }
 

package/plugins/docs/admin/views/editor.js

@@ -665,11 +665,11 @@ export const docsEditorView = {
                 if (!modal) return;
                 if (disposed) { modal.close(); return; }
                 const off = panelLife.add(() => { try { modal.close(); } catch { /* gone */ } });
-                modal.element.addEventListener('close', async () => {
+                modal.once('close', async () => {
                     historyOpen = false;
                     off();
                     if (!disposed && versionHistory.restored) await refreshFromServer(true, {replace: true});
-                }, {once: true});
+                });
             } finally {
                 if (!modal || disposed) historyOpen = false;
             }

package/plugins/docs/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "displayName": "Docs",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "tier": "free",
   "description": "A document editor: sharing, public links, import and export, send to a page, blog or email, version history and templates. PDF documents: add a PDF and it is kept as it is - filed, shared, linked, emailed and versioned like any document, shown in the browser's own viewer.",
   "author": "Darryl Waterhouse",

package/plugins/free-tier.lock.json

@@ -1,6 +1,6 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@397f460",
+  "source": "dcms-marketplace@ffeb277",
   "plugins": {
     "blog": {
       "version": "1.10.1",
@@ -127,9 +127,9 @@
       }
     },
     "docs": {
-      "version": "2.14.0",
+      "version": "2.14.1",
       "files": {
-        "CLAUDE.md": "7c3b32e6e4b3456b8d6acafde57cbe6af519d6771d81294cfb90318801da43e3",
+        "CLAUDE.md": "83e90576752ea15eb29db26c41497193743224fd40d0eef0e941a0c4550cd579",
         "admin/css/docs.css": "89304c596f2d36492198885359fa86998f9f36be522238983e32e5d01319c759",
         "admin/lib/api.js": "0ddd567995a79e2379b92049de3b09a8bdf1c0d798042c7fbe3937f14e3631bf",
         "admin/lib/convert.js": "37e8310aa0c225fad9c063649e31351c05fe4371081ede9fe4466aac64123b0e",
@@ -144,11 +144,11 @@
         "admin/lib/share.js": "bd1e4310a73416848281284da1fa1a5b06d996eeb49724cbf3dc4a14a7e45eb9",
         "admin/lib/shortcuts.js": "b96088bda42714ae92da37d28fb3ead5390e45b8d39d01c8f5e1e981e09df0b0",
         "admin/lib/templates.js": "3a2c678c8be5bd29baac39ab8e06e1c37d385d909fa6502bc9fb1a3ab4150917",
-        "admin/lib/versions.js": "5affab802d1539b754427222afc8e232961cc3208e00251b033ee48ad5d02174",
+        "admin/lib/versions.js": "a2335d8cd22fb3c0f31431cc9a95251d18d83cb9fba6afef7300e9121fcb4c18",
         "admin/templates/docs.html": "4a621859200e6c2731db8f0924e6b76b03660dc01ae637d19de5ca2bbe92a33d",
         "admin/templates/editor.html": "cd937141373deeb8f3d204e47d11fe297a9b863499a95e19d62dbe1b2b05213a",
         "admin/views/docs.js": "52de890d32b63d522f8ae12b40e2525cf67b34584a62a745799e95ff352b0679",
-        "admin/views/editor.js": "ded2998b0ef19f22874410363b6667b718219e0057ff3b1c8c3292693206b932",
+        "admin/views/editor.js": "2c8df525a2bd36e8a818b4b18c4ef6a727940644315d3f77782214dcbad0cb47",
         "config.js": "4435664c2d96088ad21d68241a2a6998b12c80592270deba77710b8c014de0a3",
         "docs/guide.md": "75f05f0665bd3b5a9ac00131df21c98c86fa71ad8fafdb8331d25b1adc0a61dd",
         "lib/extensions.js": "a449f10e309bcb16bb7d426315e85b2efe9be6d3420313c0e30315f146820d99",
@@ -157,7 +157,7 @@
         "lib/pdf.js": "83abc3aba0c322c50b528b8a037466a294303f55d7c30f3cd1445f811b78ae28",
         "lib/store.js": "bd2f629bfdc74e10a3ab56f37291eb8b09fb6479c04facdff9514c6298b0ba29",
         "plugin.js": "c9228fc20524fe43a1a05495d20be33a0723fa3d4ffb0c853844d45b58b8b216",
-        "plugin.json": "35024c51c478b72b6aa0070a4ed18b9eb32d0334b120199c788b8d95ca4dbaf1",
+        "plugin.json": "b2ced266aeb08ca53599acfa804956053fd0f502445c526be0f388d1521c5d5e",
         "plugin.public.js": "a9cd7a9211f5b0006832054a15055a3c36afa9f9b284600cdc5fce19e892c178",
         "templates/public-doc.html": "7360cbeec5cba8a2b1b1d074730972bb4b90cfe913a799a06522b2e1a0f566d8",
         "tests/_env.js": "2daf6b0dd3211498298db79e5da80c17e2be98e380f777bc9c555c3eb99d128a",