superdoc 1.0.0-beta.85 → 1.0.0-beta.87

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.87") {
       return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -64415,6 +64421,23 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         };
       }
     });
+    const nodeAtEndPosition = doc2.nodeAt(endPos);
+    if (nodeAtEndPosition?.type?.name === "run") {
+      const node2 = nodeAtEndPosition.content?.content?.[0];
+      const isTextNode = node2?.type?.name === "text";
+      if (isTextNode) {
+        const mark2 = node2.marks.find(
+          (mark22) => mark22.type.name === markName && Object.keys(attrs).every((attr) => mark22.attrs[attr] === attrs[attr])
+        );
+        if (mark2 && !markFound) {
+          markFound = {
+            from: endPos,
+            to: endPos + node2.nodeSize,
+            mark: mark2
+          };
+        }
+      }
+    }
     return markFound;
   };
   const markInsertion = ({ tr, from: from2, to, user, date }) => {
@@ -67438,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.85";
+  const summaryVersion = "1.0.0-beta.87";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -68227,7 +68250,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(() => indexRv7o9043),
         Promise.resolve().then(() => indexDRCvimau),
         Promise.resolve().then(() => indexC_x_N6Uh),
         Promise.resolve().then(() => indexD_sWOSiG),
@@ -68432,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.85");
+      console.debug("[checkVersionMigrations] Current editor version", "1.0.0-beta.87");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -71508,7 +71531,9 @@ Please report this to https://github.com/markedjs/marked.`, e) {
             let cellsChanged = false;
             const newCells = row2.cells.map((cell2) => {
               let cellChanged = false;
-              const hydratedBlocks = (cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : [])).map((cb) => hydrateBlock(cb));
+              const hydratedBlocks = (cell2.blocks ?? (cell2.paragraph ? [cell2.paragraph] : [])).map(
+                (cb) => hydrateBlock(cb)
+              );
               if (cell2.blocks && hydratedBlocks !== cell2.blocks) {
                 cellChanged = true;
               }
@@ -71543,6 +71568,40 @@ Please report this to https://github.com/markedjs/marked.`, e) {
           }
           return blk;
         }
+        if (blk.kind === "drawing") {
+          const drawingBlock = blk;
+          if (drawingBlock.drawingKind !== "shapeGroup") {
+            return blk;
+          }
+          const shapeGroupBlock = drawingBlock;
+          if (!shapeGroupBlock.shapes || shapeGroupBlock.shapes.length === 0) {
+            return blk;
+          }
+          let shapesChanged = false;
+          const hydratedShapes = shapeGroupBlock.shapes.map((shape) => {
+            if (shape.shapeType !== "image") {
+              return shape;
+            }
+            const imageChild = shape;
+            const src = imageChild.attrs?.src;
+            if (!src || src.startsWith("data:")) {
+              return shape;
+            }
+            const resolvedSrc = resolveImageSrc(src);
+            if (resolvedSrc) {
+              shapesChanged = true;
+              return {
+                ...imageChild,
+                attrs: { ...imageChild.attrs, src: resolvedSrc }
+              };
+            }
+            return shape;
+          });
+          if (shapesChanged) {
+            return { ...shapeGroupBlock, shapes: hydratedShapes };
+          }
+          return blk;
+        }
         return blk;
       };
       return hydrateBlock(block);
@@ -81106,6 +81165,7 @@ ${l}
       cell: cell2,
       borders,
       renderLine,
+      renderDrawingContent,
       context,
       applySdtDataset,
       fromLine,
@@ -81248,6 +81308,11 @@ ${l}
             img2.style.height = "100%";
             img2.style.objectFit = block.objectFit ?? "contain";
             drawingInner.appendChild(img2);
+          } else if (renderDrawingContent) {
+            const drawingContent = renderDrawingContent(block);
+            drawingContent.style.width = "100%";
+            drawingContent.style.height = "100%";
+            drawingInner.appendChild(drawingContent);
           } else {
             const placeholder = doc2.createElement("div");
             placeholder.style.width = "100%";
@@ -81373,6 +81438,7 @@ ${l}
       allRowHeights,
       context,
       renderLine,
+      renderDrawingContent,
       applySdtDataset,
       continuesFromPrev,
       continuesOnNext,
@@ -81469,6 +81535,7 @@ ${l}
         cell: cell2,
         borders: resolvedBorders,
         renderLine,
+        renderDrawingContent,
         context,
         applySdtDataset,
         fromLine,
@@ -81522,7 +81589,17 @@ ${l}
     container.appendChild(labelEl);
   }
   const renderTableFragment = (deps) => {
-    const { doc: doc2, fragment, blockLookup, context, renderLine, applyFragmentFrame, applySdtDataset, applyStyles: applyStyles2 } = deps;
+    const {
+      doc: doc2,
+      fragment,
+      blockLookup,
+      context,
+      renderLine,
+      renderDrawingContent,
+      applyFragmentFrame,
+      applySdtDataset,
+      applyStyles: applyStyles2
+    } = deps;
     if (!doc2) {
       console.error("DomPainter: document is not available");
       if (typeof document !== "undefined") {
@@ -81652,6 +81729,7 @@ ${l}
           allRowHeights,
           context,
           renderLine,
+          renderDrawingContent,
           applySdtDataset,
           // Headers are always rendered as-is (no border suppression)
           continuesFromPrev: false,
@@ -81681,6 +81759,7 @@ ${l}
         allRowHeights,
         context,
         renderLine,
+        renderDrawingContent,
         applySdtDataset,
         // Draw top border if table continues from previous fragment (MS Word behavior)
         continuesFromPrev: isFirstRenderedBodyRow && fragment.continuesFromPrev === true,
@@ -83923,12 +84002,25 @@ ${l}
       const renderLineForTableCell = (block, line, ctx2) => {
         return this.renderLine(block, line, ctx2, void 0, void 0, true);
       };
+      const renderDrawingContentForTableCell = (block) => {
+        if (block.drawingKind === "image") {
+          return this.createDrawingImageElement(block);
+        }
+        if (block.drawingKind === "shapeGroup") {
+          return this.createShapeGroupElement(block);
+        }
+        if (block.drawingKind === "vectorShape") {
+          return this.createVectorShapeElement(block, block.geometry, false);
+        }
+        return this.createDrawingPlaceholder();
+      };
       return renderTableFragment({
         doc: this.doc,
         fragment,
         context,
         blockLookup: this.blockLookup,
         renderLine: renderLineForTableCell,
+        renderDrawingContent: renderDrawingContentForTableCell,
         applyFragmentFrame: applyFragmentFrameWithSection,
         applySdtDataset: this.applySdtDataset.bind(this),
         applyStyles: applyStyles$2
@@ -151301,7 +151393,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.87";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -153773,7 +153865,7 @@ ${style2}
       value && typeof value === "object" && "byteLength" in value && "byteOffset" in value
     );
   }
-  const indexD8ciXlCs = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  const indexRv7o9043 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
     unified
   }, Symbol.toStringTag, { value: "Module" }));