@ohhwells/bridge 0.1.52-next.141 → 0.1.52-next.143

package/dist/index.cjs

@@ -9302,6 +9302,26 @@ function logoHasUploadedImage(logoEl) {
   if (img.style.display === "none") return false;
   return true;
 }
+function getLogoInteractionRect(logoEl) {
+  if (logoHasUploadedImage(logoEl)) {
+    const img = logoEl.querySelector('img[data-ohw-key="nav-logo-image"], img[data-ohw-key="footer-logo"], img[data-ohw-key="footer-logo-image"]') ?? logoEl.querySelector("img");
+    if (img) {
+      const r2 = img.getBoundingClientRect();
+      if (r2.width > 0 && r2.height > 0) return r2;
+    }
+  }
+  const text = logoEl.querySelector(
+    '[data-ohw-key="nav-logo-text"], [data-ohw-key="footer-logo-text"]'
+  );
+  if (text) {
+    const style = window.getComputedStyle(text);
+    if (style.display !== "none" && style.visibility !== "hidden") {
+      const r2 = text.getBoundingClientRect();
+      if (r2.width > 0 && r2.height > 0) return r2;
+    }
+  }
+  return logoEl.getBoundingClientRect();
+}
 function readLogoSizeState(content, placement) {
   const desktopPx = resolveDesktopLogoSize(content, placement);
   const mobileFollowing = isMobileLogoSizeFollowing(content, placement);
@@ -9497,7 +9517,8 @@ function FloatingPanel({
       role: "dialog",
       "aria-label": title,
       className: cn(
-        "fixed z-[2147483645] flex w-64 flex-col overflow-hidden rounded-xl border border-border bg-background font-sans shadow-lg outline-none",
+        // Above MediaOverlay / item chrome (2147483646); link-modal content shares this tier.
+        "fixed z-[2147483647] flex w-64 flex-col overflow-hidden rounded-xl border border-border bg-background font-sans shadow-lg outline-none",
         className
       ),
       style: { left: clamped.x, top: clamped.y },
@@ -11142,6 +11163,10 @@ function isInsideLinkEditor(target) {
 function isInsideFloatingPanel(target) {
   return Boolean(target.closest("[data-ohw-floating-panel]"));
 }
+function isPointOverFloatingPanel(clientX, clientY) {
+  const el = document.elementFromPoint(clientX, clientY);
+  return Boolean(el instanceof Element && el.closest("[data-ohw-floating-panel]"));
+}
 function getHrefKeyFromElement(el) {
   if (!el) return null;
   const anchor = el.closest("[data-ohw-href-key]");
@@ -13036,7 +13061,7 @@ function OhhwellsBridge() {
       setReorderDragDisabled(false);
       setIsFooterFrameSelection(false);
       setToolbarVariant("logo");
-      setToolbarRect(logoEl.getBoundingClientRect());
+      setToolbarRect(getLogoInteractionRect(logoEl));
       setToolbarShowEditLink(false);
       setActiveCommands(/* @__PURE__ */ new Set());
     },
@@ -13088,6 +13113,19 @@ function OhhwellsBridge() {
         draft.mobileFollowing
       );
       postToParent2({ type: "ow:change", nodes });
+      requestAnimationFrame(() => {
+        const selected = selectedElRef.current;
+        if (!selected || toolbarVariantRef.current !== "logo") return;
+        const rect = getLogoInteractionRect(selected);
+        setToolbarRect(rect);
+        if (glowElRef.current) {
+          const GAP = SELECTION_CHROME_GAP2;
+          glowElRef.current.style.top = `${rect.top - GAP}px`;
+          glowElRef.current.style.left = `${rect.left - GAP}px`;
+          glowElRef.current.style.width = `${rect.width + GAP * 2}px`;
+          glowElRef.current.style.height = `${rect.height + GAP * 2}px`;
+        }
+      });
     },
     [postToParent2]
   );
@@ -13816,6 +13854,16 @@ function OhhwellsBridge() {
         setHoveredNavContainerRect(null);
         return;
       }
+      if (isInsideFloatingPanel(target) || isPointOverFloatingPanel(e.clientX, e.clientY)) {
+        hoveredItemElRef.current = null;
+        setHoveredItemRect(null);
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        siblingHintElRef.current = null;
+        setSiblingHintRect(null);
+        setSiblingHintRects([]);
+        return;
+      }
       {
         const selected2 = selectedElRef.current;
         const selectedIsFooterColumn = Boolean(selected2) && !isFooterLinksContainer(selected2) && (selected2.hasAttribute("data-ohw-footer-col") || selected2.hasAttribute("data-ohw-footer-column") || Boolean(selected2.closest("footer") && isInferredFooterGroup2(selected2)));
@@ -13858,7 +13906,7 @@ function OhhwellsBridge() {
         setHoveredNavContainerRect(null);
         if (selectedElRef.current === logoEl) return;
         hoveredItemElRef.current = logoEl;
-        setHoveredItemRect(logoEl.getBoundingClientRect());
+        setHoveredItemRect(getLogoInteractionRect(logoEl));
         return;
       }
       const navAnchor = getNavigationItemAnchor(target);
@@ -14098,7 +14146,7 @@ function OhhwellsBridge() {
         setHoveredNavContainerRect(null);
         if (selectedElRef.current !== logo) {
           hoveredItemElRef.current = logo;
-          setHoveredItemRect(logo.getBoundingClientRect());
+          setHoveredItemRect(getLogoInteractionRect(logo));
         }
         return;
       }
@@ -14187,7 +14235,7 @@ function OhhwellsBridge() {
       }
     };
     const probeImageAt = (clientX, clientY, isDragOver = false, fromParentViewport = false) => {
-      if (linkPopoverOpenRef.current) {
+      if (linkPopoverOpenRef.current || floatingPanelOpenRef.current && isPointOverFloatingPanel(clientX, clientY)) {
         if (hoveredImageRef.current) {
           hoveredImageRef.current = null;
           hoveredImageHasTextOverlapRef.current = false;
@@ -14441,7 +14489,7 @@ function OhhwellsBridge() {
       }
     };
     const probeHoverCardsAt = (clientX, clientY, fromParentViewport = false) => {
-      if (linkPopoverOpenRef.current || document.documentElement.hasAttribute("data-ohw-section-picking")) {
+      if (linkPopoverOpenRef.current || floatingPanelOpenRef.current && isPointOverFloatingPanel(clientX, clientY) || document.documentElement.hasAttribute("data-ohw-section-picking")) {
         if (activeStateElRef.current) {
           activeStateElRef.current.removeAttribute("data-ohw-state-hovered");
           activeStateElRef.current = null;
@@ -14509,6 +14557,19 @@ function OhhwellsBridge() {
     };
     const handleMouseMove = (e) => {
       const { clientX, clientY } = e;
+      if (floatingPanelOpenRef.current && isPointOverFloatingPanel(clientX, clientY)) {
+        hoveredItemElRef.current = null;
+        setHoveredItemRect(null);
+        hoveredNavContainerRef.current = null;
+        setHoveredNavContainerRect(null);
+        siblingHintElRef.current = null;
+        setSiblingHintRect(null);
+        setSiblingHintRects([]);
+        dismissImageHover();
+        clearImageHover();
+        setSectionGap(null);
+        return;
+      }
       probeSectionGapAt(clientX, clientY);
       probeImageAt(clientX, clientY);
       probeHoverCardsAt(clientX, clientY);
@@ -14517,6 +14578,11 @@ function OhhwellsBridge() {
       if (e.data?.type !== "ow:pointer-sync") return;
       const { clientX, clientY } = e.data;
       if (typeof clientX !== "number" || typeof clientY !== "number") return;
+      if (floatingPanelOpenRef.current && isPointOverFloatingPanel(clientX, clientY)) {
+        dismissImageHover();
+        clearImageHover();
+        return;
+      }
       probeSectionGapAt(clientX, clientY);
       probeImageAt(clientX, clientY);
       probeHoverCardsAt(clientX, clientY);
@@ -14991,7 +15057,8 @@ function OhhwellsBridge() {
     const handleScroll = () => {
       const focusEl = activeElRef.current ?? selectedElRef.current;
       if (focusEl) {
-        const r2 = activeElRef.current ? getEditMeasureEl(activeElRef.current).getBoundingClientRect() : focusEl.getBoundingClientRect();
+        const measureEl = activeElRef.current ? getEditMeasureEl(activeElRef.current) : toolbarVariantRef.current === "logo" ? null : focusEl;
+        const r2 = measureEl ? measureEl.getBoundingClientRect() : toolbarVariantRef.current === "logo" ? getLogoInteractionRect(focusEl) : focusEl.getBoundingClientRect();
         applyToolbarPos(r2);
         setToolbarRect(r2);
         setMaxBadge((prev) => prev && activeElRef.current ? { ...prev, rect: r2 } : prev);
@@ -15001,7 +15068,9 @@ function OhhwellsBridge() {
         setToggleState((prev) => prev ? { ...prev, rect } : null);
       }
       if (hoveredItemElRef.current) {
-        setHoveredItemRect(hoveredItemElRef.current.getBoundingClientRect());
+        const hoverEl = hoveredItemElRef.current;
+        const logo = getLogoElement(hoverEl);
+        setHoveredItemRect(logo ? getLogoInteractionRect(logo) : hoverEl.getBoundingClientRect());
       }
       if (hoveredNavContainerRef.current) {
         setHoveredNavContainerRect(hoveredNavContainerRef.current.getBoundingClientRect());
@@ -15254,8 +15323,9 @@ function OhhwellsBridge() {
       }
       const focusEl = activeElRef.current ?? selectedElRef.current;
       if (focusEl) {
-        const measureEl = activeElRef.current ? getEditMeasureEl(activeElRef.current) : focusEl;
-        applyToolbarPos(measureEl.getBoundingClientRect());
+        const measureEl = activeElRef.current ? getEditMeasureEl(activeElRef.current) : toolbarVariantRef.current === "logo" ? null : focusEl;
+        const r2 = measureEl ? measureEl.getBoundingClientRect() : toolbarVariantRef.current === "logo" ? getLogoInteractionRect(focusEl) : focusEl.getBoundingClientRect();
+        applyToolbarPos(r2);
       }
     };
     const handleClickAt = (e) => {