@harbour-enterprises/superdoc 1.3.0-next.8 → 1.3.0-next.9

package/dist/superdoc.umd.js

@@ -36435,7 +36435,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.0-next.8") {
+    static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "1.3.0-next.9") {
       return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
     }
     /**
@@ -49548,8 +49548,8 @@ Please report this to https://github.com/markedjs/marked.`, e) {
               }
               if (!onlyActiveThreadChanged) {
                 const positionsChanged = hasPositionsChanged(prevAllCommentPositions, allCommentPositions);
-                const hasComments = Object.keys(allCommentPositions).length > 0;
-                const shouldEmitPositions = positionsChanged || !hasEverEmitted && hasComments;
+                const hasComments2 = Object.keys(allCommentPositions).length > 0;
+                const shouldEmitPositions = positionsChanged || !hasEverEmitted && hasComments2;
                 if (shouldEmitPositions) {
                   prevAllCommentPositions = allCommentPositions;
                   hasEverEmitted = true;
@@ -52857,7 +52857,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       }
       const xmlJson = JSON.parse(libExports.xml2json(contentTypesXml, null, 2));
       const types2 = xmlJson.elements?.find((el) => el.name === "Types") || {};
-      const hasComments = types2.elements?.some(
+      const hasComments2 = types2.elements?.some(
         (el) => el.name === "Override" && el.attributes.PartName === "/word/comments.xml"
       );
       const hasCommentsExtended = types2.elements?.some(
@@ -52877,7 +52877,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       };
       if (hasFile("word/comments.xml")) {
         const commentsDef = `<Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml" />`;
-        if (!hasComments) typesString += commentsDef;
+        if (!hasComments2) typesString += commentsDef;
       }
       if (hasFile("word/commentsExtended.xml")) {
         const commentsExtendedDef = `<Override PartName="/word/commentsExtended.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml" />`;
@@ -62145,7 +62145,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
       return false;
     }
   };
-  const summaryVersion = "1.3.0-next.8";
+  const summaryVersion = "1.3.0-next.9";
   const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
   const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
   function mapAttributes(attrs) {
@@ -64779,7 +64779,7 @@ Please report this to https://github.com/markedjs/marked.`, e) {
      * Process collaboration migrations
      */
     processCollaborationMigrations() {
-      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.8");
+      console.debug("[checkVersionMigrations] Current editor version", "1.3.0-next.9");
       if (!this.options.ydoc) return;
       const metaMap = this.options.ydoc.getMap("meta");
       let docVersion = metaMap.get("version");
@@ -75012,7 +75012,9 @@ ${l}
           textRun.pmEnd ?? "",
           textRun.token ?? "",
           // Tracked changes - force re-render when added or removed tracked change
-          textRun.trackedChange ? 1 : 0
+          textRun.trackedChange ? 1 : 0,
+          // Comment annotations - force re-render when comments are enabled/disabled
+          textRun.comments?.length ?? 0
         ].join(",");
       }).join("|");
       const attrs = block.attrs;
@@ -80883,6 +80885,9 @@ ${l}
     if (borders.left) parts.push(`l:[${hashBorderSpec(borders.left)}]`);
     return parts.join(";");
   };
+  function hasComments$1(run2) {
+    return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
+  }
   const MAX_CACHE_SIZE$1 = 1e4;
   const BYTES_PER_ENTRY_ESTIMATE = 5e3;
   const hashParagraphFrame = (frame) => {
@@ -80950,6 +80955,7 @@ ${l}
                 fontFamily2 ? `ff:${fontFamily2}` : "",
                 highlight ? `hl:${highlight}` : ""
               ].join("");
+              const commentHash = hasComments$1(run2) ? run2.comments.map((c2) => `${c2.commentId ?? ""}:${c2.internal ? "1" : "0"}`).join("|") : "";
               let trackedKey = "";
               if (hasTrackedChange(run2)) {
                 const tc = run2.trackedChange;
@@ -80957,7 +80963,8 @@ ${l}
                 const afterHash = tc.after ? JSON.stringify(tc.after) : "";
                 trackedKey = `|tc:${tc.kind ?? ""}:${tc.id ?? ""}:${tc.author ?? ""}:${tc.date ?? ""}:${beforeHash}:${afterHash}`;
               }
-              cellHashes.push(`${text2}:${marks}${trackedKey}`);
+              const commentKey = commentHash ? `|cm:${commentHash}` : "";
+              cellHashes.push(`${text2}:${marks}${trackedKey}${commentKey}`);
             }
             if (paragraphBlock.attrs) {
               const attrs = paragraphBlock.attrs;
@@ -82089,6 +82096,9 @@ ${l}
     const totalHeight = lines.reduce((s2, l) => s2 + l.lineHeight, 0);
     return { kind: "paragraph", lines, totalHeight };
   }
+  function hasComments(run2) {
+    return "comments" in run2 && Array.isArray(run2.comments) && run2.comments.length > 0;
+  }
   const computeDirtyRegions = (previous2, next2) => {
     const prevMap = new Map(previous2.map((block, index2) => [block.id, { block, index: index2 }]));
     const nextMap = new Map(next2.map((block, index2) => [block.id, { block, index: index2 }]));
@@ -82149,6 +82159,10 @@ ${l}
     }
     return "";
   };
+  const getCommentKey = (run2) => {
+    if (!hasComments(run2)) return "";
+    return run2.comments.map((c2) => `${c2.commentId ?? ""}:${c2.internal ? "1" : "0"}`).join("|");
+  };
   const paragraphSpacingEqual = (a2, b2) => {
     if (a2 === b2) return true;
     if (!a2 || !b2) return !a2 && !b2;
@@ -82230,7 +82244,7 @@ ${l}
     for (let i2 = 0; i2 < a2.runs.length; i2 += 1) {
       const runA = a2.runs[i2];
       const runB = b2.runs[i2];
-      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB)) {
+      if (("src" in runA || runA.kind === "lineBreak" || runA.kind === "break" || runA.kind === "fieldAnnotation" ? "" : runA.text) !== ("src" in runB || runB.kind === "lineBreak" || runB.kind === "break" || runB.kind === "fieldAnnotation" ? "" : runB.text) || ("bold" in runA ? runA.bold : false) !== ("bold" in runB ? runB.bold : false) || ("italic" in runA ? runA.italic : false) !== ("italic" in runB ? runB.italic : false) || ("color" in runA ? runA.color : void 0) !== ("color" in runB ? runB.color : void 0) || ("fontSize" in runA ? runA.fontSize : void 0) !== ("fontSize" in runB ? runB.fontSize : void 0) || ("fontFamily" in runA ? runA.fontFamily : void 0) !== ("fontFamily" in runB ? runB.fontFamily : void 0) || ("highlight" in runA ? runA.highlight : void 0) !== ("highlight" in runB ? runB.highlight : void 0) || getTrackedChangeKey(runA) !== getTrackedChangeKey(runB) || getCommentKey(runA) !== getCommentKey(runB)) {
         return false;
       }
     }
@@ -86972,7 +86986,7 @@ ${l}
     delete run2.link;
     delete run2.letterSpacing;
   };
-  const applyFormatChangeMarks = (run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors) => {
+  const applyFormatChangeMarks = (run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments = true) => {
     const tracked = run2.trackedChange;
     if (!tracked || tracked.kind !== "format") {
       return;
@@ -86994,12 +87008,12 @@ ${l}
     }
     resetRunFormatting(run2);
     try {
-      applyMarksToRun2(run2, beforeMarks, hyperlinkConfig, themeColors);
+      applyMarksToRun2(run2, beforeMarks, hyperlinkConfig, themeColors, void 0, enableComments);
     } catch (error) {
       resetRunFormatting(run2);
     }
   };
-  const applyTrackedChangesModeToRuns = (runs2, config2, hyperlinkConfig, applyMarksToRun2, themeColors) => {
+  const applyTrackedChangesModeToRuns = (runs2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments = true) => {
     if (!config2) {
       return runs2;
     }
@@ -87012,7 +87026,7 @@ ${l}
       } else {
         runs2.forEach((run2) => {
           if (isTextRun$1(run2)) {
-            applyFormatChangeMarks(run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors);
+            applyFormatChangeMarks(run2, config2, hyperlinkConfig, applyMarksToRun2, themeColors, enableComments);
           }
         });
       }
@@ -87042,7 +87056,14 @@ ${l}
     } else {
       filtered.forEach((run2) => {
         if (isTextRun$1(run2)) {
-          applyFormatChangeMarks(run2, config2, hyperlinkConfig || DEFAULT_HYPERLINK_CONFIG$1, applyMarksToRun2, themeColors);
+          applyFormatChangeMarks(
+            run2,
+            config2,
+            hyperlinkConfig || DEFAULT_HYPERLINK_CONFIG$1,
+            applyMarksToRun2,
+            themeColors,
+            enableComments
+          );
         }
       });
     }
@@ -87953,7 +87974,10 @@ ${l}
   const DEFAULT_HYPERLINK_CONFIG = {
     enableRichHyperlinks: false
   };
-  const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, backgroundColor) => {
+  const applyMarksToRun = (run2, marks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG, themeColors, backgroundColor, enableComments = true) => {
+    if (!enableComments && "comments" in run2 && run2.comments) {
+      delete run2.comments;
+    }
     const isTabRun2 = run2.kind === "tab";
     let markSetColor = false;
     marks.forEach((mark2) => {
@@ -88000,7 +88024,7 @@ ${l}
             break;
           case "commentMark":
           case "comment": {
-            if (!isTabRun2) {
+            if (!isTabRun2 && enableComments) {
               pushCommentAnnotation(run2, mark2.attrs ?? {});
             }
             break;
@@ -91619,7 +91643,7 @@ ${l}
       run2.letterSpacing = twipsToPx$1(runProperties.letterSpacing);
     }
   };
-  function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext) {
+  function paragraphToFlowBlocks$1(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converters, converterContext, enableComments = true) {
     const baseBlockId = nextBlockId("paragraph");
     const paragraphProps = typeof para.attrs?.paragraphProperties === "object" && para.attrs.paragraphProperties !== null ? para.attrs.paragraphProperties : {};
     const paragraphStyleId = typeof para.attrs?.styleId === "string" && para.attrs.styleId.trim() ? para.attrs.styleId : typeof paragraphProps.styleId === "string" && paragraphProps.styleId.trim() ? paragraphProps.styleId : null;
@@ -91793,7 +91817,8 @@ ${l}
           [...node2.marks ?? [], ...inheritedMarks ?? []],
           hyperlinkConfig,
           themeColors,
-          converterContext?.backgroundColor
+          converterContext?.backgroundColor,
+          enableComments
         );
         currentRuns.push(run2);
         return;
@@ -91855,7 +91880,8 @@ ${l}
             positions,
             defaultFont,
             defaultSize,
-            mergedMarks,
+            [],
+            // Empty marks - will be applied after linked styles
             activeSdt,
             hyperlinkConfig,
             themeColors
@@ -91864,6 +91890,14 @@ ${l}
           applyRunStyles2(tokenRun, inlineStyleId, activeRunStyleId);
           applyBaseRunDefaults(tokenRun, baseRunDefaults, defaultFont, defaultSize);
           applyInlineRunProperties(tokenRun, activeRunProperties);
+          applyMarksToRun(
+            tokenRun,
+            mergedMarks,
+            hyperlinkConfig,
+            themeColors,
+            converterContext?.backgroundColor,
+            enableComments
+          );
           if (pageRefPos) {
             tokenRun.pmStart = pageRefPos.start;
             tokenRun.pmEnd = pageRefPos.end;
@@ -91937,7 +91971,8 @@ ${l}
               mergedMarks,
               hyperlinkConfig,
               themeColors,
-              converterContext?.backgroundColor
+              converterContext?.backgroundColor,
+              enableComments
             );
           }
           console.debug("[token-debug] paragraph-token-run", {
@@ -92136,7 +92171,8 @@ ${l}
         trackedChanges,
         hyperlinkConfig,
         applyMarksToRun,
-        themeColors
+        themeColors,
+        enableComments
       );
       if (trackedChanges.enabled && filteredRuns.length === 0) {
         return;
@@ -93035,6 +93071,7 @@ ${l}
     const hyperlinkConfig = {
       enableRichHyperlinks: options?.enableRichHyperlinks ?? false
     };
+    const enableComments = options?.enableComments ?? true;
     const themeColors = options?.themeColors;
     const converterContext = options?.converterContext;
     if (!doc2.content) {
@@ -93084,7 +93121,8 @@ ${l}
       bookmarks2,
       hyperlinkConfig2,
       themeColorsParam ?? themeColors,
-      converterCtx ?? converterContext
+      converterCtx ?? converterContext,
+      enableComments
     );
     const tableConverter = (node2, nextBlockId2, positions2, defaultFont2, defaultSize2, context, trackedChanges, bookmarks2, hyperlinkConfig2, themeColorsParam, converterCtx) => tableNodeToBlock(
       node2,
@@ -93123,6 +93161,7 @@ ${l}
       listCounterContext: { getListCounter, incrementListCounter, resetListCounter },
       trackedChangesConfig,
       hyperlinkConfig,
+      enableComments,
       bookmarks,
       sectionState: {
         ranges: sectionRanges,
@@ -93191,7 +93230,7 @@ ${l}
     }
     return result;
   }
-  function paragraphToFlowBlocks(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converterContext) {
+  function paragraphToFlowBlocks(para, nextBlockId, positions, defaultFont, defaultSize, styleContext, listCounterContext, trackedChanges, bookmarks, hyperlinkConfig = DEFAULT_HYPERLINK_CONFIG$1, themeColors, converterContext, enableComments = true) {
     return paragraphToFlowBlocks$1(
       para,
       nextBlockId,
@@ -93238,7 +93277,8 @@ ${l}
           }
         )
       },
-      converterContext
+      converterContext,
+      enableComments
     );
   }
   function tableNodeToBlock(node2, nextBlockId, positions, defaultFont, defaultSize, styleContext, trackedChanges, bookmarks, hyperlinkConfig, themeColors, _paragraphToFlowBlocksParam, converterContext, options) {
@@ -97447,12 +97487,13 @@ ${l}
       if (!validModes.includes(mode)) {
         throw new TypeError(`[PresentationEditor] Invalid mode "${mode}". Must be one of: ${validModes.join(", ")}`);
       }
+      const modeChanged = this.#documentMode !== mode;
       this.#documentMode = mode;
       this.#editor.setDocumentMode(mode);
       this.#syncDocumentModeClass();
       this.#syncHiddenEditorA11yAttributes();
       const trackedChangesChanged = this.#syncTrackedChangesPreferences();
-      if (trackedChangesChanged) {
+      if (modeChanged || trackedChangesChanged) {
         this.#pendingDocChange = true;
         this.#scheduleRerender();
       }
@@ -99828,12 +99869,14 @@ ${l}
           } : void 0;
           const atomNodeTypes = getAtomNodeTypes(this.#editor?.schema ?? null);
           const positionMap2 = this.#editor?.state?.doc && docJson ? buildPositionMapFromPmDoc(this.#editor.state.doc, docJson) : null;
+          const commentsEnabled = this.#documentMode !== "viewing";
           const result = toFlowBlocks(docJson, {
             mediaFiles: this.#editor?.storage?.image?.media,
             emitSectionBreaks: true,
             sectionMetadata,
             trackedChangesMode: this.#trackedChangesMode,
             enableTrackedChanges: this.#trackedChangesEnabled,
+            enableComments: commentsEnabled,
             enableRichHyperlinks: true,
             themeColors: this.#editor?.converter?.themeColors ?? void 0,
             converterContext,
@@ -99964,10 +100007,12 @@ ${l}
         const payload = { layout, blocks: blocks2, measures, metrics };
         this.emit("layoutUpdated", payload);
         this.emit("paginationUpdate", payload);
-        const commentPositions = this.#collectCommentPositions();
-        const positionKeys = Object.keys(commentPositions);
-        if (positionKeys.length > 0) {
-          this.emit("commentPositions", { positions: commentPositions });
+        if (this.#documentMode !== "viewing") {
+          const commentPositions = this.#collectCommentPositions();
+          const positionKeys = Object.keys(commentPositions);
+          if (positionKeys.length > 0) {
+            this.emit("commentPositions", { positions: commentPositions });
+          }
         }
         if (this.#telemetryEmitter && metrics) {
           this.#telemetryEmitter({ type: "layout", data: { layout, blocks: blocks2, measures, metrics } });
@@ -141257,6 +141302,9 @@ ${reason}`);
     const handleEditorLocationsUpdate = (allCommentPositions) => {
       editorCommentPositions.value = allCommentPositions || {};
     };
+    const clearEditorCommentPositions = () => {
+      editorCommentPositions.value = {};
+    };
     const getFloatingComments = computed(() => {
       const comments = getGroupedComments.value?.parentComments.filter((c2) => !c2.resolvedTime).filter((c2) => {
         const keys2 = Object.keys(editorCommentPositions.value);
@@ -141359,6 +141407,7 @@ ${reason}`);
       processLoadedDocxComments,
       translateCommentsForExport,
       handleEditorLocationsUpdate,
+      clearEditorCommentPositions,
       handleTrackedChangeUpdate
     };
   });
@@ -144129,7 +144178,7 @@ ${reason}`);
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "1.3.0-next.8";
+      this.version = "1.3.0-next.9";
       this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config2.superdocId || v4();
       this.colors = this.config.colors;
@@ -144646,7 +144695,8 @@ ${reason}`);
     }
     #setModeViewing() {
       this.toolbar.activeEditor = null;
-      this.setTrackedChangesPreferences({ mode: "original", enabled: false });
+      this.setTrackedChangesPreferences({ mode: "original", enabled: true });
+      this.commentsStore?.clearEditorCommentPositions?.();
       this.superdocStore.documents.forEach((doc2) => {
         doc2.removeComments();
         this.#applyDocumentMode(doc2, "viewing");