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

package/dist/style.css

@@ -2299,32 +2299,32 @@ span[data-v-53e13009] {
   display: inline-block;
 }
 
-.change-type[data-v-dc2a79b5] {
+.change-type[data-v-d50fd675] {
   font-style: italic;
   font-weight: 600;
   font-size: 10px;
   color: #555;
 }
-.tracked-change[data-v-dc2a79b5] {
+.tracked-change[data-v-d50fd675] {
   font-size: 12px;
 }
-.tracked-change-text[data-v-dc2a79b5] {
+.tracked-change-text[data-v-d50fd675] {
   color: #111;
 }
-.comment-separator[data-v-dc2a79b5] {
+.comment-separator[data-v-d50fd675] {
   background-color: #dbdbdb;
   height: 1px;
   width: 100%;
   margin: 10px 0;
   font-weight: 400;
 }
-.existing-internal-input[data-v-dc2a79b5] {
+.existing-internal-input[data-v-d50fd675] {
   margin-bottom: 10px;
 }
-.initial-internal-dropdown[data-v-dc2a79b5] {
+.initial-internal-dropdown[data-v-d50fd675] {
   margin-top: 10px;
 }
-.comments-dialog[data-v-dc2a79b5] {
+.comments-dialog[data-v-d50fd675] {
   display: flex;
   flex-direction: column;
   padding: 10px 15px;
@@ -2340,39 +2340,39 @@ span[data-v-53e13009] {
   min-width: 200px;
   width: 100%;
 }
-.is-active[data-v-dc2a79b5] {
+.is-active[data-v-d50fd675] {
   z-index: 10;
 }
-.input-section[data-v-dc2a79b5] {
+.input-section[data-v-d50fd675] {
   margin-top: 10px;
 }
-.sd-button[data-v-dc2a79b5] {
+.sd-button[data-v-d50fd675] {
   font-size: 12px;
   margin-left: 5px;
 }
-.comment[data-v-dc2a79b5] {
+.comment[data-v-d50fd675] {
   font-size: 13px;
   margin: 10px 0;
 }
-.is-resolved[data-v-dc2a79b5] {
+.is-resolved[data-v-d50fd675] {
   background-color: #f0f0f0;
 }
-.comment-footer[data-v-dc2a79b5] {
+.comment-footer[data-v-d50fd675] {
   margin: 5px 0 5px;
   display: flex;
   justify-content: flex-end;
   width: 100%;
 }
-.internal-dropdown[data-v-dc2a79b5] {
+.internal-dropdown[data-v-d50fd675] {
   display: inline-block;
 }
-.comment-editing[data-v-dc2a79b5] {
+.comment-editing[data-v-d50fd675] {
   padding-bottom: 10px;
 }
-.comment-editing button[data-v-dc2a79b5] {
+.comment-editing button[data-v-d50fd675] {
   margin-left: 5px;
 }
-.tracked-change[data-v-dc2a79b5] {
+.tracked-change[data-v-d50fd675] {
   margin: 0;
 }
 

package/dist/super-editor/converter.cjs

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 require("../chunks/jszip-C8_CqJxM.cjs");
 require("../chunks/helpers-nOdwpmwb.cjs");
-const superEditor_converter = require("../chunks/SuperConverter-Cu6cvHlN.cjs");
+const superEditor_converter = require("../chunks/SuperConverter-p1tQGIew.cjs");
 require("../chunks/uuid-R7L08bOx.cjs");
 exports.SuperConverter = superEditor_converter.SuperConverter;

package/dist/super-editor/converter.es.js

@@ -1,6 +1,6 @@
 import "../chunks/jszip-B1fkPkPJ.es.js";
 import "../chunks/helpers-C8e9wR5l.es.js";
-import { S } from "../chunks/SuperConverter-BE5tNyQz.es.js";
+import { S } from "../chunks/SuperConverter-BQ6PNaJ8.es.js";
 import "../chunks/uuid-CjlX8hrF.es.js";
 export {
   S as SuperConverter

package/dist/super-editor.cjs

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./chunks/index-BjQU1XSp.cjs");
+const index = require("./chunks/index-DLX_v-vr.cjs");
 const superEditor_docxZipper = require("./super-editor/docx-zipper.cjs");
 const superEditor_fileZipper = require("./super-editor/file-zipper.cjs");
 const vue = require("./chunks/vue-De9wkgLl.cjs");
-const superEditor_converter = require("./chunks/SuperConverter-Cu6cvHlN.cjs");
+const superEditor_converter = require("./chunks/SuperConverter-p1tQGIew.cjs");
 function isNodeType(node, name) {
   return node.type.name === name;
 }

package/dist/super-editor.es.js

@@ -1,9 +1,9 @@
-import { ax as Node, ay as Mark } from "./chunks/index-SYGYHKb5.es.js";
-import { ao, au, a9, ab, aw, am, av, aA, an, ak, aq, az, aa, as, aC, aE, aB, ac, aD, ar, at } from "./chunks/index-SYGYHKb5.es.js";
+import { ax as Node, ay as Mark } from "./chunks/index-CJec1cbb.es.js";
+import { ao, au, a9, ab, aw, am, av, aA, an, ak, aq, az, aa, as, aC, aE, aB, ac, aD, ar, at } from "./chunks/index-CJec1cbb.es.js";
 import { default as default2 } from "./super-editor/docx-zipper.es.js";
 import { createZip } from "./super-editor/file-zipper.es.js";
 import { d as defineComponent, E as createElementBlock, G as openBlock, K as createBaseVNode } from "./chunks/vue-BnBKJwCW.es.js";
-import { S, r } from "./chunks/SuperConverter-BE5tNyQz.es.js";
+import { S, r } from "./chunks/SuperConverter-BQ6PNaJ8.es.js";
 function isNodeType(node, name) {
   return node.type.name === name;
 }

package/dist/superdoc.cjs

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./chunks/index-BjQU1XSp.cjs");
-const superdoc = require("./chunks/index-DWfzQ0RN.cjs");
-const superEditor_converter = require("./chunks/SuperConverter-Cu6cvHlN.cjs");
+const index = require("./chunks/index-DLX_v-vr.cjs");
+const superdoc = require("./chunks/index-BQYtE-5U.cjs");
+const superEditor_converter = require("./chunks/SuperConverter-p1tQGIew.cjs");
 const blankDocx = require("./chunks/blank-docx-DfW3Eeh2.cjs");
 require("./chunks/jszip-C8_CqJxM.cjs");
 require("./chunks/helpers-nOdwpmwb.cjs");

package/dist/superdoc.es.js

@@ -1,6 +1,6 @@
-import { au, ab, aw, av, as, a7, ac, ar, at } from "./chunks/index-SYGYHKb5.es.js";
-import { D, H, P, S, c } from "./chunks/index-Dp7mSzy1.es.js";
-import { S as S2, r } from "./chunks/SuperConverter-BE5tNyQz.es.js";
+import { au, ab, aw, av, as, a7, ac, ar, at } from "./chunks/index-CJec1cbb.es.js";
+import { D, H, P, S, c } from "./chunks/index-DXSUcHli.es.js";
+import { S as S2, r } from "./chunks/SuperConverter-BQ6PNaJ8.es.js";
 import { B } from "./chunks/blank-docx-ABm6XYAA.es.js";
 import "./chunks/jszip-B1fkPkPJ.es.js";
 import "./chunks/helpers-C8e9wR5l.es.js";

package/dist/superdoc.umd.js

@@ -35842,9 +35842,10 @@ Please report this to https://github.com/markedjs/marked.`, e) {
   const updateCommentsExtendedXml = (comments = [], commentsExtendedXml) => {
     const xmlCopy = carbonCopy(commentsExtendedXml);
     const commentsEx = comments.map((comment2) => {
+      const isResolved = comment2.resolvedTime || comment2.isDone;
       const attributes = {
         "w15:paraId": comment2.commentParaId,
-        "w15:done": comment2.resolvedTime ? "1" : "0"
+        "w15:done": isResolved ? "1" : "0"
       };
       const parentId = comment2.parentCommentId;
       if (parentId) {
@@ -36435,7 +36436,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.3.1-next.2") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.1-next.3") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -49888,6 +49889,12 @@ Please report this to https://github.com/markedjs/marked.`, e) {
         if (from2 === null || pos < from2) from2 = pos;
         if (to === null || pos + node2.nodeSize > to) to = pos + node2.nodeSize;
       }
+      if (node2.type.name === "commentRangeStart" && node2.attrs["w:id"] === id) {
+        from2 = pos;
+      }
+      if (node2.type.name === "commentRangeEnd" && node2.attrs["w:id"] === id) {
+        to = pos;
+      }
     });
     return from2 !== null && to !== null ? { from: from2, to } : null;
   }
@@ -62245,7 +62252,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.1-next.2";
+  const summaryVersion = "1.3.1-next.3";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64878,7 +64885,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.3.1-next.2");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.1-next.3");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -78488,8 +78495,15 @@ ${l}
         } else if (vRelativeFrom === "paragraph") {
           const baseAnchorY = state.cursorY;
           const firstLineHeight = measure.lines?.[0]?.lineHeight ?? 0;
-          const paragraphAdjustment = firstLineHeight / 2;
-          anchorY = baseAnchorY + paragraphAdjustment + offsetV;
+          if (alignV === "top") {
+            anchorY = baseAnchorY + offsetV;
+          } else if (alignV === "bottom") {
+            anchorY = baseAnchorY + firstLineHeight - imageHeight + offsetV;
+          } else if (alignV === "center") {
+            anchorY = baseAnchorY + (firstLineHeight - imageHeight) / 2 + offsetV;
+          } else {
+            anchorY = baseAnchorY + offsetV;
+          }
         } else {
           const baseAnchorY = state.cursorY;
           anchorY = baseAnchorY + offsetV;
@@ -79550,6 +79564,13 @@ ${l}
   function collectAnchoredDrawings(blocks2, measures) {
     const map2 = /* @__PURE__ */ new Map();
     const len = Math.min(blocks2.length, measures.length);
+    const paragraphIndexById = /* @__PURE__ */ new Map();
+    for (let i2 = 0; i2 < len; i2 += 1) {
+      const block = blocks2[i2];
+      if (block.kind === "paragraph") {
+        paragraphIndexById.set(block.id, i2);
+      }
+    }
     const nearestPrevParagraph = (fromIndex) => {
       for (let i2 = fromIndex - 1; i2 >= 0; i2 -= 1) {
         if (blocks2[i2].kind === "paragraph") return i2;
@@ -79576,7 +79597,11 @@ ${l}
       if (isPageRelativeAnchor(drawingBlock)) {
         continue;
       }
-      let anchorParaIndex = nearestPrevParagraph(i2);
+      const anchorParagraphId = typeof drawingBlock.attrs === "object" && drawingBlock.attrs ? drawingBlock.attrs.anchorParagraphId : void 0;
+      let anchorParaIndex = typeof anchorParagraphId === "string" ? paragraphIndexById.get(anchorParagraphId) ?? null : null;
+      if (anchorParaIndex == null) {
+        anchorParaIndex = nearestPrevParagraph(i2);
+      }
       if (anchorParaIndex == null) anchorParaIndex = nearestNextParagraph(i2);
       if (anchorParaIndex == null) continue;
       const list2 = map2.get(anchorParaIndex) ?? [];
@@ -79587,6 +79612,13 @@ ${l}
   }
   function collectAnchoredTables(blocks2, measures) {
     const map2 = /* @__PURE__ */ new Map();
+    const paragraphIndexById = /* @__PURE__ */ new Map();
+    for (let i2 = 0; i2 < blocks2.length; i2 += 1) {
+      const block = blocks2[i2];
+      if (block.kind === "paragraph") {
+        paragraphIndexById.set(block.id, i2);
+      }
+    }
     const nearestPrevParagraph = (fromIndex) => {
       for (let i2 = fromIndex - 1; i2 >= 0; i2 -= 1) {
         if (blocks2[i2].kind === "paragraph") return i2;
@@ -79606,7 +79638,11 @@ ${l}
       const tableBlock = block;
       const tableMeasure = measure;
       if (!tableBlock.anchor?.isAnchored) continue;
-      let anchorParaIndex = nearestPrevParagraph(i2);
+      const anchorParagraphId = typeof tableBlock.attrs === "object" && tableBlock.attrs ? tableBlock.attrs.anchorParagraphId : void 0;
+      let anchorParaIndex = typeof anchorParagraphId === "string" ? paragraphIndexById.get(anchorParagraphId) ?? null : null;
+      if (anchorParaIndex == null) {
+        anchorParaIndex = nearestPrevParagraph(i2);
+      }
       if (anchorParaIndex == null) anchorParaIndex = nearestNextParagraph(i2);
       if (anchorParaIndex == null) continue;
       const list2 = map2.get(anchorParaIndex) ?? [];
@@ -91956,6 +91992,20 @@ ${l}
     let partIndex = 0;
     let tabOrdinal = 0;
     const nextId = () => partIndex === 0 ? baseBlockId : `${baseBlockId}-${partIndex}`;
+    const attachAnchorParagraphId = (block, anchorParagraphId) => {
+      const applicableKinds = /* @__PURE__ */ new Set(["drawing", "image", "table"]);
+      if (!applicableKinds.has(block.kind)) {
+        return block;
+      }
+      const blockWithAttrs = block;
+      return {
+        ...blockWithAttrs,
+        attrs: {
+          ...blockWithAttrs.attrs ?? {},
+          anchorParagraphId
+        }
+      };
+    };
     const flushParagraph = () => {
       if (currentRuns.length === 0) {
         return;
@@ -92187,6 +92237,7 @@ ${l}
           }
           return;
         }
+        const anchorParagraphId = nextId();
         flushParagraph();
         const mergedMarks = [...node2.marks ?? [], ...inheritedMarks ?? []];
         const trackedMeta = trackedChanges?.enabled ? collectTrackedChangeFromMarks(mergedMarks) : void 0;
@@ -92197,7 +92248,7 @@ ${l}
           const imageBlock = converters.imageNodeToBlock(node2, nextBlockId, positions, trackedMeta, trackedChanges);
           if (imageBlock && imageBlock.kind === "image") {
             annotateBlockWithTrackedChange(imageBlock, trackedMeta, trackedChanges);
-            blocks2.push(imageBlock);
+            blocks2.push(attachAnchorParagraphId(imageBlock, anchorParagraphId));
           }
         }
         return;
@@ -92205,6 +92256,7 @@ ${l}
       if (node2.type === "contentBlock") {
         const attrs = node2.attrs ?? {};
         if (attrs.horizontalRule === true) {
+          const anchorParagraphId = nextId();
           flushParagraph();
           const indent2 = paragraphAttrs?.indent;
           const hrIndentLeft = typeof indent2?.left === "number" ? indent2.left : void 0;
@@ -92214,52 +92266,57 @@ ${l}
           const convert2 = converters?.contentBlockNodeToDrawingBlock ?? contentBlockNodeToDrawingBlock;
           const drawingBlock = convert2(hrNode, nextBlockId, positions);
           if (drawingBlock) {
-            blocks2.push(drawingBlock);
+            blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
           }
         }
         return;
       }
       if (node2.type === "vectorShape") {
+        const anchorParagraphId = nextId();
         flushParagraph();
         if (converters?.vectorShapeNodeToDrawingBlock) {
           const drawingBlock = converters.vectorShapeNodeToDrawingBlock(node2, nextBlockId, positions);
           if (drawingBlock) {
-            blocks2.push(drawingBlock);
+            blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
           }
         }
         return;
       }
       if (node2.type === "shapeGroup") {
+        const anchorParagraphId = nextId();
         flushParagraph();
         if (converters?.shapeGroupNodeToDrawingBlock) {
           const drawingBlock = converters.shapeGroupNodeToDrawingBlock(node2, nextBlockId, positions);
           if (drawingBlock) {
-            blocks2.push(drawingBlock);
+            blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
           }
         }
         return;
       }
       if (node2.type === "shapeContainer") {
+        const anchorParagraphId = nextId();
         flushParagraph();
         if (converters?.shapeContainerNodeToDrawingBlock) {
           const drawingBlock = converters.shapeContainerNodeToDrawingBlock(node2, nextBlockId, positions);
           if (drawingBlock) {
-            blocks2.push(drawingBlock);
+            blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
           }
         }
         return;
       }
       if (node2.type === "shapeTextbox") {
+        const anchorParagraphId = nextId();
         flushParagraph();
         if (converters?.shapeTextboxNodeToDrawingBlock) {
           const drawingBlock = converters.shapeTextboxNodeToDrawingBlock(node2, nextBlockId, positions);
           if (drawingBlock) {
-            blocks2.push(drawingBlock);
+            blocks2.push(attachAnchorParagraphId(drawingBlock, anchorParagraphId));
           }
         }
         return;
       }
       if (node2.type === "table") {
+        const anchorParagraphId = nextId();
         flushParagraph();
         if (converters?.tableNodeToBlock) {
           const tableBlock = converters.tableNodeToBlock(
@@ -92276,7 +92333,7 @@ ${l}
             ...converterContext !== void 0 ? [converterContext] : []
           );
           if (tableBlock) {
-            blocks2.push(tableBlock);
+            blocks2.push(attachAnchorParagraphId(tableBlock, anchorParagraphId));
           }
         }
         return;
@@ -142441,12 +142498,13 @@ ${reason}`);
         return currentCommentText.value && currentCommentText.value !== "<p></p>";
       });
       const setFocus = () => {
-        if (props.comment.resolvedTime) return;
         const editor = proxy.$superdoc.activeEditor;
-        activeComment.value = props.comment.commentId;
-        props.comment.setActive(proxy.$superdoc);
+        if (!props.comment.resolvedTime) {
+          activeComment.value = props.comment.commentId;
+          props.comment.setActive(proxy.$superdoc);
+        }
         if (editor) {
-          const cursorId = props.comment.importedId || props.comment.commentId;
+          const cursorId = props.comment.resolvedTime ? props.comment.commentId : props.comment.importedId || props.comment.commentId;
           editor.commands?.setCursorById(cursorId);
         }
       };
@@ -142682,7 +142740,7 @@ ${reason}`);
       };
     }
   };
-  const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-dc2a79b5"]]);
+  const CommentDialog = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-d50fd675"]]);
   const _hoisted_1$b = { class: "comments-list" };
   const _hoisted_2$5 = { key: 0 };
   const _hoisted_3$3 = { class: "comment-item" };
@@ -144618,7 +144676,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.1-next.2";
+      this.version = "1.3.1-next.3";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;