cms-renderer 0.6.11 → 0.6.13

package/dist/lib/renderer.js

@@ -466,11 +466,14 @@ function generateCmsOverlayScript(cmsParentOrigin) {
   var style = document.createElement('style');
   style.setAttribute('data-cms-overlay', '');
   style.textContent = \`
+    [data-cms-block],
     [data-cms-editable] {
       cursor: pointer;
+    }
+    [data-cms-editable] {
       border-radius: 2px;
     }
-    [data-cms-editable]:hover {
+    [data-cms-editable]:not([data-cms-block]):hover {
       outline: 2px solid #3b82f6;
       outline-offset: 2px;
     }
@@ -483,8 +486,8 @@ function generateCmsOverlayScript(cmsParentOrigin) {
       pointer-events: none;
       z-index: 99998;
     }
-    #cms-overlay-root > * {
-      pointer-events: auto;
+    #cms-overlay-root > *:not(.cms-block-toolbar) {
+      pointer-events: none;
     }
     .cms-block-outline {
       position: fixed;
@@ -580,10 +583,69 @@ function generateCmsOverlayScript(cmsParentOrigin) {
       blockEl.setAttribute('data-cms-block', '');
       blockEl.setAttribute('data-block-id', blockId);
       blockEl.setAttribute('data-block-type', blockType);
-      blockEl.setAttribute('data-cms-editable', '');
+
+      injectEditableSpans(
+        blockEl,
+        blockId,
+        blockType,
+        sentinel.getAttribute('data-content-entries')
+      );
     });
   }
 
+  function injectEditableSpans(blockEl, blockId, blockType, rawEntries) {
+    if (!rawEntries || blockEl.querySelector('[data-cms-editable][data-content-path]')) return;
+
+    var entries;
+    try {
+      entries = JSON.parse(rawEntries);
+    } catch (_) {
+      return;
+    }
+    if (!Array.isArray(entries) || entries.length === 0) return;
+
+    var used = {};
+    var walker = document.createTreeWalker(blockEl, NodeFilter.SHOW_TEXT, null);
+    var textNodes = [];
+    var node = walker.nextNode();
+    while (node !== null) {
+      if (node.nodeValue && node.nodeValue.trim()) {
+        textNodes.push(node);
+      }
+      node = walker.nextNode();
+    }
+
+    for (var i = 0; i < textNodes.length; i++) {
+      var textNode = textNodes[i];
+      var parentEl = textNode.parentElement;
+      if (!parentEl || parentEl.closest('svg') || parentEl.closest('[data-cms-editable]')) {
+        continue;
+      }
+
+      var text = textNode.nodeValue;
+      if (!text) continue;
+
+      for (var j = 0; j < entries.length; j++) {
+        var entry = entries[j];
+        if (!entry || typeof entry.v !== 'string' || typeof entry.p !== 'string' || used[entry.p]) {
+          continue;
+        }
+        if (text.trim() !== entry.v.trim()) continue;
+
+        used[entry.p] = true;
+        var span = document.createElement('span');
+        span.setAttribute('data-cms-editable', '');
+        span.setAttribute('data-block-id', blockId);
+        span.setAttribute('data-block-type', blockType);
+        span.setAttribute('data-content-path', entry.p);
+        span.setAttribute('contenteditable', 'true');
+        parentEl.insertBefore(span, textNode);
+        span.appendChild(textNode);
+        break;
+      }
+    }
+  }
+
   stampBlockElements();
 
   var stampObserver = new MutationObserver(function(mutations) {
@@ -638,6 +700,38 @@ function generateCmsOverlayScript(cmsParentOrigin) {
   var toolbarVisible = false;
   var selectedBlockId = null;
 
+  function decoratePreviewUrl(rawHref) {
+    if (!rawHref) return rawHref;
+    try {
+      var url = new URL(rawHref, window.location.href);
+      if (url.origin !== window.location.origin) return rawHref;
+      url.searchParams.set('edit_mode', 'true');
+      if (CMS_PARENT_ORIGIN) {
+        url.searchParams.set('cms_parent_origin', CMS_PARENT_ORIGIN);
+      }
+      return url.toString();
+    } catch (_) {
+      return rawHref;
+    }
+  }
+
+  function preserveEditParamsOnNavigation(e) {
+    if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) {
+      return;
+    }
+
+    var anchor = e.target.closest('a[href]');
+    if (!anchor || (anchor.target && anchor.target !== '_self') || anchor.hasAttribute('download')) {
+      return;
+    }
+
+    var href = anchor.getAttribute('href');
+    var decorated = decoratePreviewUrl(href);
+    if (decorated && decorated !== href) {
+      anchor.setAttribute('href', decorated);
+    }
+  }
+
   function postToParent(message) {
     if (!CMS_PARENT_ORIGIN || !window.parent || window.parent === window) {
       return;
@@ -756,6 +850,8 @@ function generateCmsOverlayScript(cmsParentOrigin) {
   });
 
   document.addEventListener('click', function(e) {
+    preserveEditParamsOnNavigation(e);
+
     if (toolbarVisible && !e.target.closest('[data-cms-toolbar]')) {
       var block = e.target.closest('[data-cms-block]');
       if (!block || block.getAttribute('data-block-id') !== currentBlockId) {
@@ -785,23 +881,23 @@ function generateCmsOverlayScript(cmsParentOrigin) {
         contentPath: null
       });
     }
-  });
+  }, true);
 
   toolbar.querySelector('.move-up').addEventListener('click', function() {
     if (!currentBlockId) return;
-    postToParent({ type: 'cms-block-move', blockId: currentBlockId, direction: 'up' });
+    postToParent({ type: 'cms-block-action', action: 'move-up', blockId: currentBlockId });
     hideToolbar();
   });
 
   toolbar.querySelector('.move-down').addEventListener('click', function() {
     if (!currentBlockId) return;
-    postToParent({ type: 'cms-block-move', blockId: currentBlockId, direction: 'down' });
+    postToParent({ type: 'cms-block-action', action: 'move-down', blockId: currentBlockId });
     hideToolbar();
   });
 
   toolbar.querySelector('.delete').addEventListener('click', function() {
     if (!currentBlockId) return;
-    postToParent({ type: 'cms-block-delete', blockId: currentBlockId });
+    postToParent({ type: 'cms-block-action', action: 'delete', blockId: currentBlockId });
     hideToolbar();
   });
 
@@ -895,6 +991,27 @@ function getCmsParentTargetOrigin(preferredCmsUrl, explicitParentOrigin) {
 
 // lib/block-renderer.tsx
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+function extractContentValues(content, basePath = []) {
+  const map = /* @__PURE__ */ new Map();
+  function walk(obj, path) {
+    if (typeof obj === "string" && obj.trim() !== "") {
+      const contentPath = path.join(".");
+      const existing = map.get(obj) || [];
+      existing.push({ contentPath, value: obj });
+      map.set(obj, existing);
+    } else if (Array.isArray(obj)) {
+      for (let index = 0; index < obj.length; index++) {
+        walk(obj[index], [...path, String(index)]);
+      }
+    } else if (obj && typeof obj === "object") {
+      for (const [key, value] of Object.entries(obj)) {
+        walk(value, [...path, key]);
+      }
+    }
+  }
+  walk(content, basePath);
+  return map;
+}
 function CmsEditableInit({
   cmsUrl,
   cmsParentOrigin
@@ -943,6 +1060,7 @@ function BlockRenderer({
   block,
   registry,
   disableEditable,
+  enableContentEditable,
   routeParams,
   path
 }) {
@@ -958,6 +1076,7 @@ function BlockRenderer({
   if (disableEditable) {
     return component;
   }
+  const contentEntries = enableContentEditable ? [...extractContentValues(block.content).values()].flat().map(({ value, contentPath }) => ({ v: value, p: contentPath })) : void 0;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       "span",
@@ -965,6 +1084,7 @@ function BlockRenderer({
         "data-cms-sentinel": "",
         "data-block-id": block.id,
         "data-block-type": block.type,
+        "data-content-entries": contentEntries ? JSON.stringify(contentEntries) : void 0,
         style: { display: "none" },
         "aria-hidden": "true"
       }
@@ -998,7 +1118,7 @@ async function renderParametricRoute({
   apiKey,
   cmsUrl,
   websiteId: providedWebsiteId
-}) {
+}, { preview = false } = {}) {
   const websiteId = getWebsiteId(providedWebsiteId);
   const { slug } = "then" in params ? await params : params;
   const resolvedSearchParams = searchParams && "then" in searchParams ? await searchParams : searchParams;
@@ -1013,10 +1133,11 @@ async function renderParametricRoute({
       }
     }
   }
-  const editModeParam = resolvedSearchParams?.edit_mode;
-  const editMode = editModeParam === true || editModeParam === "true" || editModeParam === "1";
   const cmsParentOriginParam = resolvedSearchParams?.cms_parent_origin;
   const cmsParentOrigin = typeof cmsParentOriginParam === "boolean" ? void 0 : Array.isArray(cmsParentOriginParam) ? cmsParentOriginParam[0] : cmsParentOriginParam;
+  const previewMode = preview === true;
+  const editModeParam = resolvedSearchParams?.edit_mode;
+  const editMode = previewMode || editModeParam === true || editModeParam === "true" || editModeParam === "1";
   const rawPath = `/${slug.join("/")}`;
   const path = normalizePath(rawPath);
   if (/\.[a-zA-Z0-9]+$/.test(path)) {
@@ -1056,7 +1177,9 @@ async function renderParametricRoute({
     ]);
     const blocks = [];
     for (const block of blockResults) {
-      if (!block || block.published_content === null) continue;
+      if (!block) continue;
+      const blockContent = previewMode ? block.draft_content : block.published_content;
+      if (blockContent == null) continue;
       let content = null;
       if (aiPreviewIndex !== null) {
         const generatedBlock = generatedBlocks[block.id];
@@ -1066,7 +1189,7 @@ async function renderParametricRoute({
           content = variants[variantIndex].content;
         }
       }
-      content = content ?? block.published_content;
+      content = content ?? blockContent;
       if (!content) continue;
       if (block.schema_name === "article") {
         const article = normalizeArticleContent(content);
@@ -1114,6 +1237,7 @@ async function renderParametricRoute({
             block,
             registry: registry ?? {},
             disableEditable: !editMode,
+            enableContentEditable: previewMode,
             routeParams,
             path
           },
@@ -1142,6 +1266,16 @@ async function ParametricRoutePage(props) {
   }
   return result.node;
 }
+async function ParametricRoutePreviewPage(props) {
+  const result = await renderParametricRoute(props, { preview: true });
+  if (result.status === "not_found") {
+    notFound();
+  }
+  if (result.status === "error") {
+    throw result.error;
+  }
+  return result.node;
+}
 async function generateMetadata({
   params,
   apiKey,
@@ -1168,6 +1302,7 @@ async function generateMetadata({
   }
 }
 export {
+  ParametricRoutePreviewPage,
   ParametricRoutePage as default,
   generateMetadata
 };