@harbour-enterprises/superdoc 1.0.0-beta.91 → 1.0.0-beta.93

package/dist/superdoc.umd.js

@@ -42398,7 +42398,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     static getStoredSuperdocVersion(docx) {
       return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
     }
-    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.91") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.93") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -67461,7 +67461,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.91";
+  const summaryVersion = "1.0.0-beta.93";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -68250,7 +68250,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexCJTzjw3v),
+        Promise.resolve().then(() => indexCyp2JwAE),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -68455,7 +68455,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.91");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.93");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -76197,16 +76197,20 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       paragraphAttrs.spacing = spacing;
     }
     if (paragraphAttrs?.numberingProperties && paragraphAttrs?.wordLayout) {
+      const numberingProps = paragraphAttrs.numberingProperties;
+      const resolvedMarkerRpr = numberingProps.resolvedMarkerRpr;
+      const hasExplicitMarkerFont = resolvedMarkerRpr?.fontFamily != null;
+      const hasExplicitMarkerSize = resolvedMarkerRpr?.fontSize != null;
       const firstRunFont = extractFirstTextRunFont(para);
       if (firstRunFont) {
         const wordLayout = paragraphAttrs.wordLayout;
         const marker = wordLayout.marker;
         if (marker?.run) {
           const markerRun = marker.run;
-          if (firstRunFont.fontSizePx != null && Number.isFinite(firstRunFont.fontSizePx)) {
+          if (!hasExplicitMarkerSize && firstRunFont.fontSizePx != null && Number.isFinite(firstRunFont.fontSizePx)) {
             markerRun.fontSize = firstRunFont.fontSizePx;
           }
-          if (firstRunFont.fontFamily) {
+          if (!hasExplicitMarkerFont && firstRunFont.fontFamily) {
             markerRun.fontFamily = firstRunFont.fontFamily;
           }
         }
@@ -81134,7 +81138,7 @@ ${l}
     markerEl.classList.add("superdoc-paragraph-marker");
     markerEl.textContent = markerLayout?.markerText ?? "";
     markerEl.style.display = "inline-block";
-    markerEl.style.fontFamily = markerLayout?.run?.fontFamily ?? "";
+    markerEl.style.fontFamily = toCssFontFamily(markerLayout?.run?.fontFamily) ?? markerLayout?.run?.fontFamily ?? "";
     if (markerLayout?.run?.fontSize != null) {
       markerEl.style.fontSize = `${markerLayout.run.fontSize}px`;
     }
@@ -82273,6 +82277,9 @@ ${l}
         return false;
       }
       const marker = obj.marker;
+      if (marker.markerText !== void 0 && typeof marker.markerText !== "string") {
+        return false;
+      }
       if (marker.markerX !== void 0 && typeof marker.markerX !== "number") {
         return false;
       }
@@ -83258,7 +83265,7 @@ ${l}
               markerContainer.style.left = `${markerLeftX}px`;
               markerContainer.style.top = "0";
             }
-            markerEl.style.fontFamily = wordLayout.marker.run.fontFamily;
+            markerEl.style.fontFamily = toCssFontFamily(wordLayout.marker.run.fontFamily) ?? wordLayout.marker.run.fontFamily;
             markerEl.style.fontSize = `${wordLayout.marker.run.fontSize}px`;
             markerEl.style.fontWeight = wordLayout.marker.run.bold ? "bold" : "";
             markerEl.style.fontStyle = wordLayout.marker.run.italic ? "italic" : "";
@@ -83455,7 +83462,7 @@ ${l}
           markerEl.style.width = `${Math.max(0, fragment.markerWidth - LIST_MARKER_GAP$1)}px`;
           markerEl.style.paddingRight = `${LIST_MARKER_GAP$1}px`;
           markerEl.style.textAlign = marker.justification ?? "left";
-          markerEl.style.fontFamily = marker.run.fontFamily;
+          markerEl.style.fontFamily = toCssFontFamily(marker.run.fontFamily) ?? marker.run.fontFamily;
           markerEl.style.fontSize = `${marker.run.fontSize}px`;
           if (marker.run.bold) markerEl.style.fontWeight = "bold";
           if (marker.run.italic) markerEl.style.fontStyle = "italic";
@@ -85328,7 +85335,26 @@ ${l}
           textRun.token ?? ""
         ].join(",");
       }).join("|");
-      return markerVersion ? `${markerVersion}|${runsVersion}` : runsVersion;
+      const attrs = block.attrs;
+      const paragraphAttrsVersion = attrs ? [
+        attrs.alignment ?? "",
+        attrs.spacing?.before ?? "",
+        attrs.spacing?.after ?? "",
+        attrs.spacing?.line ?? "",
+        attrs.spacing?.lineRule ?? "",
+        attrs.indent?.left ?? "",
+        attrs.indent?.right ?? "",
+        attrs.indent?.firstLine ?? "",
+        attrs.indent?.hanging ?? "",
+        attrs.borders ? JSON.stringify(attrs.borders) : "",
+        attrs.shading?.fill ?? "",
+        attrs.shading?.color ?? "",
+        attrs.direction ?? "",
+        attrs.rtl ? "1" : "",
+        attrs.tabs?.length ? JSON.stringify(attrs.tabs) : ""
+      ].join(":") : "";
+      const parts = [markerVersion, runsVersion, paragraphAttrsVersion].filter(Boolean);
+      return parts.join("|");
     }
     if (block.kind === "list") {
       return block.items.map((item) => `${item.id}:${item.marker.text}:${deriveBlockVersion(item.paragraph)}`).join("|");
@@ -89075,6 +89101,33 @@ ${l}
   const BYTES_PER_ENTRY_ESTIMATE = 5e3;
   const NORMALIZED_WHITESPACE = /\s+/g;
   const normalizeText = (text2) => text2.replace(NORMALIZED_WHITESPACE, " ");
+  const hashParagraphBorder = (border) => {
+    const parts = [];
+    if (border.style !== void 0) parts.push(`s:${border.style}`);
+    if (border.width !== void 0) parts.push(`w:${border.width}`);
+    if (border.color !== void 0) parts.push(`c:${border.color}`);
+    if (border.space !== void 0) parts.push(`sp:${border.space}`);
+    return parts.join(",");
+  };
+  const hashParagraphBorders = (borders) => {
+    const parts = [];
+    if (borders.top) parts.push(`t:[${hashParagraphBorder(borders.top)}]`);
+    if (borders.right) parts.push(`r:[${hashParagraphBorder(borders.right)}]`);
+    if (borders.bottom) parts.push(`b:[${hashParagraphBorder(borders.bottom)}]`);
+    if (borders.left) parts.push(`l:[${hashParagraphBorder(borders.left)}]`);
+    return parts.join(";");
+  };
+  const hashParagraphFrame = (frame) => {
+    const parts = [];
+    if (frame.wrap !== void 0) parts.push(`w:${frame.wrap}`);
+    if (frame.x !== void 0) parts.push(`x:${frame.x}`);
+    if (frame.y !== void 0) parts.push(`y:${frame.y}`);
+    if (frame.xAlign !== void 0) parts.push(`xa:${frame.xAlign}`);
+    if (frame.yAlign !== void 0) parts.push(`ya:${frame.yAlign}`);
+    if (frame.hAnchor !== void 0) parts.push(`ha:${frame.hAnchor}`);
+    if (frame.vAnchor !== void 0) parts.push(`va:${frame.vAnchor}`);
+    return parts.join(",");
+  };
   const hashRuns = (block) => {
     if (block.kind === "table") {
       const tableBlock = block;
@@ -89170,7 +89223,59 @@ ${l}
         numberingKey = `|num:${np.numId ?? ""}:${np.ilvl ?? 0}:${markerTextKey}`;
       }
     }
-    return `${trackedMode}:${trackedEnabled ? "on" : "off"}|${runsHash}${numberingKey}`;
+    let paragraphAttrsKey = "";
+    if (block.attrs) {
+      const attrs = block.attrs;
+      const parts = [];
+      if (attrs.alignment) parts.push(`al:${attrs.alignment}`);
+      if (attrs.spacing) {
+        const s2 = attrs.spacing;
+        if (s2.before !== void 0) parts.push(`sb:${s2.before}`);
+        if (s2.after !== void 0) parts.push(`sa:${s2.after}`);
+        if (s2.line !== void 0) parts.push(`sl:${s2.line}`);
+        if (s2.lineRule) parts.push(`sr:${s2.lineRule}`);
+      }
+      if (attrs.indent) {
+        const ind = attrs.indent;
+        if (ind.left !== void 0) parts.push(`il:${ind.left}`);
+        if (ind.right !== void 0) parts.push(`ir:${ind.right}`);
+        if (ind.firstLine !== void 0) parts.push(`if:${ind.firstLine}`);
+        if (ind.hanging !== void 0) parts.push(`ih:${ind.hanging}`);
+      }
+      if (attrs.borders) {
+        parts.push(`br:${hashParagraphBorders(attrs.borders)}`);
+      }
+      if (attrs.shading) {
+        const sh = attrs.shading;
+        if (sh.fill) parts.push(`shf:${sh.fill}`);
+        if (sh.color) parts.push(`shc:${sh.color}`);
+      }
+      if (attrs.tabs && attrs.tabs.length > 0) {
+        const tabsHash = attrs.tabs.map((t) => `${t.val ?? ""}:${t.pos ?? ""}:${t.leader ?? ""}`).join(",");
+        parts.push(`tb:${tabsHash}`);
+      }
+      if (attrs.direction) parts.push(`dir:${attrs.direction}`);
+      if (attrs.rtl) parts.push("rtl");
+      if (attrs.keepNext) parts.push("kn");
+      if (attrs.keepLines) parts.push("kl");
+      if (attrs.floatAlignment) parts.push(`fa:${attrs.floatAlignment}`);
+      if (attrs.contextualSpacing) parts.push("cs");
+      if (attrs.suppressFirstLineIndent) parts.push("sfi");
+      if (attrs.dropCap) parts.push(`dc:${attrs.dropCap}`);
+      if (attrs.dropCapDescriptor) {
+        const dcd = attrs.dropCapDescriptor;
+        parts.push(`dcd:${dcd.mode ?? ""}:${dcd.lines ?? ""}`);
+      }
+      if (attrs.frame) {
+        parts.push(`fr:${hashParagraphFrame(attrs.frame)}`);
+      }
+      if (attrs.tabIntervalTwips !== void 0) parts.push(`ti:${attrs.tabIntervalTwips}`);
+      if (attrs.decimalSeparator) parts.push(`ds:${attrs.decimalSeparator}`);
+      if (parts.length > 0) {
+        paragraphAttrsKey = `|pa:${parts.join(":")}`;
+      }
+    }
+    return `${trackedMode}:${trackedEnabled ? "on" : "off"}|${runsHash}${numberingKey}${paragraphAttrsKey}`;
   };
   const createStats = () => ({
     hits: 0,
@@ -90055,6 +90160,75 @@ ${l}
     }
     return "";
   };
+  const paragraphSpacingEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return a2.before === b2.before && a2.after === b2.after && a2.line === b2.line && a2.lineRule === b2.lineRule && a2.beforeAutospacing === b2.beforeAutospacing && a2.afterAutospacing === b2.afterAutospacing;
+  };
+  const paragraphIndentEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return a2.left === b2.left && a2.right === b2.right && a2.firstLine === b2.firstLine && a2.hanging === b2.hanging;
+  };
+  const paragraphBorderEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return a2.style === b2.style && a2.width === b2.width && a2.color === b2.color && a2.space === b2.space;
+  };
+  const paragraphBordersEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return paragraphBorderEqual(a2.top, b2.top) && paragraphBorderEqual(a2.right, b2.right) && paragraphBorderEqual(a2.bottom, b2.bottom) && paragraphBorderEqual(a2.left, b2.left);
+  };
+  const paragraphShadingEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return a2.fill === b2.fill && a2.color === b2.color && a2.val === b2.val && a2.themeColor === b2.themeColor && a2.themeFill === b2.themeFill && a2.themeFillShade === b2.themeFillShade && a2.themeFillTint === b2.themeFillTint && a2.themeShade === b2.themeShade && a2.themeTint === b2.themeTint;
+  };
+  const tabStopEqual = (a2, b2) => {
+    return a2.val === b2.val && a2.pos === b2.pos && a2.leader === b2.leader;
+  };
+  const tabStopsEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    if (a2.length !== b2.length) return false;
+    for (let i2 = 0; i2 < a2.length; i2 += 1) {
+      if (!tabStopEqual(a2[i2], b2[i2])) return false;
+    }
+    return true;
+  };
+  const paragraphFrameEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    return a2.wrap === b2.wrap && a2.x === b2.x && a2.y === b2.y && a2.xAlign === b2.xAlign && a2.yAlign === b2.yAlign && a2.hAnchor === b2.hAnchor && a2.vAnchor === b2.vAnchor;
+  };
+  const dropCapDescriptorEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    if (a2.mode !== b2.mode || a2.lines !== b2.lines) return false;
+    const runA = a2.run;
+    const runB = b2.run;
+    if (!runA || !runB) return !runA && !runB;
+    if (runA.text !== runB.text || runA.fontFamily !== runB.fontFamily || runA.fontSize !== runB.fontSize || runA.bold !== runB.bold || runA.italic !== runB.italic || runA.color !== runB.color) {
+      return false;
+    }
+    return true;
+  };
+  const paragraphAttrsEqual = (a2, b2) => {
+    if (a2 === b2) return true;
+    if (!a2 || !b2) return !a2 && !b2;
+    if (a2.alignment !== b2.alignment || a2.contextualSpacing !== b2.contextualSpacing || a2.suppressFirstLineIndent !== b2.suppressFirstLineIndent || a2.dropCap !== b2.dropCap || a2.decimalSeparator !== b2.decimalSeparator || a2.tabIntervalTwips !== b2.tabIntervalTwips || a2.keepNext !== b2.keepNext || a2.keepLines !== b2.keepLines || a2.direction !== b2.direction || a2.rtl !== b2.rtl || a2.floatAlignment !== b2.floatAlignment) {
+      return false;
+    }
+    if (!paragraphSpacingEqual(a2.spacing, b2.spacing)) return false;
+    if (!paragraphIndentEqual(a2.indent, b2.indent)) return false;
+    if (!paragraphBordersEqual(a2.borders, b2.borders)) return false;
+    if (!paragraphShadingEqual(a2.shading, b2.shading)) return false;
+    if (!tabStopsEqual(a2.tabs, b2.tabs)) return false;
+    if (!paragraphFrameEqual(a2.frame, b2.frame)) return false;
+    if (!dropCapDescriptorEqual(a2.dropCapDescriptor, b2.dropCapDescriptor)) return false;
+    return true;
+  };
   const paragraphBlocksEqual = (a2, b2) => {
     const aMode = a2.attrs?.trackedChangesMode ?? "review";
     const bMode = b2.attrs?.trackedChangesMode ?? "review";
@@ -90062,6 +90236,7 @@ ${l}
     const aEnabled = resolveTrackedChangesEnabled(a2.attrs, true);
     const bEnabled = resolveTrackedChangesEnabled(b2.attrs, true);
     if (aEnabled !== bEnabled) return false;
+    if (!paragraphAttrsEqual(a2.attrs, b2.attrs)) return false;
     if (a2.runs.length !== b2.runs.length) return false;
     for (let i2 = 0; i2 < a2.runs.length; i2 += 1) {
       const runA = a2.runs[i2];
@@ -92909,7 +93084,7 @@ ${l}
     let markerInfo;
     if (wordLayout?.marker) {
       const markerRun = {
-        fontFamily: wordLayout.marker.run.fontFamily,
+        fontFamily: toCssFontFamily(wordLayout.marker.run.fontFamily) ?? wordLayout.marker.run.fontFamily,
         fontSize: wordLayout.marker.run.fontSize,
         bold: wordLayout.marker.run.bold,
         italic: wordLayout.marker.run.italic
@@ -93237,7 +93412,7 @@ ${l}
         const marker = wordLayout.marker;
         const markerFontRun = {
           text: marker.markerText,
-          fontFamily: marker.run.fontFamily,
+          fontFamily: toCssFontFamily(marker.run.fontFamily) ?? marker.run.fontFamily,
           fontSize: marker.run.fontSize,
           bold: marker.run.bold,
           italic: marker.run.italic,
@@ -151610,7 +151785,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.91";
+      this.version = "1.0.0-beta.93";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -154082,7 +154257,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexCJTzjw3v = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexCyp2JwAE = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));