@harbour-enterprises/superdoc 1.3.0-next.3 → 1.3.0-next.4

package/dist/superdoc.umd.js

@@ -30890,8 +30890,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       hash: attrs.hash
     };
     const annotationAttrsJson = JSON.stringify(annotationAttrs);
+    const sanitizedDisplayLabel = attrs.displayLabel === "undefined" || attrs.displayLabel === void 0 ? "" : attrs.displayLabel;
     const sdtPrElements = [
-      { name: "w:alias", attributes: { "w:val": attrs.displayLabel } },
+      { name: "w:alias", attributes: { "w:val": sanitizedDisplayLabel } },
       { name: "w:tag", attributes: { "w:val": annotationAttrsJson } },
       { name: "w:id", attributes: { "w:val": id } }
     ];
@@ -36365,7 +36366,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.3") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.4") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -49668,8 +49669,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       const hasMatchingId = changeMarks.find((mark2) => mark2.attrs.id === id);
       if (hasMatchingId) nodesWithMark.push(node3);
     });
+    const nodesToProcess = nodesWithMark.length ? nodesWithMark : node2 ? [node2] : [];
+    if (!nodesToProcess.length) {
+      return;
+    }
     const { deletionText, trackedChangeText } = getTrackedChangeText({
-      nodes: nodesWithMark.length ? nodesWithMark : [node2],
+      nodes: nodesToProcess,
       mark: trackedMark,
       trackedChangeType,
       isDeletionInsertion
@@ -52998,6 +53003,45 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       console.warn("[collaboration] Failed to update Ydoc docx data", error);
     }
   };
+  let isApplyingRemoteChanges = false;
+  const isApplyingRemoteHeaderFooterChanges = () => isApplyingRemoteChanges;
+  const pushHeaderFooterToYjs = (editor, type, sectionId, content2) => {
+    if (isApplyingRemoteChanges) return;
+    const ydoc = editor?.options?.ydoc;
+    if (!ydoc) return;
+    const headerFooterMap = ydoc.getMap("headerFooterJson");
+    const key2 = `${type}:${sectionId}`;
+    const existing = headerFooterMap.get(key2)?.content;
+    if (existing && JSON.stringify(existing) === JSON.stringify(content2)) {
+      return;
+    }
+    ydoc.transact(() => headerFooterMap.set(key2, { type, sectionId, content: content2 }), {
+      event: "header-footer-update",
+      user: editor.options.user
+    });
+  };
+  const applyRemoteHeaderFooterChanges = (editor, key2, data) => {
+    if (!editor || editor.isDestroyed || !editor.converter) return;
+    const { type, sectionId, content: content2 } = data;
+    if (!type || !sectionId || !content2) return;
+    isApplyingRemoteChanges = true;
+    try {
+      const storage = editor.converter[`${type}s`];
+      if (storage) storage[sectionId] = content2;
+      editor.converter.headerFooterModified = true;
+      const editors = editor.converter[`${type}Editors`];
+      editors?.forEach((item) => {
+        if (item.id === sectionId && item.editor) {
+          item.editor.replaceContent(content2);
+        }
+      });
+      editor.emit("remoteHeaderFooterChanged", { type, sectionId, content: content2 });
+    } finally {
+      setTimeout(() => {
+        isApplyingRemoteChanges = false;
+      }, 0);
+    }
+  };
   new PluginKey("collaboration");
   const Collaboration = Extension.create({
     name: "collaboration",
@@ -53026,6 +53070,18 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
         });
       });
+      const headerFooterMap = this.options.ydoc.getMap("headerFooterJson");
+      headerFooterMap.observe((event) => {
+        if (event.transaction.local) return;
+        event.changes.keys.forEach((change, key2) => {
+          if (change.action === "add" || change.action === "update") {
+            const data = headerFooterMap.get(key2);
+            if (data) {
+              applyRemoteHeaderFooterChanges(this.editor, key2, data);
+            }
+          }
+        });
+      });
       return [syncPlugin];
     },
     addCommands() {
@@ -62020,7 +62076,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.0-next.3";
+  const summaryVersion = "1.3.0-next.4";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64654,7 +64710,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.3");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.4");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -74233,7 +74289,12 @@ ${l}
         const hanging = paraIndent?.hanging ?? 0;
         const isFirstLineOfPara = lineIndex === 0 || lineIndex === void 0;
         const firstLineOffsetForCumX = isFirstLineOfPara ? firstLine - hanging : 0;
-        const indentOffset = indentLeft + firstLineOffsetForCumX;
+        const wordLayoutValue = block.attrs?.wordLayout;
+        const wordLayout = isMinimalWordLayout(wordLayoutValue) ? wordLayoutValue : void 0;
+        const isListParagraph = Boolean(wordLayout?.marker);
+        const rawTextStartPx = typeof wordLayout?.marker?.textStartX === "number" && Number.isFinite(wordLayout.marker.textStartX) ? wordLayout.marker.textStartX : typeof wordLayout?.textStartPx === "number" && Number.isFinite(wordLayout.textStartPx) ? wordLayout.textStartPx : void 0;
+        const listIndentOffset = isFirstLineOfPara ? rawTextStartPx ?? indentLeft : indentLeft;
+        const indentOffset = isListParagraph ? listIndentOffset : indentLeft + firstLineOffsetForCumX;
         let cumulativeX = 0;
         const segmentsByRun = /* @__PURE__ */ new Map();
         line.segments.forEach((segment) => {
@@ -86780,6 +86841,15 @@ ${l}
     if (px == null || !Number.isFinite(px)) return void 0;
     return px / PX_PER_PT;
   };
+  const convertIndentTwipsToPx$1 = (indent2) => {
+    if (!indent2) return void 0;
+    const result = {};
+    if (isFiniteNumber(indent2.left)) result.left = twipsToPx$1(indent2.left);
+    if (isFiniteNumber(indent2.right)) result.right = twipsToPx$1(indent2.right);
+    if (isFiniteNumber(indent2.firstLine)) result.firstLine = twipsToPx$1(indent2.firstLine);
+    if (isFiniteNumber(indent2.hanging)) result.hanging = twipsToPx$1(indent2.hanging);
+    return Object.keys(result).length ? result : void 0;
+  };
   const isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
   const isPlainObject$4 = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
   const normalizePrefix = (value) => {
@@ -89764,8 +89834,11 @@ ${l}
     const hydrated = hydrationOverride ?? hydrateParagraphStyleAttrs(para, converterContext);
     const mergedSpacing = mergeSpacingSources(hydrated?.spacing, paragraphProps.spacing, attrs.spacing);
     const normalizedSpacing = normalizeParagraphSpacing(mergedSpacing);
-    const indentSource = attrs.indent ?? paragraphProps.indent ?? hydrated?.indent;
-    const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? attrs.textIndent);
+    const normalizeIndentObject = (value) => {
+      if (!value || typeof value !== "object") return;
+      return normalizePxIndent(value) ?? convertIndentTwipsToPx(value);
+    };
+    const normalizedIndent = normalizeIndentObject(attrs.indent) ?? convertIndentTwipsToPx(paragraphProps.indent) ?? convertIndentTwipsToPx(hydrated?.indent) ?? normalizeParagraphIndent(attrs.textIndent);
     const unwrapTabStops = (tabStops) => {
       if (!Array.isArray(tabStops)) {
         return void 0;
@@ -91335,9 +91408,12 @@ ${l}
         };
       } else {
         const spacingSource = para.attrs?.spacing !== void 0 ? para.attrs.spacing : paragraphProps.spacing !== void 0 ? paragraphProps.spacing : paragraphHydration?.spacing;
-        const indentSource = para.attrs?.indent ?? paragraphProps.indent ?? paragraphHydration?.indent;
+        const normalizeIndentObject = (value) => {
+          if (!value || typeof value !== "object") return;
+          return normalizePxIndent(value) ?? convertIndentTwipsToPx$1(value);
+        };
         const normalizedSpacing = normalizeParagraphSpacing(spacingSource);
-        const normalizedIndent = normalizePxIndent(indentSource) ?? normalizeParagraphIndent(indentSource ?? para.attrs?.textIndent);
+        const normalizedIndent = normalizeIndentObject(para.attrs?.indent) ?? convertIndentTwipsToPx$1(paragraphProps.indent) ?? convertIndentTwipsToPx$1(paragraphHydration?.indent) ?? normalizeParagraphIndent(para.attrs?.textIndent);
         const styleNodeAttrs = paragraphHydration?.tabStops && !para.attrs?.tabStops && !para.attrs?.tabs ? { ...para.attrs ?? {}, tabStops: paragraphHydration.tabStops } : para.attrs ?? {};
         const styleNode = buildStyleNodeFromAttrs(styleNodeAttrs, normalizedSpacing, normalizedIndent);
         if (styleNodeAttrs.styleId == null && paragraphProps.styleId) {
@@ -93058,6 +93134,9 @@ ${l}
   };
   const onHeaderFooterDataUpdate = async ({ editor, transaction }, mainEditor, sectionId, type) => {
     if (!type || !sectionId) return;
+    if (isApplyingRemoteHeaderFooterChanges()) {
+      return;
+    }
     const updatedData = editor.getUpdatedJson();
     const editorsList = mainEditor.converter[`${type}Editors`];
     if (Array.isArray(editorsList)) {
@@ -93081,6 +93160,7 @@ ${l}
     if (editor.docChanged && mainEditor.converter) {
       mainEditor.converter.headerFooterModified = true;
     }
+    pushHeaderFooterToYjs(mainEditor, type, sectionId, updatedData);
     await updateYdocDocxData(mainEditor);
   };
   const setEditorToolbar = ({ editor }, mainEditor) => {
@@ -97929,6 +98009,17 @@ ${l}
         event: "collaborationReady",
         handler: handleCollaborationReady
       });
+      const handleRemoteHeaderFooterChanged = (payload) => {
+        this.#headerFooterAdapter?.invalidate(payload.sectionId);
+        this.#headerFooterManager?.refresh();
+        this.#pendingDocChange = true;
+        this.#scheduleRerender();
+      };
+      this.#editor.on("remoteHeaderFooterChanged", handleRemoteHeaderFooterChanged);
+      this.#editorListeners.push({
+        event: "remoteHeaderFooterChanged",
+        handler: handleRemoteHeaderFooterChanged
+      });
     }
     /**
      * Setup awareness event subscriptions for remote cursor tracking.
@@ -143604,7 +143695,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0-next.3";
+      this.version = "1.3.0-next.4";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;