domma-cms 0.41.1 → 0.43.1

package/server/services/renderer.js

@@ -8,7 +8,8 @@ import {fileURLToPath} from 'url';
 import {getConfig} from '../config.js';
 import {getInjectionSnippets} from './plugins.js';
 import {applyTransforms} from './hooks.js';
-import {resolveLocation, resolveMenuDecorations} from './menus.js';
+import {resolveLocation, resolveMenuDecorations, resolveOverlaysForPage} from './menus.js';
+import {buildMenuNav} from './menuRender.js';
 import {getProjectForPage} from './projects.js';
 
 const VALID_LAYOUT_WIDTHS = new Set(['narrow', 'normal', 'wide', 'full']);
@@ -53,6 +54,26 @@ function filterHiddenNavItems(nav) {
     return {...nav, items};
 }
 
+/**
+ * Build the overlay menus for a page: every menu bound to the `overlay` slot
+ * whose binding matches, each drawn by the same builder the `[menu]` shortcode
+ * uses so an overlay and a shortcode of the same menu look identical.
+ *
+ * Emitted as bare <nav> elements with no wrapper — a wrapping element would
+ * risk becoming a containing block for their position:fixed pinning.
+ *
+ * @param {{urlPath?: string, project?: string|null}} menuCtx
+ * @param {object|null} user
+ * @returns {Promise<string>} concatenated HTML, '' when nothing applies
+ */
+async function buildOverlayMenus(menuCtx, user) {
+    const overlays = await resolveOverlaysForPage(menuCtx, user);
+    if (!overlays.length) return '';
+    const navs = await Promise.all(overlays.map(async (menu) =>
+        buildMenuNav(menu, await resolveMenuDecorations(menu.items))));
+    return navs.join('');
+}
+
 /**
  * Render a page to a full HTML string.
  *
@@ -89,10 +110,11 @@ export async function renderPage(page, opts = {}) {
 
     // Resolve live badge counts (countFrom) before the menus are injected as
     // globals. Static badges/colours/pills pass through unchanged.
-    const [navItemsDecorated, footerPrimaryDecorated, footerLegalDecorated] = await Promise.all([
+    const [navItemsDecorated, footerPrimaryDecorated, footerLegalDecorated, overlayMenus] = await Promise.all([
         resolveMenuDecorations(navMenu ? navMenu.items : []),
         resolveMenuDecorations(footerPrimary ? footerPrimary.items : []),
-        resolveMenuDecorations(footerLegal ? footerLegal.items : [])
+        resolveMenuDecorations(footerLegal ? footerLegal.items : []),
+        buildOverlayMenus(menuCtx, opts.user || null)
     ]);
 
     // Compose the navigation object the public site script expects:
@@ -220,6 +242,10 @@ export async function renderPage(page, opts = {}) {
         headInject: [injection.head, navbarFontLink].filter(Boolean).join('\n'),
         headInjectLate: [injection.headLate, customCssTag, navbarStyleTag].filter(Boolean).join('\n'),
         bodyEndInject: [
+            // Overlay menus — bound to the `overlay` slot and pinned by their own
+            // float config, so they belong at the end of the body, clear of the
+            // content flow.
+            overlayMenus,
             injection.bodyEnd,
             site.backToTop?.enabled    ? '<script src="/public/js/btt.js"></script>'             : '',
             site.cookieConsent?.enabled ? '<script src="/public/js/cookie-consent.js"></script>' : '',
@@ -516,10 +542,11 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
 
     // Resolve live badge counts (countFrom) before the menus are injected as
     // globals. Static badges/colours/pills pass through unchanged.
-    const [navItemsDecorated, footerPrimaryDecorated, footerLegalDecorated] = await Promise.all([
+    const [navItemsDecorated, footerPrimaryDecorated, footerLegalDecorated, overlayMenus] = await Promise.all([
         resolveMenuDecorations(navMenu ? navMenu.items : []),
         resolveMenuDecorations(footerPrimary ? footerPrimary.items : []),
-        resolveMenuDecorations(footerLegal ? footerLegal.items : [])
+        resolveMenuDecorations(footerLegal ? footerLegal.items : []),
+        buildOverlayMenus(menuCtx, user)
     ]);
 
     // Compose the navigation object the public site script expects:
@@ -623,6 +650,7 @@ export async function renderBlogPage(templatePath, data = {}, seoMeta = {}) {
         headInject: [injection.head, navbarFontLink].filter(Boolean).join('\n'),
         headInjectLate: [injection.headLate, customCssTag, navbarStyleTag].filter(Boolean).join('\n'),
         bodyEndInject: [
+            overlayMenus,
             injection.bodyEnd,
             (seoMeta.usedComponents || [])
                 .map(n => `<script type="module" src="/api/components/${n}.js"></script>`)

package/server/templates/page.html

@@ -117,7 +117,7 @@
 
     <!-- Site initialisation -->
     <script src="/public/js/site.js?v=20260817-menu-bindings" type="module"></script>
-    <script src="/public/js/collection-context.js?v=20260722-ctx-cursor" defer></script>
+    <script src="/public/js/collection-context.js?v=20260819-export" type="module"></script>
 
     <!-- Interactive Collection Browser (used by [collection] shortcodes with
          searchable / filterable / sortable / paginate attributes) -->