@harbour-enterprises/superdoc 1.0.0-beta.85 → 1.0.0-beta.86

package/dist/superdoc.umd.js

@@ -20311,6 +20311,7 @@
       params2,
       inlineParagraphProperties,
       insideTable,
+      false,
       tableStyleId
     );
     const { elements = [], attributes = {}, marks = [] } = parseProperties(node2, params2.docx);
@@ -20999,7 +21000,9 @@
       (v2) => integerToString(v2)
     )
   );
-  const translator$Y = NodeTranslator.from(createSingleAttrPropertyHandler("w:vMerge"));
+  const translator$Y = NodeTranslator.from(
+    createSingleAttrPropertyHandler("w:vMerge", null, "w:val", (val) => !val ? "continue" : val)
+  );
   const translator$X = NodeTranslator.from(createBorderPropertyHandler("w:end"));
   const translator$W = NodeTranslator.from(createMeasurementPropertyHandler("w:end", "marginEnd"));
   const translator$V = NodeTranslator.from(createBorderPropertyHandler("w:insideH"));
@@ -21378,11 +21381,12 @@
       delete tableCellProperties.vAlign;
     }
     const { rowspan } = attrs;
-    if (rowspan && rowspan > 1 && tableCellProperties.vMerge !== "restart") {
+    const hasExistingVMerge = tableCellProperties.vMerge != null;
+    if (rowspan && rowspan > 1) {
       tableCellProperties["vMerge"] = "restart";
     } else if (attrs.continueMerge) {
       tableCellProperties["vMerge"] = "continue";
-    } else if (tableCellProperties?.vMerge) {
+    } else if (!hasExistingVMerge) {
       delete tableCellProperties.vMerge;
     }
     const { borders = {} } = attrs;
@@ -33472,12 +33476,14 @@
     if (cached) {
       return cached;
     }
-    const inTable = Boolean(findParentNodeClosestToPos($pos, (node22) => node22.type.name === "table"));
+    const tableNode = findParentNodeClosestToPos($pos, (node22) => node22.type.name === "table");
+    const tableStyleId = tableNode?.node.attrs.tableStyleId || null;
     const paragraphProperties = resolveParagraphProperties(
       { docx: editor.converter.convertedXml, numbering: editor.converter.numbering },
       node2.attrs.paragraphProperties || {},
-      inTable,
-      false
+      Boolean(tableNode),
+      false,
+      tableStyleId
     );
     resolvedParagraphPropertiesCache.set(node2, paragraphProperties);
     return paragraphProperties;
@@ -38343,7 +38349,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
     const tblPr = styleTag.elements.find((el) => el.name === "w:tblPr");
     if (tblPr && tblPr.elements) {
       if (baseTblPr && baseTblPr.elements) {
-        tblPr.elements.push(...baseTblPr.elements);
+        tblPr.elements = [...baseTblPr.elements, ...tblPr.elements];
       }
       const tableProperties = translator$c.encode({ ...params2, nodes: [tblPr] });
       if (tableProperties) {
@@ -42392,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.85") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.0.0-beta.86") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -67438,7 +67444,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const shouldSkipNodeView = (editor) => {
     return isHeadless(editor);
   };
-  const summaryVersion = "1.0.0-beta.85";
+  const summaryVersion = "1.0.0-beta.86";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -68227,7 +68233,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         { default: remarkStringify2 },
         { default: remarkGfm2 }
       ] = await Promise.all([
-        Promise.resolve().then(() => indexD8ciXlCs),
+        Promise.resolve().then(() => indexDeSyD44U),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -68432,7 +68438,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.85");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.86");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -151301,7 +151307,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.0.0-beta.85";
+      this.version = "1.0.0-beta.86";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -153773,7 +153779,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexD8ciXlCs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexDeSyD44U = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));