@ohhwells/bridge 0.1.52-next.139 → 0.1.52-next.140

package/dist/index.cjs

@@ -9192,6 +9192,27 @@ function readLogoIdentityFromDom() {
   const href = (logoRoot instanceof HTMLAnchorElement ? logoRoot.getAttribute("href") : null) || logoRoot?.closest("a")?.getAttribute("href") || "/";
   return { text, isPlaceholder, imageUrl: null, href, alt: text };
 }
+function applyLogoFromContent(content) {
+  const hasLogoIdentity = LOGO_PLACEHOLDER_KEY in content || LOGO_TEXT_KEYS.some((key) => key in content) || LOGO_IMAGE_KEYS.some((key) => key in content) || LOGO_ALT_KEY in content || LOGO_HREF_KEYS.some((key) => key in 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 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);
+  if (logoImageUrl) {
+    applyLogoImage(logoImageUrl, logoAlt);
+  } else {
+    if (imageExplicitlyCleared) applyLogoImage(null, logoAlt);
+    applyLogoIdentity(logoText, logoIsPlaceholder);
+  }
+  const logoHref = content["nav-logo-href"] ?? content["footer-logo-href"] ?? content["logo-href"];
+  if (typeof logoHref === "string" && logoHref.trim()) {
+    applyLogoHref(logoHref);
+  }
+  return true;
+}
 
 // src/lib/site-wide-scope.ts
 function getLogoElement(el) {
@@ -12681,6 +12702,8 @@ function OhhwellsBridge() {
       const imageLoads = [];
       for (const [key, val] of Object.entries(content)) {
         if (key === "__ohw_sections") continue;
+        if (key === LOGO_PLACEHOLDER_KEY) continue;
+        if (LOGO_IMAGE_KEYS.includes(key)) continue;
         if (applyVideoSettingNode(key, val)) continue;
         if (applyCarouselNode(key, val)) continue;
         document.querySelectorAll(`[data-ohw-key="${key}"]`).forEach((el) => {
@@ -12713,6 +12736,7 @@ function OhhwellsBridge() {
         });
         applyLinkByKey(key, val);
       }
+      applyLogoFromContent(content);
       reconcileNavbarItemsFromContent(content);
       reconcileFooterOrderFromContent(content);
       enforceLinkHrefs();
@@ -12755,6 +12779,8 @@ function OhhwellsBridge() {
       try {
         for (const [key, val] of Object.entries(content)) {
           if (key === "__ohw_sections") continue;
+          if (key === LOGO_PLACEHOLDER_KEY) continue;
+          if (LOGO_IMAGE_KEYS.includes(key)) continue;
           if (applyVideoSettingNode(key, val)) continue;
           if (applyCarouselNode(key, val)) continue;
           document.querySelectorAll(`[data-ohw-key="${key}"]`).forEach((el) => {
@@ -12775,6 +12801,7 @@ function OhhwellsBridge() {
           });
           applyLinkByKey(key, val);
         }
+        applyLogoFromContent(content);
         reconcileNavbarItemsFromContent(content);
         reconcileFooterOrderFromContent(content);
       } finally {
@@ -14193,28 +14220,7 @@ function OhhwellsBridge() {
         });
         applyLinkByKey(key, val);
       }
-      const hasLogoIdentity = LOGO_PLACEHOLDER_KEY in content || LOGO_TEXT_KEYS.some((key) => key in content) || LOGO_IMAGE_KEYS.some((key) => key in content) || LOGO_ALT_KEY in content || LOGO_HREF_KEYS.some((key) => key in content);
-      if (hasLogoIdentity) {
-        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 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);
-        if (logoImageUrl) {
-          applyLogoImage(logoImageUrl, logoAlt);
-        } else {
-          if (imageExplicitlyCleared) applyLogoImage(null, logoAlt);
-          applyLogoIdentity(logoText, logoIsPlaceholder);
-        }
-        const logoHref = content["nav-logo-href"] ?? content["footer-logo-href"] ?? content["logo-href"];
-        if (typeof logoHref === "string" && logoHref.trim()) {
-          applyLogoHref(logoHref);
-          applyLinkByKey("nav-logo-href", logoHref);
-          applyLinkByKey("footer-logo-href", logoHref);
-          applyLinkByKey("logo-href", logoHref);
-        }
-      }
+      applyLogoFromContent(content);
       if (sectionsJson) {
         initSectionsFromContent({ __ohw_sections: sectionsJson }, true);
         sectionsLoadedRef.current = true;