@ohhwells/bridge 0.1.71 → 0.1.72

package/dist/index.js

@@ -13157,6 +13157,18 @@ function collectEditableNodes(extraContent, root = document) {
   }
   if (extraContent && !isScoped) {
     applyNavFooterDeleteOverrides(byKey, extraContent);
+    for (const key of LOGO_IMAGE_KEYS) {
+      if (!(key in extraContent)) continue;
+      byKey.set(key, { key, type: "image", text: extraContent[key] ?? "" });
+    }
+    for (const key of [LOGO_PLACEHOLDER_KEY, LOGO_ALT_KEY]) {
+      if (!(key in extraContent)) continue;
+      byKey.set(key, { key, type: "meta", text: extraContent[key] ?? "" });
+    }
+    for (const key of LOGO_SIZE_KEYS) {
+      if (!(key in extraContent)) continue;
+      byKey.set(key, { key, type: "meta", text: extraContent[key] ?? "" });
+    }
   }
   return Array.from(byKey.values());
 }
@@ -13754,9 +13766,21 @@ function getLinkHref4(el) {
   const anchor = el instanceof HTMLAnchorElement ? el : el.querySelector("a");
   return anchor?.getAttribute("href") ?? "";
 }
+function normalizeLinkHref(value) {
+  const href = value.trim();
+  if (!href) return href;
+  if (/^[a-z][a-z0-9+.-]*:/i.test(href)) return href;
+  if (href.startsWith("/") || href.startsWith("#") || href.startsWith("?")) return href;
+  if (!/^[^\s/]+\.[a-z]{2,}(?:[/:?#]|$)/i.test(href)) return href;
+  return `https://${href}`;
+}
+function isPageFrameSection(el) {
+  const id = el.dataset.ohwSection ?? "";
+  return el.tagName === "FOOTER" || el.tagName === "HEADER" || Boolean(el.closest("footer")) || /(^|[-_])(footer|navbar)$/i.test(id);
+}
 function applyLinkHref(el, val) {
   const anchor = el instanceof HTMLAnchorElement ? el : el.querySelector("a");
-  if (anchor) anchor.setAttribute("href", val);
+  if (anchor) anchor.setAttribute("href", normalizeLinkHref(val));
 }
 function currentIconRef(el) {
   const uploaded = el instanceof HTMLImageElement ? el : el.querySelector("img");
@@ -13886,7 +13910,7 @@ function applyLinkByKey(key, val) {
   });
   const hrefAnchors = document.querySelectorAll(`[data-ohw-href-key="${key}"]`);
   if (hrefAnchors.length > 0) {
-    setStoredLinkHref(key, val);
+    setStoredLinkHref(key, normalizeLinkHref(val));
     hrefAnchors.forEach((el) => applyLinkHref(el, val));
   }
 }
@@ -15071,7 +15095,8 @@ function OhhwellsBridge() {
       const el = document.querySelector(
         '[data-ohw-hovered]:not([contenteditable]):not([data-ohw-href-key]):not([data-ohw-editable="form"] *)'
       );
-      const target = el && !el.closest("[data-ohw-href-key]") ? el : null;
+      const busy = el?.querySelector('[contenteditable="true"]') ?? null;
+      const target = el && !el.closest("[data-ohw-href-key]") && !busy ? el : null;
       if (!target) {
         setHoveredTextRect(null);
         return;
@@ -15082,7 +15107,10 @@ function OhhwellsBridge() {
     const observer = new MutationObserver(sync);
     observer.observe(document.documentElement, {
       attributes: true,
-      attributeFilter: ["data-ohw-hovered"],
+      // `contenteditable` too: the box is recomputed only when one of these changes, and a click
+      // that opens an element for typing changes nothing else — so the frame measured a moment
+      // earlier, while merely hovering, stayed on screen inside the solid one (OHH-762).
+      attributeFilter: ["data-ohw-hovered", "contenteditable"],
       subtree: true
     });
     return () => observer.disconnect();
@@ -15369,6 +15397,14 @@ function OhhwellsBridge() {
     el.removeAttribute("data-ohw-hovered");
     el.setAttribute("data-ohw-selected", "");
   }, [clearSelectedAttr]);
+  const isSelectedForHover = useCallback7((el) => {
+    if (!el) return false;
+    return [selectedElRef.current, activeElRef.current].some(
+      (busy) => busy && (el === busy || busy.contains(el) || el.contains(busy))
+    );
+  }, []);
+  const isSelectedForHoverRef = useRef9(isSelectedForHover);
+  isSelectedForHoverRef.current = isSelectedForHover;
   const resolveHrefKeyElement = useCallback7((hrefKey) => {
     if (isFooterHrefKey(hrefKey)) {
       return document.querySelector(
@@ -16286,6 +16322,12 @@ function OhhwellsBridge() {
   );
   const activate = useCallback7((el, options) => {
     if (activeElRef.current === el) return;
+    document.querySelectorAll("[data-ohw-hovered]").forEach((hovered) => {
+      hovered.removeAttribute("data-ohw-hovered");
+    });
+    setHoveredTextRect(null);
+    hoveredItemElRef.current = null;
+    setHoveredItemRect(null);
     if (isIconEditable(el)) {
       const social = getSocialItem(el);
       const words = social ? social.querySelector('[data-ohw-editable="text"], [data-ohw-editable="plain"]') : null;
@@ -17472,13 +17514,13 @@ function OhhwellsBridge() {
           clearHrefKeyHover(hoverTarget);
           hoveredItemElRef.current = hoverTarget;
           setHoveredItemRect(hoverTarget.getBoundingClientRect());
-        } else if (!isInsideNavigationItem(editable) && hoverTarget !== selectedElRef.current) {
+        } else if (!isInsideNavigationItem(editable) && !isSelectedForHoverRef.current(hoverTarget)) {
           hoverTarget.setAttribute("data-ohw-hovered", "");
           if (editable.closest("footer") || editable.closest('[data-ohw-section="footer"]')) {
             hoveredNavContainerRef.current = null;
             setHoveredNavContainerRect(null);
             hoveredItemElRef.current = editable;
-            setHoveredItemRect(editable.getBoundingClientRect());
+            setHoveredItemRect(isSelectedForHoverRef.current(editable) ? null : editable.getBoundingClientRect());
           }
         }
       }
@@ -17933,7 +17975,7 @@ function OhhwellsBridge() {
               showImageHover(imgEl, isDragOver, true);
             }
             document.querySelectorAll("[data-ohw-hovered]").forEach((el) => el.removeAttribute("data-ohw-hovered"));
-            if (textEditable && !textEditable.closest("[data-ohw-href-key]")) {
+            if (textEditable && !textEditable.closest("[data-ohw-href-key]") && !isSelectedForHoverRef.current(textEditable)) {
               textEditable.setAttribute("data-ohw-hovered", "");
             }
             return;
@@ -17945,7 +17987,7 @@ function OhhwellsBridge() {
             clearImageHover();
           }
           document.querySelectorAll("[data-ohw-hovered]").forEach((el) => el.removeAttribute("data-ohw-hovered"));
-          if (textEditable && !textEditable.closest("[data-ohw-href-key]")) {
+          if (textEditable && !textEditable.closest("[data-ohw-href-key]") && !isSelectedForHoverRef.current(textEditable)) {
             textEditable.setAttribute("data-ohw-hovered", "");
           }
           return;
@@ -18019,7 +18061,7 @@ function OhhwellsBridge() {
               hoveredItemElRef.current = navAnchor;
               setHoveredItemRect(navAnchor.getBoundingClientRect());
             }
-          } else if (!textEl.closest("[data-ohw-href-key]")) {
+          } else if (!textEl.closest("[data-ohw-href-key]") && !isSelectedForHoverRef.current(textEl)) {
             hoveredItemElRef.current = null;
             setHoveredItemRect(null);
             textEl.setAttribute("data-ohw-hovered", "");
@@ -18113,7 +18155,7 @@ function OhhwellsBridge() {
       const ZONE = 20;
       for (let i = 0; i < sections.length; i++) {
         const a = sections[i];
-        if (a.dataset.ohwSection === "footer") continue;
+        if (isPageFrameSection(a)) continue;
         const b = sections[i + 1] ?? null;
         const boundaryY = a.getBoundingClientRect().bottom;
         if (Math.abs(y - boundaryY) <= ZONE) {
@@ -18573,9 +18615,10 @@ function OhhwellsBridge() {
     const handleAiDeleteSection = (e) => {
       if (e.data?.type !== "ow:ai-delete-section") return;
       const sectionId = typeof e.data.sectionId === "string" ? e.data.sectionId : "";
-      if (!sectionId || sectionId === "navbar" || sectionId === "footer") return;
+      if (!sectionId) return;
       const exists = document.querySelector(`[data-ohw-section="${CSS.escape(sectionId)}"]`);
       if (!exists) return;
+      if (isPageFrameSection(exists)) return;
       const previous = aiSectionsRef.current;
       const nextState = deleteSectionFromState(parseAiSectionsState(previous), sectionId);
       const nextValue = serializeAiSectionsState(nextState);
@@ -19208,6 +19251,15 @@ function OhhwellsBridge() {
       if (visibleViewportRef.current) {
         applyVisibleViewport(visibleViewportRef.current, parentScrollRef.current);
       }
+      handleScroll();
+      document.querySelectorAll("[data-ohw-hovered]").forEach((hovered) => {
+        hovered.removeAttribute("data-ohw-hovered");
+      });
+      setHoveredTextRect(null);
+      hoveredItemElRef.current = null;
+      setHoveredItemRect(null);
+      hoveredNavContainerRef.current = null;
+      setHoveredNavContainerRect(null);
     };
     window.addEventListener("resize", handleViewportResize, { passive: true });
     document.addEventListener("click", handleClick, true);
@@ -19473,7 +19525,7 @@ function OhhwellsBridge() {
       postToParent2({
         type: "ow:ready",
         version: "1",
-        bridgeVersion: "0.1.70",
+        bridgeVersion: "0.1.72",
         path: pathname,
         nodes: collectEditableNodes(editContentRef.current),
         sections