@ohhwells/bridge 0.1.146 → 0.1.148

package/dist/index.cjs

@@ -87,6 +87,7 @@ __export(index_exports, {
   resolveFooterCopyright: () => resolveFooterCopyright,
   serializeAiFooterState: () => serializeAiFooterState,
   stepViableSlide: () => stepViableSlide,
+  stripTextAlignCss: () => stripTextAlignCss,
   toggleVariants: () => toggleVariants,
   useOhwCarousel: () => useOhwCarousel,
   validateUrlInput: () => validateUrlInput,
@@ -1570,7 +1571,19 @@ function brandTrackedFontFamily(doc, stack) {
 }
 var paintLockByEl = /* @__PURE__ */ new WeakMap();
 var paintObserverByEl = /* @__PURE__ */ new WeakMap();
-var paintingButton = false;
+var PAINT_GUARD_ATTRS = {
+  attributes: true,
+  attributeFilter: ["style", "class"]
+};
+function paintGuarded(el, assignment, tokens) {
+  const observer = paintObserverByEl.get(el);
+  observer?.disconnect();
+  try {
+    paintButtonChrome(el, assignment, tokens);
+  } finally {
+    observer?.observe(el, PAINT_GUARD_ATTRS);
+  }
+}
 function paintButtonChrome(el, assignment, tokens) {
   const origin = captureButtonOrigin(el);
   const chrome = tokens.variants[assignment.variant];
@@ -1609,14 +1622,11 @@ function paintButtonChrome(el, assignment, tokens) {
 function guardTemplateHover(el) {
   if (paintObserverByEl.has(el)) return;
   const observer = new MutationObserver(() => {
-    if (paintingButton) return;
     const lock = paintLockByEl.get(el);
     if (!lock) return;
-    paintingButton = true;
-    paintButtonChrome(el, lock.assignment, lock.tokens);
-    paintingButton = false;
+    paintGuarded(el, lock.assignment, lock.tokens);
   });
-  observer.observe(el, { attributes: true, attributeFilter: ["style", "class"] });
+  observer.observe(el, PAINT_GUARD_ATTRS);
   paintObserverByEl.set(el, observer);
 }
 function paintedTokensOf(el) {
@@ -1633,10 +1643,8 @@ function applyButtonStyle(el, assignment, tokens) {
     }
   };
   paintLockByEl.set(el, { assignment, tokens: tracked });
-  paintingButton = true;
-  paintButtonChrome(el, assignment, tracked);
-  paintingButton = false;
   guardTemplateHover(el);
+  paintGuarded(el, assignment, tracked);
 }
 function applyButtonStylesFromContent(doc, content) {
   const assignments = readAssignments(content);
@@ -6266,6 +6274,26 @@ function applyTreeToState(state, payload) {
   const others = state.sections.filter((existing) => existing.id !== entry.id);
   return { ...state, v: 1, sections: [...others, entry] };
 }
+function stripTextAlignCss(html) {
+  return html.replace(/\sstyle="([^"]*)"/gi, (whole, value) => {
+    if (!/text-align\s*:/i.test(value)) return whole;
+    const kept = value.split(";").map((decl) => decl.trim()).filter((decl) => decl && !/^text-align\s*:/i.test(decl)).join("; ");
+    return kept ? ` style="${kept}"` : "";
+  });
+}
+function stripTextAlignInValue(value) {
+  if (typeof value === "string") return stripTextAlignCss(value);
+  if (Array.isArray(value)) return value.map(stripTextAlignInValue);
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, inner]) => [
+        key,
+        stripTextAlignInValue(inner)
+      ])
+    );
+  }
+  return value;
+}
 function foldAlignIntoTrees(state, store) {
   const byId = new Map(state.sections.map((entry) => [entry.id, entry]));
   const nextTrees = /* @__PURE__ */ new Map();
@@ -6288,6 +6316,12 @@ function foldAlignIntoTrees(state, store) {
       return stripChildAligns(rest);
     })
   } : node;
+  const stripContentAligns = (node) => ({
+    ...node,
+    ...node.slots ? { slots: stripTextAlignInValue(node.slots) } : {},
+    ...node.children ? { children: node.children.map(stripContentAligns) } : {}
+  });
+  const authoritative = (block) => stripChildAligns(stripContentAligns(block));
   const nodes = {};
   for (const [key, override] of Object.entries(store.nodes)) {
     const match = override.align !== void 0 && key.startsWith(AI_SLOT_KEY_PREFIX) ? key.match(/^ai\.(.+?)\.r(\d+)\.b(\d+)(?:\.|$)/) : null;
@@ -6299,7 +6333,7 @@ function foldAlignIntoTrees(state, store) {
       nodes[key] = override;
       continue;
     }
-    row.blocks[blockIdx] = { ...stripChildAligns(block), align: override.align };
+    row.blocks[blockIdx] = { ...authoritative(block), align: override.align };
     const rest = { ...override };
     delete rest.align;
     if (Object.keys(rest).length > 0) nodes[key] = rest;
@@ -6312,7 +6346,7 @@ function foldAlignIntoTrees(state, store) {
       continue;
     }
     for (const row of tree.rows) {
-      row.blocks = row.blocks.map((block) => ({ ...stripChildAligns(block), align: override.align }));
+      row.blocks = row.blocks.map((block) => ({ ...authoritative(block), align: override.align }));
     }
     const rest = { ...override };
     delete rest.align;
@@ -30212,14 +30246,73 @@ function OhhwellsBridge() {
           value = JSON.stringify(foldedHeight.store);
         }
       }
+      const restoreNodes = e.data.restoreNodes;
+      const restored = [];
+      if (restoreNodes && typeof restoreNodes === "object") {
+        for (const [key, html] of Object.entries(restoreNodes)) {
+          if (typeof html !== "string") continue;
+          const els = document.querySelectorAll(`[data-ohw-key="${CSS.escape(key)}"]`);
+          if (els.length === 0) continue;
+          for (const el of Array.from(els)) el.innerHTML = html;
+          editContentRef.current = { ...editContentRef.current, [key]: html };
+          restored.push({ key, text: html });
+        }
+      }
+      const previousNodes = {};
+      const strippedNodes = [];
+      if (!restoreNodes) {
+        const aligned = parseStyleStore(value);
+        const prior = parseStyleStore(previous);
+        const keys = /* @__PURE__ */ new Set();
+        if (aligned) {
+          for (const [key, override] of Object.entries(aligned.nodes)) {
+            if (override.align === void 0) continue;
+            if (prior?.nodes[key]?.align === override.align) continue;
+            keys.add(key);
+          }
+          for (const [sectionId, override] of Object.entries(aligned.sections)) {
+            if (override.align === void 0) continue;
+            if (prior?.sections[sectionId]?.align === override.align) continue;
+            const escaped = CSS.escape(sectionId);
+            const markers = document.querySelectorAll(
+              `[data-ohw-instance="${escaped}"], [data-ohw-section="${escaped}"]`
+            );
+            for (const marker of Array.from(markers)) {
+              const editables = marker.querySelectorAll(
+                '[data-ohw-key][data-ohw-editable="text"], [data-ohw-key][data-ohw-editable="plain"]'
+              );
+              for (const el of Array.from(editables)) {
+                const key = el.getAttribute("data-ohw-key");
+                if (key) keys.add(key);
+              }
+            }
+          }
+        }
+        for (const key of keys) {
+          if (key.startsWith(AI_SLOT_KEY_PREFIX) || key.startsWith("__ohw_")) continue;
+          const els = document.querySelectorAll(`[data-ohw-key="${CSS.escape(key)}"]`);
+          if (els.length === 0) continue;
+          const before = sanitizeHtml(els[0].innerHTML);
+          const after = stripTextAlignCss(before);
+          if (after === before) continue;
+          for (const el of Array.from(els)) el.innerHTML = after;
+          previousNodes[key] = before;
+          editContentRef.current = { ...editContentRef.current, [key]: after };
+          strippedNodes.push({ key, text: after });
+        }
+      }
       stylesRef.current = value;
       applyStylesToDom(parseStyleStore(value));
-      postToParentRef.current({ type: "ow:change", nodes: [{ key: STYLE_STORE_KEY, text: value }] });
+      postToParentRef.current({
+        type: "ow:change",
+        nodes: [{ key: STYLE_STORE_KEY, text: value }, ...strippedNodes, ...restored]
+      });
       postToParentRef.current({
         type: "ow:ai-styles-applied",
         previous,
         value,
-        ...previousSections !== void 0 ? { previousSections } : {}
+        ...previousSections !== void 0 ? { previousSections } : {},
+        ...Object.keys(previousNodes).length > 0 ? { previousNodes } : {}
       });
     };
     window.addEventListener("message", handleAiSetStyles);
@@ -31564,7 +31657,7 @@ function OhhwellsBridge() {
       postToParent2({
         type: "ow:ready",
         version: "1",
-        bridgeVersion: "0.1.145",
+        bridgeVersion: "0.1.147",
         path: pathname,
         nodes: collectEditableNodes(editContentRef.current),
         sections
@@ -32795,6 +32888,7 @@ function EmptySection({ title, homeHref = "/", eyebrowKey, titleKey, subtitleKey
   resolveFooterCopyright,
   serializeAiFooterState,
   stepViableSlide,
+  stripTextAlignCss,
   toggleVariants,
   useOhwCarousel,
   validateUrlInput,