@preprio/toolkit 0.5.0-rc.2 → 0.6.0-alpha.1

package/dist/react/components.cjs

@@ -291,13 +291,9 @@ function createElementCache(query, ttl = 1e3) {
 }
 
 // src/core/iframe-bridge.ts
-var debug = createScopedLogger("iframe-bridge");
 var EDITOR_BASE_DOMAIN = "prepr.io";
 function isAllowedEditorOrigin(origin, allowed) {
-  if (allowed) {
-    if (allowed.includes("*")) return origin !== "null";
-    return allowed.includes(origin);
-  }
+  if (allowed) return allowed.includes(origin);
   let url;
   try {
     url = new URL(origin);
@@ -312,7 +308,6 @@ function isAllowedEditorOrigin(origin, allowed) {
 }
 function createIframeBridge(store, options = {}) {
   const allowedOrigins = options.allowedEditorOrigins;
-  const onScrollToField = options.onScrollToField;
   let parentOrigin = null;
   const onKeyDown = (event) => {
     const key = event.key.toLowerCase();
@@ -322,10 +317,7 @@ function createIframeBridge(store, options = {}) {
   const onMessage = (evt) => {
     const data = evt?.data;
     if (data?.event === "prepr:initVE" && !parentOrigin) {
-      if (!isAllowedEditorOrigin(evt.origin, allowedOrigins)) {
-        debug.warn("ignored editor handshake from origin", evt.origin);
-        return;
-      }
+      if (!isAllowedEditorOrigin(evt.origin, allowedOrigins)) return;
       parentOrigin = evt.origin;
       setTrustedParentOrigin(parentOrigin);
       if (data.scrollPosition != null) {
@@ -339,15 +331,6 @@ function createIframeBridge(store, options = {}) {
       const currentScrollY = window.scrollY || document.documentElement.scrollTop;
       sendPreprEvent("getScrollPosition", { value: currentScrollY });
     }
-    if (data?.event === "prepr:scrollToField") {
-      if (typeof data.field !== "string" || !data.field) return;
-      if (data.id !== void 0 && typeof data.id !== "string") return;
-      try {
-        onScrollToField?.({ field: data.field, id: data.id });
-      } catch (error) {
-        debug.warn("scrollToField handler failed", error);
-      }
-    }
   };
   return {
     start() {
@@ -372,7 +355,7 @@ var import_stega2 = require("@vercel/stega");
 
 // src/core/stega/clean.ts
 var import_stega = require("@vercel/stega");
-var debug2 = createScopedLogger("stega:clean");
+var debug = createScopedLogger("stega:clean");
 function decodeStega(str) {
   if (!str) return null;
   try {
@@ -381,7 +364,7 @@ function decodeStega(str) {
       return decoded;
     }
   } catch (error) {
-    debug2.log("error decoding stega data", error);
+    debug.log("error decoding stega data", error);
     const match = str.match(/{"origin.*?}/);
     if (match) {
       try {
@@ -390,7 +373,7 @@ function decodeStega(str) {
           return decodedMatch;
         }
       } catch (innerError) {
-        debug2.log("error decoding stega regex match", innerError);
+        debug.log("error decoding stega regex match", innerError);
       }
     }
   }
@@ -426,37 +409,15 @@ function isRenderedElement(element) {
   if (!style) return true;
   return style.visibility !== "hidden" && style.display !== "none";
 }
-function parseEditHref(href) {
-  try {
-    const url = new URL(href, window.location.origin);
-    return {
-      id: url.pathname.split("/").pop() || void 0,
-      field: url.searchParams.get("field") || void 0,
-      locale: url.searchParams.get("locale") || void 0
-    };
-  } catch {
-    return {};
-  }
-}
-function setOrRemove(element, name, value) {
-  if (value) {
-    element.setAttribute(name, value);
-  } else {
-    element.removeAttribute(name);
-  }
-}
 function tagEncodedElement(element, decoded) {
   element.setAttribute("data-prepr-encoded", "");
   element.setAttribute("data-prepr-href", decoded.href);
   element.setAttribute("data-prepr-origin", decoded.origin);
-  const { id, field, locale } = parseEditHref(decoded.href);
-  setOrRemove(element, "data-prepr-id", id);
-  setOrRemove(element, "data-prepr-field", field);
-  setOrRemove(element, "data-prepr-locale", locale);
 }
 
 // src/core/stega/auto-clean.ts
-var debug3 = createScopedLogger("stega:auto-clean");
+var debug2 = createScopedLogger("stega:auto-clean");
+var HYDRATION_RETRY_MS = 100;
 function createStegaAutoClean(options) {
   const stripText = options?.enabled ?? true;
   let observer = null;
@@ -465,8 +426,29 @@ function createStegaAutoClean(options) {
   let pendingHidden = /* @__PURE__ */ new Set();
   let pendingDirty = /* @__PURE__ */ new Set();
   let debounceTimeout = null;
+  const isHydrated = options?.isHydrated;
+  let pendingHydration = /* @__PURE__ */ new Set();
+  let hydrationTimeout = null;
+  function retryPendingHydration() {
+    hydrationTimeout = null;
+    processing = true;
+    const batch = [...pendingHydration];
+    pendingHydration.clear();
+    batch.forEach((textNode) => {
+      if (textNode.isConnected) cleanTextNode(textNode);
+    });
+    processing = false;
+  }
   function cleanTextNode(textNode) {
     if (isIgnoredTextNode(textNode)) return false;
+    if (isHydrated && !isHydrated(textNode)) {
+      pendingHydration.add(textNode);
+      hydrationTimeout ?? (hydrationTimeout = setTimeout(
+        retryPendingHydration,
+        HYDRATION_RETRY_MS
+      ));
+      return false;
+    }
     const textContent = textNode.textContent;
     const info = cleaned.get(textNode);
     const settled = stripText ? info?.cleaned : info?.original;
@@ -499,7 +481,7 @@ function createStegaAutoClean(options) {
       }
       pendingHidden.add(textNode);
     } catch (error) {
-      debug3.log("error cleaning text node", error);
+      debug2.log("error cleaning text node", error);
     }
     return false;
   }
@@ -585,13 +567,17 @@ function createStegaAutoClean(options) {
     if (observer || typeof window === "undefined") return;
     scanAndClean();
     setupObserver();
-    debug3.log("stega auto-clean started");
+    debug2.log("stega auto-clean started");
   }
   function stop() {
     if (debounceTimeout) {
       clearTimeout(debounceTimeout);
       debounceTimeout = null;
     }
+    if (hydrationTimeout) {
+      clearTimeout(hydrationTimeout);
+      hydrationTimeout = null;
+    }
     if (observer) {
       observer.disconnect();
       observer = null;
@@ -599,13 +585,14 @@ function createStegaAutoClean(options) {
     cleaned = /* @__PURE__ */ new WeakMap();
     pendingHidden = /* @__PURE__ */ new Set();
     pendingDirty = /* @__PURE__ */ new Set();
-    debug3.log("stega auto-clean stopped");
+    pendingHydration = /* @__PURE__ */ new Set();
+    debug2.log("stega auto-clean stopped");
   }
   return { start, stop };
 }
 
 // src/core/stega/elements.ts
-var debug4 = createScopedLogger("stega:elements");
+var debug3 = createScopedLogger("stega:elements");
 var StegaElements = class {
   constructor(decode = decodeStega) {
     this.observer = null;
@@ -650,7 +637,7 @@ var StegaElements = class {
     walkTextNodes(document.body, (textNode) => {
       if (this.tagFromTextNode(textNode)) encodedCount++;
     });
-    debug4.log("document scan complete, encoded", encodedCount, "elements");
+    debug3.log("document scan complete, encoded", encodedCount, "elements");
     this.elements = document.querySelectorAll("[data-prepr-encoded]");
   }
   /** `onUpdate` fires after each debounced batch, for refreshing derived state. */
@@ -706,9 +693,6 @@ var StegaElements = class {
       element.removeAttribute("data-prepr-encoded");
       element.removeAttribute("data-prepr-href");
       element.removeAttribute("data-prepr-origin");
-      element.removeAttribute("data-prepr-id");
-      element.removeAttribute("data-prepr-field");
-      element.removeAttribute("data-prepr-locale");
       element.classList.remove("prepr-overlay-active");
     });
     this.elements = void 0;
@@ -716,7 +700,7 @@ var StegaElements = class {
 };
 
 // src/core/stega/overlay.ts
-var debug5 = createScopedLogger("stega:overlay");
+var debug4 = createScopedLogger("stega:overlay");
 var StegaOverlay = class {
   constructor(onEdit) {
     this.overlay = null;
@@ -761,8 +745,7 @@ var StegaOverlay = class {
     const origin = element.getAttribute("data-prepr-origin");
     const id = element.getAttribute("data-prepr-id") ?? void 0;
     const field = element.getAttribute("data-prepr-field") ?? void 0;
-    const locale = element.getAttribute("data-prepr-locale") ?? void 0;
-    debug5.log("showing overlay", { href, origin });
+    debug4.log("showing overlay", { href, origin });
     const overlay = this.overlay;
     overlay.style.display = "block";
     overlay.style.top = `${rect.top + window.scrollY - 2}px`;
@@ -794,7 +777,7 @@ var StegaOverlay = class {
         tooltip.style.left = `${left}px`;
       });
       tooltip.onclick = () => {
-        this.onEdit({ href, origin, id, field, locale });
+        this.onEdit({ href, origin, id, field });
       };
     }
     this.currentElement = element;
@@ -834,7 +817,7 @@ var StegaOverlay = class {
 };
 
 // src/core/stega/proximity.ts
-var debug6 = createScopedLogger("stega:proximity");
+var debug5 = createScopedLogger("stega:proximity");
 var StegaProximity = class {
   constructor() {
     this.highlighted = /* @__PURE__ */ new Set();
@@ -869,9 +852,9 @@ var StegaProximity = class {
       );
       const nodes = this.getEncodedElements();
       nodes.forEach((el) => this.observer.observe(el));
-      debug6.log("observing", nodes.length, "encoded elements");
+      debug5.log("observing", nodes.length, "encoded elements");
     } catch (error) {
-      debug6.log("error setting up IntersectionObserver", error);
+      debug5.log("error setting up IntersectionObserver", error);
     }
   }
   stopObserving() {
@@ -941,7 +924,7 @@ function removeStegaStyles() {
 }
 
 // src/core/stega/scan.ts
-var debug7 = createScopedLogger("stega:scan");
+var debug6 = createScopedLogger("stega:scan");
 var EDITOR_MODE_STYLES = "[data-prepr-encoded]{cursor:pointer}";
 function createStegaController(opts) {
   const tooltipEnabled = opts.tooltip ?? true;
@@ -974,13 +957,12 @@ function createStegaController(opts) {
       href: encoded.getAttribute("data-prepr-href") ?? "",
       origin: encoded.getAttribute("data-prepr-origin") ?? "",
       id: encoded.getAttribute("data-prepr-id") ?? void 0,
-      field: encoded.getAttribute("data-prepr-field") ?? void 0,
-      locale: encoded.getAttribute("data-prepr-locale") ?? void 0
+      field: encoded.getAttribute("data-prepr-field") ?? void 0
     });
   };
   const start = () => {
     if (initialized) {
-      debug7.log("already initialized, skipping setup");
+      debug6.log("already initialized, skipping setup");
       return;
     }
     if (!tooltipEnabled) {
@@ -990,7 +972,7 @@ function createStegaController(opts) {
       });
       document.addEventListener("click", handleClick, { capture: true });
       initialized = true;
-      debug7.log("stega controller started (editor mode)");
+      debug6.log("stega controller started (editor mode)");
       return;
     }
     injectStegaStyles();
@@ -1021,7 +1003,7 @@ function createStegaController(opts) {
       passive: true
     });
     initialized = true;
-    debug7.log("stega controller started");
+    debug6.log("stega controller started");
   };
   const stop = () => {
     if (!initialized) return;
@@ -1030,7 +1012,7 @@ function createStegaController(opts) {
       elements.cleanup();
       removeStegaStyles();
       initialized = false;
-      debug7.log("stega controller stopped (editor mode)");
+      debug6.log("stega controller stopped (editor mode)");
       return;
     }
     if (throttledMouseMove) {
@@ -1050,43 +1032,11 @@ function createStegaController(opts) {
     elements.cleanup();
     removeStegaStyles();
     initialized = false;
-    debug7.log("stega controller stopped");
+    debug6.log("stega controller stopped");
   };
   return { start, stop };
 }
 
-// src/core/stega/scroll-to-field.ts
-var debug8 = createScopedLogger("stega:scroll");
-var FLASH_DURATION_MS = 1200;
-var flashTimeout = null;
-function scrollToField(request) {
-  const { field, id } = request;
-  if (!field) return false;
-  const candidates = document.querySelectorAll(
-    "[data-prepr-encoded]"
-  );
-  let target = null;
-  for (const candidate of candidates) {
-    if (candidate.getAttribute("data-prepr-field") !== field) continue;
-    if (id && candidate.getAttribute("data-prepr-id") !== id) continue;
-    target = candidate;
-    break;
-  }
-  if (!target) {
-    debug8.log("no element found for field", field);
-    return false;
-  }
-  target.scrollIntoView({ behavior: "smooth", block: "center" });
-  if (flashTimeout) clearTimeout(flashTimeout);
-  document.querySelectorAll(".prepr-overlay-active").forEach((el) => el.classList.remove("prepr-overlay-active"));
-  target.classList.add("prepr-overlay-active");
-  flashTimeout = setTimeout(() => {
-    target.classList.remove("prepr-overlay-active");
-    flashTimeout = null;
-  }, FLASH_DURATION_MS);
-  return true;
-}
-
 // src/core/store.ts
 var DEFAULT_STATE = {
   locale: "en",
@@ -2199,7 +2149,7 @@ function definePreprToolbar() {
 }
 
 // src/core/create-preview.ts
-var debug9 = createScopedLogger("create-preview");
+var debug7 = createScopedLogger("create-preview");
 var controllerStores = /* @__PURE__ */ new WeakMap();
 function defaultNavigation() {
   return {
@@ -2241,7 +2191,7 @@ function createPreprPreview(opts = {}) {
   const search = new URLSearchParams(window.location.search);
   const hideBar = search.get(PARAM_HIDE_BAR) === "true";
   if (hideBar) {
-    debug9.log(`${PARAM_HIDE_BAR}=true \u2014 no visible toolbar`);
+    debug7.log(`${PARAM_HIDE_BAR}=true \u2014 no visible toolbar`);
   }
   const mountUi = (options?.ui ?? true) && !isIframe && !hideBar;
   const locale = resolveLocale(options);
@@ -2277,17 +2227,18 @@ function createPreprPreview(opts = {}) {
     tooltip: mountUi,
     // In the editor, ask the parent to focus the field instead of opening a new
     // tab. Standalone previews keep the window.open behaviour.
-    onEdit: ({ href, id, field, locale: contentLocale }) => {
+    onEdit: ({ href, origin, id, field }) => {
       const safeHref = href ? safeEditUrl(href) : null;
       if (href && !safeHref) {
-        debug9.warn("ignored edit request with unsupported href scheme");
+        debug7.warn("ignored edit request with unsupported href scheme");
         return;
       }
       if (isIframe) {
         sendPreprEvent("field_edit_requested", {
+          href: safeHref ?? void 0,
+          origin,
           id,
-          field,
-          locale: contentLocale
+          field
         });
       } else if (safeHref) {
         window.open(safeHref, "_blank", "noopener,noreferrer");
@@ -2295,7 +2246,8 @@ function createPreprPreview(opts = {}) {
     }
   });
   const autoClean = createStegaAutoClean({
-    enabled: options?.autoClean
+    enabled: options?.autoClean,
+    isHydrated: opts.isHydrated
   });
   autoClean.start();
   const handleChange = createChangeHandler({
@@ -2314,15 +2266,7 @@ function createPreprPreview(opts = {}) {
     handleChange(before, state);
   });
   const bridge = createIframeBridge(store, {
-    allowedEditorOrigins: options?.allowedEditorOrigins,
-    // The editor selecting a field scrolls the matching element into view. The
-    // lookup relies on the attributes the stega scan writes, so it finds
-    // nothing until encoded content has been tagged.
-    onScrollToField: ({ field, id }) => {
-      if (!scrollToField({ field, id })) {
-        debug9.log("no element on this page renders field", field);
-      }
-    }
+    allowedEditorOrigins: options?.allowedEditorOrigins
   });
   sendPreprEvent(
     "getScrollPosition",
@@ -2342,15 +2286,34 @@ function createPreprPreview(opts = {}) {
       bridge.stop();
     }
     el?.remove();
-    debug9.log("preview destroyed");
+    debug7.log("preview destroyed");
   }
   const controller = { destroy };
   controllerStores.set(controller, store);
   return controller;
 }
 
+// src/react/hydration.ts
+var PROPS_KEY_PREFIX = "__reactProps$";
+function reactProps(element) {
+  for (const key of Object.keys(element)) {
+    if (key.startsWith(PROPS_KEY_PREFIX)) {
+      return element[key];
+    }
+  }
+  return void 0;
+}
+function isReactHydrated(text) {
+  for (let el = text.parentElement; el; el = el.parentElement) {
+    const props = reactProps(el);
+    if (!props) continue;
+    return el === text.parentElement || props.dangerouslySetInnerHTML != null;
+  }
+  return true;
+}
+
 // src/version.ts
-var VERSION = "0.5.0-rc.2";
+var VERSION = "0.6.0-alpha.1";
 
 // src/core/pixel.ts
 var PIXEL_SCRIPT_URL = "https://cdn.tracking.prepr.io/js/prepr.min.js";
@@ -2398,7 +2361,12 @@ function PreprPreview({
   ...props
 }) {
   (0, import_react.useEffect)(() => {
-    const preview = createPreprPreview({ props, options, navigation });
+    const preview = createPreprPreview({
+      props,
+      options,
+      navigation,
+      isHydrated: isReactHydrated
+    });
     return () => preview.destroy();
   }, []);
   return null;

package/dist/react/components.d.cts

@@ -58,14 +58,8 @@ interface PreprPreviewOptions extends PreprToolbarOptions {
      */
     ui?: boolean;
     /**
-     * Replace the `*.prepr.io` editor-origin wildcard with an exact list, e.g.
-     * `['http://acme.localhost:8000']`. Intended for self-hosted or locally run
-     * editors; when set, the wildcard no longer applies. Entries are compared to
-     * the editor's origin exactly: scheme, host and port.
-     *
-     * `['*']` accepts any editor origin. Use it for development only: any page
-     * that frames the preview can then switch on preview and edit mode and
-     * receives the field-edit events, which carry content item ids.
+     * Replace the `*.prepr.io` editor-origin wildcard with an exact list.
+     * Intended for self-hosted editors; when set, the wildcard no longer applies.
      */
     allowedEditorOrigins?: string[];
     /**

package/dist/react/components.d.ts

@@ -58,14 +58,8 @@ interface PreprPreviewOptions extends PreprToolbarOptions {
      */
     ui?: boolean;
     /**
-     * Replace the `*.prepr.io` editor-origin wildcard with an exact list, e.g.
-     * `['http://acme.localhost:8000']`. Intended for self-hosted or locally run
-     * editors; when set, the wildcard no longer applies. Entries are compared to
-     * the editor's origin exactly: scheme, host and port.
-     *
-     * `['*']` accepts any editor origin. Use it for development only: any page
-     * that frames the preview can then switch on preview and edit mode and
-     * receives the field-edit events, which carry content item ids.
+     * Replace the `*.prepr.io` editor-origin wildcard with an exact list.
+     * Intended for self-hosted editors; when set, the wildcard no longer applies.
      */
     allowedEditorOrigins?: string[];
     /**