@harbour-enterprises/superdoc 0.15.3-next.1 → 0.15.3-next.3

package/dist/superdoc.umd.js

@@ -26992,6 +26992,8 @@
   function parseMarks(property2, unknownMarks = [], docx = null) {
     const marks = [];
     const seen = /* @__PURE__ */ new Set();
+    const lang = property2?.elements?.find((el) => el.name === "w:lang");
+    const langAttrs = lang?.attributes || {};
     property2?.elements?.forEach((element) => {
       const marksForType = SuperConverter.markTypes.filter((mark) => mark.name === element.name);
       if (!marksForType.length) {
@@ -27021,6 +27023,9 @@
         if (attributes["w:val"] === "0" || attributes["w:val"] === "none") {
           return;
         }
+        if (["w:bCs"].includes(m.name) && langAttrs["w:eastAsia"]) {
+          return;
+        }
         if (m.mark) newMark.type = m.mark;
         if (Object.keys(attributes).length) {
           const value = getMarkValue(m.type, attributes, docx);
@@ -27414,6 +27419,7 @@
     const pPrNormal = stylesNormal?.elements?.find((el) => el.name === "w:pPr");
     const pPrNormalSpacingTag = pPrNormal?.elements?.find((el) => el.name === "w:spacing") || {};
     const pPrNormalIndentTag = pPrNormal?.elements?.find((el) => el.name === "w:ind") || {};
+    const isNormalAsDefault = stylesNormal?.attributes?.["w:default"] === "1";
     let pPrStyleIdSpacingTag = {};
     let pPrStyleIdIndentTag = {};
     let pPrStyleJc = {};
@@ -27441,9 +27447,11 @@
     const { attributes: pPrDefaultIndentAttr } = pPrDefaultIndentTag;
     const { attributes: pPrNormalIndentAttr } = pPrNormalIndentTag;
     const { attributes: pPrByIdIndentAttr } = pPrStyleIdIndentTag;
+    const spacingRest = isNormalAsDefault ? pPrNormalSpacingAttr || pPrDefaultSpacingAttr : pPrDefaultSpacingAttr || pPrNormalSpacingAttr;
+    const indentRest = isNormalAsDefault ? pPrNormalIndentAttr || pPrDefaultIndentAttr : pPrDefaultIndentAttr || pPrNormalIndentAttr;
     return {
-      spacing: pPrByIdSpacingAttr || pPrDefaultSpacingAttr || pPrNormalSpacingAttr,
-      indent: pPrByIdIndentAttr || pPrDefaultIndentAttr || pPrNormalIndentAttr,
+      spacing: pPrByIdSpacingAttr || spacingRest,
+      indent: pPrByIdIndentAttr || indentRest,
       justify: pPrByIdJcAttr,
       textCase
     };
@@ -33230,7 +33238,16 @@
   function generateTableProperties(node2) {
     const elements = [];
     const { attrs } = node2;
-    const { tableWidth, tableWidthType, tableStyleId, borders, tableIndent, tableLayout, tableCellSpacing } = attrs;
+    const {
+      tableWidth,
+      tableWidthType,
+      tableStyleId,
+      borders,
+      tableIndent,
+      tableLayout,
+      tableCellSpacing,
+      justification
+    } = attrs;
     if (tableStyleId) {
       const tableStyleElement = {
         name: "w:tblStyle",
@@ -33273,6 +33290,13 @@
         }
       });
     }
+    if (justification) {
+      const justificationElement = {
+        name: "w:jc",
+        attributes: { "w:val": justification }
+      };
+      elements.push(justificationElement);
+    }
     return {
       name: "w:tblPr",
       elements
@@ -34402,6 +34426,10 @@
       };
       attrs["borderCollapse"] = "separate";
     }
+    const tblJustification = tblPr.elements.find((el) => el.name === "w:jc");
+    if (tblJustification?.attributes) {
+      attrs["justification"] = tblJustification.attributes["w:val"];
+    }
     const rows = node2.elements.filter((el) => el.name === "w:tr");
     const refStylesBorders = referencedStyles?.borders || {};
     const refStylesRowBorders = referencedStyles?.rowBorders || {};
@@ -36116,7 +36144,7 @@
         return;
       }
     }
-    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.3-next.1") {
+    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.15.3-next.3") {
       const customLocation = "docProps/custom.xml";
       if (!docx[customLocation]) {
         docx[customLocation] = generateCustomXml();
@@ -36594,7 +36622,7 @@
   function generateCustomXml() {
     return DEFAULT_CUSTOM_XML;
   }
-  function generateSuperdocVersion(pid = 2, version2 = "0.15.3-next.1") {
+  function generateSuperdocVersion(pid = 2, version2 = "0.15.3-next.3") {
     return {
       type: "element",
       name: "property",
@@ -52777,7 +52805,7 @@
      * @returns {Object | void} Migration results
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "0.15.3-next.1");
+      console.debug("[checkVersionMigrations] Current editor version", "0.15.3-next.3");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -55142,12 +55170,6 @@
             listNumberingType,
             start: numberingDefStart
           } = ListHelpers.getListDefinitionDetails({ numId, level, editor });
-          if (listNumberingType !== node2.attrs.listNumberingType) {
-            listNumberingType = node2.attrs.listNumberingType;
-          }
-          if (lvlText !== node2.attrs.lvlText) {
-            lvlText = node2.attrs.lvlText;
-          }
           const start2 = parseInt(numberingDefStart) || 1;
           if (!listMap.has(numId)) {
             const generatedLevels = {};
@@ -58321,6 +58343,19 @@
             };
           }
         },
+        justification: {
+          default: null,
+          renderDOM: (attrs) => {
+            if (!attrs.justification) return {};
+            if (attrs.justification === "center") {
+              return { style: `margin: 0 auto` };
+            }
+            if (attrs.justification === "right") {
+              return { style: `margin-left: auto` };
+            }
+            return {};
+          }
+        },
         tableStyleId: {
           rendered: false
         },
@@ -99207,7 +99242,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.15.3-next.1";
+      this.version = "0.15.3-next.3";
       console.debug("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config.superdocId || v4();
       this.colors = this.config.colors;