@harbour-enterprises/superdoc 1.8.1-next.2 → 1.8.1-next.3

package/dist/superdoc.umd.js

@@ -39009,7 +39009,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.8.1-next.2") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.8.1-next.3") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -39165,20 +39165,29 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     }
     getDocumentFonts() {
       const inlineDocumentFonts = [...new Set(this.inlineDocumentFonts || [])];
+      const defaults2 = this.getDocumentDefaultStyles?.() || {};
+      const defaultTypeface = typeof defaults2.typeface === "string" ? defaults2.typeface : null;
+      const defaultFontFamilyCss = typeof defaults2.fontFamilyCss === "string" ? defaults2.fontFamilyCss : null;
+      const fallbackFont = defaultTypeface || (defaultFontFamilyCss ? defaultFontFamilyCss.split(",")[0]?.replace(/["']/g, "").trim() : null);
+      const withDefaultFont = (fonts) => {
+        const result = [...fonts];
+        if (fallbackFont && !result.includes(fallbackFont)) result.push(fallbackFont);
+        return result;
+      };
       const fontTable = this.convertedXml["word/fontTable.xml"];
       if (!fontTable) {
-        return inlineDocumentFonts;
+        return withDefaultFont(inlineDocumentFonts);
       }
       const wFonts = fontTable.elements?.find((element2) => element2.name === "w:fonts");
       if (!wFonts) {
-        return inlineDocumentFonts;
+        return withDefaultFont(inlineDocumentFonts);
       }
       if (!wFonts.elements) {
-        return inlineDocumentFonts;
+        return withDefaultFont(inlineDocumentFonts);
       }
       const fontsInFontTable = wFonts.elements.filter((element2) => element2.name === "w:font").map((element2) => element2.attributes["w:name"]);
       const allFonts = [...inlineDocumentFonts, ...fontsInFontTable];
-      return [...new Set(allFonts)];
+      return withDefaultFont([...new Set(allFonts)]);
     }
     getFontFaceImportString() {
       const fontTable = this.convertedXml["word/fontTable.xml"];
@@ -65395,7 +65404,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.8.1-next.2";
+  const summaryVersion = "1.8.1-next.3";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -68119,7 +68128,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.8.1-next.2");
+      console.debug("[checkVersionMigrations] Current editor version", "1.8.1-next.3");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -110819,75 +110828,26 @@ ${o}
     return null;
   };
   const resolveRunPropertiesFromParagraphStyle = (paragraphNode, editor) => {
-    if (!paragraphNode || !editor?.converter) return {};
+    if (!paragraphNode || !editor?.converter) return { runProperties: {}, markDefs: [] };
     const styleId = paragraphNode.attrs?.paragraphProperties?.styleId;
-    if (!styleId) return {};
+    if (!styleId) return { runProperties: {}, markDefs: [] };
     try {
       const params2 = {
         translatedNumbering: editor.converter.translatedNumbering,
         translatedLinkedStyles: editor.converter.translatedLinkedStyles
       };
       const resolvedPpr = { styleId };
-      const runProps = resolveRunProperties(params2, {}, resolvedPpr, false, false);
-      const runProperties = {};
-      if (runProps.fontFamily) {
-        const fontValue = runProps.fontFamily.ascii || runProps.fontFamily;
-        if (fontValue) {
-          runProperties.fontFamily = typeof fontValue === "string" ? fontValue : fontValue.ascii;
-        }
-      }
-      if (runProps.fontSize) {
-        runProperties.fontSize = `${runProps.fontSize / 2}pt`;
-      }
-      if (runProps.bold) runProperties.bold = true;
-      if (runProps.italic) runProperties.italic = true;
-      if (runProps.underline) runProperties.underline = runProps.underline;
-      if (runProps.strike) runProperties.strike = true;
-      return runProperties;
+      const runProperties = resolveRunProperties(params2, {}, resolvedPpr, null, false, false);
+      const markDefs = encodeMarksFromRPr(runProperties, editor.converter.convertedXml);
+      return { runProperties, markDefs: Array.isArray(markDefs) ? markDefs : [] };
     } catch (_e2) {
-      return {};
+      return { runProperties: {}, markDefs: [] };
     }
   };
   const createMarksFromDefs = (schema, markDefs = []) => markDefs.map((def2) => {
     const markType = schema.marks[def2.type];
     return markType ? markType.create(def2.attrs) : null;
   }).filter(Boolean);
-  const createMarkDefsFromStyleRunProps = (styleRunProps) => {
-    const markDefs = [];
-    const textStyleAttrs = {};
-    if (styleRunProps.fontSize) {
-      textStyleAttrs.fontSize = styleRunProps.fontSize;
-    }
-    if (styleRunProps.fontFamily) {
-      textStyleAttrs.fontFamily = styleRunProps.fontFamily;
-    }
-    if (Object.keys(textStyleAttrs).length > 0) {
-      markDefs.push({ type: "textStyle", attrs: textStyleAttrs });
-    }
-    if (styleRunProps.bold) {
-      markDefs.push({ type: "bold", attrs: { value: true } });
-    }
-    if (styleRunProps.italic) {
-      markDefs.push({ type: "italic", attrs: { value: true } });
-    }
-    if (styleRunProps.strike) {
-      markDefs.push({ type: "strike", attrs: { value: true } });
-    }
-    if (styleRunProps.underline) {
-      const underlineType = styleRunProps.underline["w:val"];
-      if (underlineType) {
-        let underlineColor = styleRunProps.underline["w:color"];
-        if (underlineColor && underlineColor.toLowerCase() !== "auto" && !underlineColor.startsWith("#")) {
-          underlineColor = `#${underlineColor}`;
-        }
-        markDefs.push({
-          type: "underline",
-          attrs: { underlineType, underlineColor }
-        });
-      }
-    }
-    return markDefs;
-  };
   const normalizeSelectionIntoRun = (tr, runType) => {
     const selection = tr.selection;
     if (!(selection instanceof TextSelection$1)) return;
@@ -110923,10 +110883,13 @@ ${o}
         let runProperties = decodeRPrFromMarks(node2.marks);
         if ((!node2.marks || node2.marks.length === 0) && editor?.converter) {
           const paragraphNode = getParagraphAtPos(state.doc, pos);
-          const styleRunProps = resolveRunPropertiesFromParagraphStyle(paragraphNode, editor);
+          const { runProperties: styleRunProps, markDefs: styleMarkDefs } = resolveRunPropertiesFromParagraphStyle(
+            paragraphNode,
+            editor
+          );
           if (Object.keys(styleRunProps).length > 0) {
             runProperties = styleRunProps;
-            const markDefs = metaStyleMarks.length ? markDefsFromMeta : createMarkDefsFromStyleRunProps(styleRunProps);
+            const markDefs = metaStyleMarks.length ? markDefsFromMeta : styleMarkDefs;
             const styleMarks = metaStyleMarks.length ? metaStyleMarks : createMarksFromDefs(state.schema, markDefs);
             if (styleMarks.length && typeof state.schema.text === "function") {
               const textNode = state.schema.text(node2.text || "", styleMarks);
@@ -152216,7 +152179,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.8.1-next.2";
+      this.version = "1.8.1-next.3";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;