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

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.1") {
+    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.1";
+  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.1");
+      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");
@@ -71894,6 +71901,7 @@ ${l}
       this.layoutVersion = 0;
       this.layoutEpoch = 0;
       this.processedLayoutVersion = -1;
+      this.currentMapping = null;
       this.onScrollHandler = null;
       this.onWindowScrollHandler = null;
       this.onResizeHandler = null;
@@ -71999,7 +72007,7 @@ ${l}
       this.blockLookup = nextLookup;
       this.changedBlocks = changed;
     }
-    paint(layout, mount2) {
+    paint(layout, mount2, mapping) {
       if (!(mount2 instanceof HTMLElement)) {
         throw new Error("DomPainter.paint requires a valid HTMLElement mount");
       }
@@ -72008,6 +72016,13 @@ ${l}
         throw new Error("DomPainter.paint requires a DOM-like document");
       }
       this.doc = doc2;
+      const isSimpleTransaction = mapping && mapping.maps.length === 1;
+      if (mapping && !isSimpleTransaction) {
+        this.blockLookup.forEach((_2, id) => this.changedBlocks.add(id));
+        this.currentMapping = null;
+      } else {
+        this.currentMapping = mapping ?? null;
+      }
       ensurePrintStyles(doc2);
       ensureLinkStyles(doc2);
       ensureTrackChangeStyles(doc2);
@@ -72034,6 +72049,7 @@ ${l}
         this.currentLayout = layout;
         this.pageStates = [];
         this.changedBlocks.clear();
+        this.currentMapping = null;
         return;
       }
       if (mode === "book") {
@@ -72042,6 +72058,7 @@ ${l}
         this.currentLayout = layout;
         this.pageStates = [];
         this.changedBlocks.clear();
+        this.currentMapping = null;
         return;
       }
       applyStyles$2(mount2, containerStyles);
@@ -72050,6 +72067,7 @@ ${l}
         this.renderVirtualized(layout, mount2);
         this.currentLayout = layout;
         this.changedBlocks.clear();
+        this.currentMapping = null;
         return;
       }
       mount2.style.gap = `${this.pageGap}px`;
@@ -72060,6 +72078,7 @@ ${l}
       }
       this.currentLayout = layout;
       this.changedBlocks.clear();
+      this.currentMapping = null;
     }
     // ----------------
     // Virtualized path
@@ -72591,6 +72610,8 @@ ${l}
             pageEl.replaceChild(replacement, current.element);
             current.element = replacement;
             current.signature = fragmentSignature(fragment, this.blockLookup);
+          } else if (this.currentMapping) {
+            this.updatePositionAttributes(current.element, this.currentMapping);
           }
           this.updateFragmentElement(current.element, fragment, contextBase.section);
           current.fragment = fragment;
@@ -72619,6 +72640,45 @@ ${l}
       state.fragments = nextFragments;
       this.renderDecorationsForPage(pageEl, page);
     }
+    /**
+     * Updates data-pm-start/data-pm-end attributes on all elements within a fragment
+     * using the transaction's mapping. Skips header/footer content (separate PM coordinate space).
+     * Also skips fragments that end before the edit point (their positions don't change).
+     */
+    updatePositionAttributes(fragmentEl, mapping) {
+      if (fragmentEl.closest(".superdoc-page-header, .superdoc-page-footer")) {
+        return;
+      }
+      try {
+        const fragEnd = fragmentEl.dataset.pmEnd;
+        if (fragEnd !== void 0 && fragEnd !== "") {
+          const endNum = Number(fragEnd);
+          if (Number.isFinite(endNum) && mapping.map(endNum, -1) === endNum) {
+            return;
+          }
+        }
+        const elements = fragmentEl.querySelectorAll("[data-pm-start], [data-pm-end]");
+        const allElements = [fragmentEl, ...Array.from(elements)];
+        for (const el of allElements) {
+          const oldStart = el.dataset.pmStart;
+          const oldEnd = el.dataset.pmEnd;
+          if (oldStart !== void 0 && oldStart !== "") {
+            const num = Number(oldStart);
+            if (Number.isFinite(num)) {
+              el.dataset.pmStart = String(mapping.map(num));
+            }
+          }
+          if (oldEnd !== void 0 && oldEnd !== "") {
+            const num = Number(oldEnd);
+            if (Number.isFinite(num)) {
+              el.dataset.pmEnd = String(mapping.map(num, -1));
+            }
+          }
+        }
+      } catch (error) {
+        console.error("Error updating position attributes with mapping:", error);
+      }
+    }
     createPageState(page, pageSize) {
       if (!this.doc) {
         throw new Error("DomPainter.createPageState requires a document");
@@ -74996,8 +75056,6 @@ ${l}
         base2,
         fragment.fromLine,
         fragment.toLine,
-        fragment.pmStart ?? "",
-        fragment.pmEnd ?? "",
         fragment.continuesFromPrev ? 1 : 0,
         fragment.continuesOnNext ? 1 : 0,
         fragment.markerWidth ?? ""
@@ -75089,16 +75147,15 @@ ${l}
             imgRun.distTop ?? "",
             imgRun.distBottom ?? "",
             imgRun.distLeft ?? "",
-            imgRun.distRight ?? "",
-            imgRun.pmStart ?? "",
-            imgRun.pmEnd ?? ""
+            imgRun.distRight ?? ""
+            // Note: pmStart/pmEnd intentionally excluded to prevent O(n) change detection
           ].join(",");
         }
         if (run2.kind === "lineBreak") {
-          return ["linebreak", run2.pmStart ?? "", run2.pmEnd ?? ""].join(",");
+          return "linebreak";
         }
         if (run2.kind === "tab") {
-          return [run2.text ?? "", "tab", run2.pmStart ?? "", run2.pmEnd ?? ""].join(",");
+          return [run2.text ?? "", "tab"].join(",");
         }
         const textRun = run2;
         return [
@@ -75114,8 +75171,7 @@ ${l}
           textRun.strike ? 1 : 0,
           textRun.highlight ?? "",
           textRun.letterSpacing != null ? textRun.letterSpacing : "",
-          textRun.pmStart ?? "",
-          textRun.pmEnd ?? "",
+          // Note: pmStart/pmEnd intentionally excluded to prevent O(n) change detection
           textRun.token ?? "",
           // Tracked changes - force re-render when added or removed tracked change
           textRun.trackedChange ? 1 : 0,
@@ -75571,8 +75627,8 @@ ${l}
       ruler: options.ruler
     });
     return {
-      paint(layout, mount2) {
-        painter.paint(layout, mount2);
+      paint(layout, mount2, mapping) {
+        painter.paint(layout, mount2, mapping);
       },
       setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures) {
         painter.setData(blocks2, measures, headerBlocks, headerMeasures, footerBlocks, footerMeasures);
@@ -78439,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;
@@ -79501,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;
@@ -79527,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) ?? [];
@@ -79538,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;
@@ -79557,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) ?? [];
@@ -91907,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;
@@ -92138,6 +92237,7 @@ ${l}
           }
           return;
         }
+        const anchorParagraphId = nextId();
         flushParagraph();
         const mergedMarks = [...node2.marks ?? [], ...inheritedMarks ?? []];
         const trackedMeta = trackedChanges?.enabled ? collectTrackedChangeFromMarks(mergedMarks) : void 0;
@@ -92148,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;
@@ -92156,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;
@@ -92165,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(
@@ -92227,7 +92333,7 @@ ${l}
             ...converterContext !== void 0 ? [converterContext] : []
           );
           if (tableBlock) {
-            blocks2.push(tableBlock);
+            blocks2.push(attachAnchorParagraphId(tableBlock, anchorParagraphId));
           }
         }
         return;
@@ -96981,6 +97087,7 @@ ${l}
     #telemetryEmitter = null;
     #renderScheduled = false;
     #pendingDocChange = false;
+    #pendingMapping = null;
     #isRerendering = false;
     #selectionSync = new SelectionSyncCoordinator();
     #remoteCursorUpdateScheduled = false;
@@ -98585,6 +98692,15 @@ ${l}
         }
         if (trackedChangesChanged || transaction?.docChanged) {
           this.#pendingDocChange = true;
+          if (transaction?.docChanged) {
+            if (this.#pendingMapping !== null) {
+              const combined = this.#pendingMapping.slice();
+              combined.appendMapping(transaction.mapping);
+              this.#pendingMapping = combined;
+            } else {
+              this.#pendingMapping = transaction.mapping;
+            }
+          }
           this.#selectionSync.onLayoutStart();
           this.#scheduleRerender();
         }
@@ -100151,7 +100267,9 @@ ${l}
           footerMeasures.length > 0 ? footerMeasures : void 0
         );
         this.#domIndexObserverManager?.pause();
-        painter.paint(layout, this.#painterHost);
+        const mapping = this.#pendingMapping;
+        this.#pendingMapping = null;
+        painter.paint(layout, this.#painterHost, mapping ?? void 0);
         this.#applyVertAlignToLayout();
         this.#rebuildDomPositionIndex();
         this.#domIndexObserverManager?.resume();
@@ -142380,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);
         }
       };
@@ -142621,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" };
@@ -144557,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.1";
+      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;