ngx-xtroedge-cms 1.3.13 → 1.3.16

package/dist/index.mjs

@@ -431,7 +431,7 @@ var XtroedgeCMS = class _XtroedgeCMS {
     this.defaultLanguage = this.config.defaultLanguage || this.languages[0] || "en";
     this.highlightColor = this.config.highlightColor || "#00C853";
     this.historyRetentionMs = (this.config.historyRetentionDays || 7) * 24 * 60 * 60 * 1e3;
-    this.currentLang = this.defaultLanguage;
+    this.currentLang = this.detectCurrentLanguage();
     this.siteIdentifier = this.resolveSiteIdentifier();
     const savedColor = localStorage.getItem("xtroedge_theme_color");
     if (savedColor) this.highlightColor = savedColor;
@@ -932,12 +932,28 @@ var XtroedgeCMS = class _XtroedgeCMS {
     }
     return text;
   }
+  hasEditableChildren(el) {
+    return !!el.querySelector("[data-cms]");
+  }
+  setDirectTextContent(el, val) {
+    if (this.hasEditableChildren(el)) {
+      const textNodes = [];
+      for (let i = 0; i < el.childNodes.length; i++) {
+        if (el.childNodes[i].nodeType === Node.TEXT_NODE) textNodes.push(el.childNodes[i]);
+      }
+      if (textNodes.length > 0) textNodes[0].textContent = val;
+      else el.prepend(document.createTextNode(val));
+    } else {
+      el.textContent = val;
+    }
+  }
   // ===============================================
   // ELEMENT EDITING
   // ===============================================
   attachElement(el, key) {
+    const getText = () => this.hasEditableChildren(el) ? this.getDirectTextContent(el).trim() : el.textContent?.trim() || "";
     const blurHandler = () => {
-      const text = el.textContent?.trim() || "";
+      const text = getText();
       const currentVal = this.getPageText(key);
       if (text !== currentVal) this.onTextChanged(key, text);
     };
@@ -948,7 +964,7 @@ var XtroedgeCMS = class _XtroedgeCMS {
       }
     };
     const inputHandler = () => {
-      const text = el.textContent?.trim() || "";
+      const text = getText();
       const currentVal = this.getPageText(key);
       if (text !== currentVal) this.onTextChanged(key, text);
     };
@@ -977,7 +993,7 @@ var XtroedgeCMS = class _XtroedgeCMS {
   }
   enableElementEdit(el, _key, blurH, keyH, inputH, clickH) {
     const val = this.getPageText(_key);
-    if (val) el.textContent = val;
+    if (val) this.setDirectTextContent(el, val);
     el.setAttribute("contenteditable", "true");
     el.style.outline = `2px dashed ${this.highlightColor}`;
     el.style.outlineOffset = "-2px";
@@ -998,7 +1014,7 @@ var XtroedgeCMS = class _XtroedgeCMS {
     el.style.transition = "";
     el.style.minWidth = "";
     const val = this.getPageText(_key);
-    if (val) el.textContent = val;
+    if (val) this.setDirectTextContent(el, val);
     el.removeEventListener("blur", blurH);
     el.removeEventListener("keydown", keyH);
     el.removeEventListener("input", inputH);
@@ -1016,7 +1032,9 @@ var XtroedgeCMS = class _XtroedgeCMS {
     for (const [el, info] of this.managedElements) {
       if (document.activeElement === el) continue;
       const val = this.getPageText(info.key);
-      if (val && el.textContent !== val) el.textContent = val;
+      if (!val) continue;
+      const current = this.hasEditableChildren(el) ? this.getDirectTextContent(el).trim() : el.textContent?.trim() || "";
+      if (val !== current) this.setDirectTextContent(el, val);
     }
     this.observer?.observe(document.body, { childList: true, subtree: true });
   }
@@ -1361,8 +1379,11 @@ var XtroedgeCMS = class _XtroedgeCMS {
     }
   }
   hasSection(type) {
-    if (type === "header") return !!(document.querySelector("header") || document.querySelector('[class*="-header"]') || document.querySelector('[tagName$="-header"]'));
-    return !!(document.querySelector("footer") || document.querySelector('[class*="-footer"]') || document.querySelector('[tagName$="-footer"]'));
+    const slug = type === "header" ? "/header" : "/footer";
+    for (const [, info] of this.managedElements) {
+      if (info.sectionSlug === slug) return true;
+    }
+    return false;
   }
   async loadPageContent(status) {
     this.setLoading(true);