@ohhwells/bridge 0.1.68-next.200 → 0.1.68-next.205

package/dist/index.cjs

@@ -12101,12 +12101,17 @@ function deleteFooterColumn(column) {
 }
 
 // src/lib/logo-identity.ts
-var LOGO_TEXT_KEYS = ["nav-logo-text", "footer-logo-text", "logo-text"];
-var LOGO_IMAGE_KEYS = ["nav-logo-image", "footer-logo", "footer-logo-image"];
+var LOGO_TEXT_KEYS = ["nav-logo-text", "footer-logo-text", "logo-text", "nav-logo", "logo"];
+var LOGO_IMAGE_KEYS = [
+  "nav-logo-image",
+  "footer-logo",
+  "footer-logo-image",
+  "logo-image",
+  "footer-logo-img"
+];
 var LOGO_HREF_KEYS = ["nav-logo-href", "footer-logo-href", "logo-href"];
 var LOGO_PLACEHOLDER_KEY = "logo-is-placeholder";
 var LOGO_ALT_KEY = "logo-alt";
-var LOGO_IMAGE_URL_KEY = "nav-logo-image";
 var PLACEHOLDER_BUSINESS_NAME = "Business name";
 function resolveLogoDisplayText(text) {
   const trimmed = (text ?? "").trim();
@@ -12126,6 +12131,21 @@ function ensureLogoHrefKey(root) {
   if (root.hasAttribute("data-ohw-href-key")) return;
   root.setAttribute("data-ohw-href-key", isFooterLogoRoot(root) ? "footer-logo-href" : "nav-logo-href");
 }
+function logoTextElement(root) {
+  const SELECTOR = '[data-ohw-editable="plain"], [data-ohw-editable="text"]';
+  if (root.matches(SELECTOR)) return root;
+  const marked = root.querySelector(SELECTOR);
+  if (marked) return marked;
+  const hasOwnText = Array.from(root.childNodes).some(
+    (node) => node.nodeType === Node.TEXT_NODE && node.textContent?.trim()
+  );
+  return hasOwnText ? root : null;
+}
+function logoRootImage(root) {
+  const img = root.querySelector("img");
+  const src = img?.getAttribute("src")?.trim() ?? "";
+  return img && src && img.style.display !== "none" ? img : null;
+}
 function applyLogoIdentity(text, isPlaceholder) {
   const display = resolveLogoDisplayText(text);
   const placeholder = isPlaceholder || !text.trim() || display === PLACEHOLDER_BUSINESS_NAME;
@@ -12143,6 +12163,9 @@ function applyLogoIdentity(text, isPlaceholder) {
   document.querySelectorAll('[data-ohw-role="logo"], [data-ohw-logo]').forEach((el) => {
     if (placeholder) el.setAttribute("data-ohw-placeholder", "");
     else el.removeAttribute("data-ohw-placeholder");
+    if (logoRootImage(el)) return;
+    const textEl = logoTextElement(el);
+    if (textEl && textEl.textContent !== display) textEl.textContent = display;
   });
   return display;
 }
@@ -12153,7 +12176,7 @@ function applyLogoImage(url, alt) {
     const imageKey = imageKeyForRoot(root);
     const textKey = textKeyForRoot(root);
     let img = root.querySelector(`img[data-ohw-key="${imageKey}"]`) ?? (root.querySelector(`[data-ohw-key="${imageKey}"]`) instanceof HTMLImageElement ? root.querySelector(`[data-ohw-key="${imageKey}"]`) : null) ?? root.querySelector("img");
-    let textEl = root.querySelector(`[data-ohw-key="${textKey}"]`) ?? root.querySelector('[data-ohw-key="logo-text"]');
+    let textEl = root.querySelector(`[data-ohw-key="${textKey}"]`) ?? root.querySelector('[data-ohw-key="logo-text"]') ?? logoTextElement(root);
     if (url) {
       if (!img) {
         img = document.createElement("img");
@@ -12175,7 +12198,11 @@ function applyLogoImage(url, alt) {
       img.src = url;
       img.alt = displayAlt;
       img.style.display = "block";
-      if (textEl) textEl.style.display = "none";
+      if (textEl === root) {
+        Array.from(root.childNodes).filter((node) => node.nodeType === Node.TEXT_NODE).forEach((node) => node.remove());
+      } else if (textEl) {
+        textEl.style.display = "none";
+      }
       root.removeAttribute("data-ohw-placeholder");
       return;
     }
@@ -12224,6 +12251,13 @@ function readLogoIdentityFromDom() {
   }
   let text = PLACEHOLDER_BUSINESS_NAME;
   let isPlaceholder = true;
+  const rootWithText = Array.from(
+    document.querySelectorAll('[data-ohw-role="logo"], [data-ohw-logo]')
+  ).find((root) => logoTextElement(root)?.textContent?.trim());
+  if (rootWithText) {
+    text = logoTextElement(rootWithText).textContent.trim();
+    isPlaceholder = rootWithText.hasAttribute("data-ohw-placeholder") || text === PLACEHOLDER_BUSINESS_NAME;
+  }
   for (const key of LOGO_TEXT_KEYS) {
     const el = document.querySelector(`[data-ohw-key="${key}"]`);
     if (el?.textContent?.trim()) {
@@ -12254,7 +12288,7 @@ function applyLogoFromContent(content) {
   if (!hasLogoIdentity) return false;
   const logoText = content[LOGO_TEXT_KEYS[0]] ?? content[LOGO_TEXT_KEYS[1]] ?? readLogoIdentityFromDom().text;
   const logoAlt = content[LOGO_ALT_KEY] ?? logoText;
-  const rawLogoImage = content[LOGO_IMAGE_URL_KEY] ?? content["footer-logo"] ?? content["footer-logo-image"] ?? null;
+  const rawLogoImage = LOGO_IMAGE_KEYS.map((key) => content[key]).find((value) => typeof value === "string" && value.trim()) ?? null;
   const logoImageUrl = typeof rawLogoImage === "string" && rawLogoImage.trim() ? rawLogoImage.trim() : null;
   const imageExplicitlyCleared = LOGO_IMAGE_KEYS.some((key) => key in content) && !logoImageUrl;
   const logoIsPlaceholder = LOGO_PLACEHOLDER_KEY in content ? content[LOGO_PLACEHOLDER_KEY] !== "false" : !logoImageUrl && (!logoText.trim() || logoText === PLACEHOLDER_BUSINESS_NAME);
@@ -14236,6 +14270,7 @@ function fadeInImageElement(img, onReady) {
 function applyEditableImageSrc(img, url) {
   img.removeAttribute("srcset");
   img.removeAttribute("sizes");
+  if (img.loading === "lazy") img.loading = "eager";
   img.src = url;
 }
 function fadeInBgImage(el, url, onReady) {
@@ -14722,6 +14757,13 @@ function resolveFooterColumnSelectionTarget(target, clientX, clientY) {
   if (isPointOverNavItem(column, clientX, clientY)) return null;
   return column;
 }
+function isPointOverLogo(x, y) {
+  for (const root of document.querySelectorAll('[data-ohw-role="logo"], [data-ohw-logo]')) {
+    const r2 = root.getBoundingClientRect();
+    if (r2.width > 0 && r2.height > 0 && x >= r2.left && x <= r2.right && y >= r2.top && y <= r2.bottom) return true;
+  }
+  return false;
+}
 function isPointOverNavigation(x, y) {
   const roots = /* @__PURE__ */ new Set();
   const navRoot = document.querySelector("[data-ohw-nav-root]") ?? document.querySelector("nav");
@@ -18495,6 +18537,11 @@ function OhhwellsBridge() {
         probeNavigationHoverAt(x, y);
         return;
       }
+      if (isPointOverLogo(x, y)) {
+        dismissImageHover();
+        probeNavigationHoverAt(x, y);
+        return;
+      }
       const overMoreMenu = document.elementFromPoint(x, y)?.closest?.(
         '[data-ohw-more-menu], [data-slot="dropdown-menu-content"], [data-slot="dropdown-menu-item"]'
       );