@harbour-enterprises/superdoc 1.4.0 → 1.4.1-next.1

package/dist/chunks/{index-BKXWekME.cjs → index-Bpm2bUws.cjs}

@@ -1,7 +1,7 @@
 "use strict";
 const jszip = require("./jszip-C8_CqJxM.cjs");
 const helpers$1 = require("./helpers-nOdwpmwb.cjs");
-const superEditor_converter = require("./SuperConverter-C4XfNZf6.cjs");
+const superEditor_converter = require("./SuperConverter-nKpvrgP6.cjs");
 const vue = require("./vue-De9wkgLl.cjs");
 require("./jszip.min-BPh2MMAa.cjs");
 const eventemitter3 = require("./eventemitter3-BQuRcMPI.cjs");
@@ -12638,11 +12638,15 @@ const resolveCommentMeta = ({ converter, importedId }) => {
   const matchingImportedComment = comments.find((c2) => c2.importedId == importedId);
   const resolvedCommentId = matchingImportedComment?.commentId ?? (importedId ? String(importedId) : uuid.v4());
   const internal = matchingImportedComment?.internal ?? matchingImportedComment?.isInternal ?? false;
+  const parentCommentId = matchingImportedComment?.parentCommentId;
+  const trackedChangeIds = converter?.trackedChangeIdMap ? new Set(Array.from(converter.trackedChangeIdMap.values()).map((id) => String(id))) : null;
+  const isTrackedChangeParent = parentCommentId && trackedChangeIds ? trackedChangeIds.has(String(parentCommentId)) : false;
   return {
     resolvedCommentId,
     importedId,
     internal,
-    matchingImportedComment
+    matchingImportedComment,
+    trackedChange: matchingImportedComment?.trackedChange === true || isTrackedChangeParent
   };
 };
 const ensureFallbackComment = ({ converter, matchingImportedComment, commentId, importedId }) => {
@@ -12660,6 +12664,7 @@ const ensureFallbackComment = ({ converter, matchingImportedComment, commentId,
     isDone: false
   });
 };
+const TRACK_CHANGE_MARKS$1 = [superEditor_converter.TrackInsertMarkName, superEditor_converter.TrackDeleteMarkName, superEditor_converter.TrackFormatMarkName];
 const removeCommentsById = ({ commentId, state, tr, dispatch }) => {
   const positions = getCommentPositionsById(commentId, state.doc);
   positions.forEach(({ from: from3, to }) => {
@@ -12803,6 +12808,35 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
         });
       });
     });
+    const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+    if (trackedChangeMark) {
+      const trackedChangeId = trackedChangeMark.attrs?.id;
+      if (trackedChangeId) {
+        const childComments = comments.filter((c2) => c2.parentCommentId === trackedChangeId && !c2.trackedChange).sort((a, b) => a.createdTime - b.createdTime);
+        childComments.forEach((c2) => {
+          if (seen.has(c2.commentId)) return;
+          seen.add(c2.commentId);
+          const childMark = getPreparedComment({
+            commentId: c2.commentId,
+            internal: c2.isInternal
+          });
+          const childStartNode = schema.nodes.commentRangeStart.create(childMark);
+          startNodes.push({
+            pos,
+            node: childStartNode,
+            commentId: c2.commentId,
+            parentCommentId: c2.parentCommentId
+          });
+          const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
+          endNodes.push({
+            pos: pos + node.nodeSize,
+            node: childEndNode,
+            commentId: c2.commentId,
+            parentCommentId: c2.parentCommentId
+          });
+        });
+      }
+    }
   });
   startNodes.sort((a, b) => {
     if (a.pos !== b.pos) return a.pos - b.pos;
@@ -12857,17 +12891,18 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
     const { type } = node;
     const commentNodes = ["commentRangeStart", "commentRangeEnd", "commentReference"];
     if (!commentNodes.includes(type.name)) return;
-    const { resolvedCommentId, importedId, internal, matchingImportedComment } = resolveCommentMeta({
+    const { resolvedCommentId, importedId, internal, matchingImportedComment, trackedChange } = resolveCommentMeta({
       converter,
       importedId: node.attrs["w:id"]
     });
     const isDone = !!matchingImportedComment?.isDone;
     if (type.name === "commentRangeStart") {
-      if (!isDone) {
+      if (!matchingImportedComment || !matchingImportedComment.isDone) {
         toMark.push({
           commentId: resolvedCommentId,
           importedId,
           internal,
+          trackedChange,
           start: pos
         });
       }
@@ -12906,7 +12941,8 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
       const markAttrs = {
         commentId: itemToMark.commentId,
         importedId,
-        internal: itemToMark.internal
+        internal: itemToMark.internal,
+        trackedChange: itemToMark.trackedChange
       };
       tr.addMark(start2, pos + 1, schema.marks[CommentMarkName$1].create(markAttrs));
       toDelete.push({ start: pos, end: pos + 1 });
@@ -13468,26 +13504,30 @@ const handleTrackedChangeTransaction = (trackedChangeMeta, trackedChanges, newEd
   if (emitParams) editor.emit("commentsUpdate", emitParams);
   return newTrackedChanges;
 };
-const getTrackedChangeText = ({ nodes, mark, trackedChangeType, isDeletionInsertion }) => {
+const getTrackedChangeText = ({ nodes, mark, trackedChangeType, isDeletionInsertion, marks }) => {
   let trackedChangeText = "";
   let deletionText = "";
-  if (trackedChangeType === superEditor_converter.TrackInsertMarkName) {
+  if (trackedChangeType === superEditor_converter.TrackDeleteMarkName || isDeletionInsertion) {
+    deletionText = nodes.reduce((acc, node) => {
+      const hasDeleteMark = node.marks.find((nodeMark) => nodeMark.type.name === superEditor_converter.TrackDeleteMarkName);
+      if (!hasDeleteMark) return acc;
+      const nodeText = node?.text || node?.textContent || "";
+      acc += nodeText;
+      return acc;
+    }, "");
+  }
+  if (trackedChangeType === superEditor_converter.TrackInsertMarkName || isDeletionInsertion) {
     trackedChangeText = nodes.reduce((acc, node) => {
-      if (!node.marks.find((nodeMark) => nodeMark.type.name === mark.type.name)) return acc;
-      acc += node?.text || node?.textContent || "";
+      const hasInsertMark = node.marks.find((nodeMark) => nodeMark.type.name === superEditor_converter.TrackInsertMarkName);
+      if (!hasInsertMark) return acc;
+      const nodeText = node?.text || node?.textContent || "";
+      acc += nodeText;
       return acc;
     }, "");
   }
   if (trackedChangeType === superEditor_converter.TrackFormatMarkName) {
     trackedChangeText = translateFormatChangesToEnglish(mark.attrs);
   }
-  if (trackedChangeType === superEditor_converter.TrackDeleteMarkName || isDeletionInsertion) {
-    deletionText = nodes.reduce((acc, node) => {
-      if (!node.marks.find((nodeMark) => nodeMark.type.name === superEditor_converter.TrackDeleteMarkName)) return acc;
-      acc += node?.text || node?.textContent || "";
-      return acc;
-    }, "");
-  }
   return {
     deletionText,
     trackedChangeText
@@ -13500,22 +13540,41 @@ const createOrUpdateTrackedChangeComment = ({ event, marks, deletionNodes, nodes
   const { author, authorEmail, authorImage, date, importedAuthor } = attrs;
   const id = attrs.id;
   const node = nodes[0];
-  const isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
+  const trackedChangesWithId = getTrackChanges(newEditorState, id);
+  let isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
+  if (!isDeletionInsertion) {
+    const hasInsertMark = trackedChangesWithId.some(({ mark }) => mark.type.name === superEditor_converter.TrackInsertMarkName);
+    const hasDeleteMark = trackedChangesWithId.some(({ mark }) => mark.type.name === superEditor_converter.TrackDeleteMarkName);
+    isDeletionInsertion = hasInsertMark && hasDeleteMark;
+  }
   let nodesWithMark = [];
-  newEditorState.doc.descendants((node2) => {
-    const { marks: marks2 = [] } = node2;
-    const changeMarks = marks2.filter((mark) => TRACK_CHANGE_MARKS.includes(mark.type.name));
-    if (!changeMarks.length) return;
-    const hasMatchingId = changeMarks.find((mark) => mark.attrs.id === id);
-    if (hasMatchingId) nodesWithMark.push(node2);
+  trackedChangesWithId.forEach(({ from: from3, to, mark }) => {
+    newEditorState.doc.nodesBetween(from3, to, (node2, pos) => {
+      if (node2.isText) {
+        const hasMatchingMark = node2.marks?.some((m) => TRACK_CHANGE_MARKS.includes(m.type.name) && m.attrs.id === id);
+        if (hasMatchingMark) {
+          const alreadyAdded = nodesWithMark.some((n) => n === node2);
+          if (!alreadyAdded) {
+            nodesWithMark.push(node2);
+          }
+        }
+      }
+    });
   });
-  const nodesToProcess = nodesWithMark.length ? nodesWithMark : node ? [node] : [];
-  if (!nodesToProcess.length) {
+  let nodesToUse;
+  if (isDeletionInsertion) {
+    const allNodes = [...nodesWithMark, ...nodes, ...deletionNodes || []];
+    nodesToUse = Array.from(new Set(allNodes));
+  } else {
+    nodesToUse = nodesWithMark.length ? nodesWithMark : node ? [node] : [];
+  }
+  if (!nodesToUse.length) {
     return;
   }
   const { deletionText, trackedChangeText } = getTrackedChangeText({
-    nodes: nodesToProcess,
+    nodes: nodesToUse,
     mark: trackedMark,
+    marks,
     trackedChangeType,
     isDeletionInsertion
   });
@@ -15457,7 +15516,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.4.0";
+const summaryVersion = "1.4.1-next.1";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -18089,7 +18148,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.4.0");
+    console.debug("[checkVersionMigrations] Current editor version", "1.4.1-next.1");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -27197,12 +27256,15 @@ class DomPainter {
       }
     }
     applyRunStyles(elem, run, isActiveLink);
-    const commentColor = getCommentHighlight(run);
-    if (commentColor && !run.highlight) {
+    const textRun = run;
+    const commentAnnotations = textRun.comments;
+    const hasAnyComment = !!commentAnnotations?.length;
+    const hasHighlightableComment = !!commentAnnotations?.some((c2) => !c2.trackedChange);
+    const commentColor = getCommentHighlight(textRun);
+    if (commentColor && !textRun.highlight && hasHighlightableComment) {
       elem.style.backgroundColor = commentColor;
     }
-    const commentAnnotations = run.comments;
-    if (commentAnnotations?.length) {
+    if (hasAnyComment) {
       elem.dataset.commentIds = commentAnnotations.map((c2) => c2.commentId).join(",");
       if (commentAnnotations.some((c2) => c2.internal)) {
         elem.dataset.commentInternal = "true";
@@ -41182,6 +41244,7 @@ const pushCommentAnnotation = (run, attrs) => {
   const commentId = typeof attrs?.commentId === "string" ? attrs.commentId : void 0;
   const importedId = typeof attrs?.importedId === "string" ? attrs.importedId : void 0;
   const internal = attrs?.internal === true;
+  const trackedChange = attrs?.trackedChange === true;
   if (!commentId && !importedId) return;
   const annotations = run.comments ? [...run.comments] : [];
   const key2 = `${commentId ?? ""}::${importedId ?? ""}`;
@@ -41190,7 +41253,8 @@ const pushCommentAnnotation = (run, attrs) => {
     annotations.push({
       commentId: commentId ?? importedId,
       importedId,
-      internal
+      internal,
+      trackedChange
     });
   }
   run.comments = annotations;
@@ -60175,6 +60239,10 @@ const CommentsMark = Mark.create({
       internal: {
         default: true,
         rendered: false
+      },
+      trackedChange: {
+        default: false,
+        rendered: false
       }
     };
   },

package/dist/chunks/{index-B6VX2S0H.es.js → index-DwUAu2hL.es.js}

@@ -1,6 +1,6 @@
 import { B as Buffer$2 } from "./jszip-B1fkPkPJ.es.js";
 import { t as twipsToInches, i as inchesToTwips, p as ptToTwips, l as linesToTwips, a as twipsToLines, b as pixelsToTwips, h as halfPointToPoints, c as twipsToPixels$2, d as convertSizeToCSS, e as inchesToPixels } from "./helpers-C8e9wR5l.es.js";
-import { g as generateDocxRandomId, T as TextSelection$1, o as objectIncludes, w as wrapTextsInRuns, D as DOMParser$1, c as createDocFromMarkdown, a as createDocFromHTML, b as chainableEditorState, d as convertMarkdownToHTML, f as findParentNode, e as findParentNodeClosestToPos, h as generateRandom32BitHex, i as generateRandomSigned32BitIntStrId, P as PluginKey, j as Plugin, M as Mapping, N as NodeSelection, k as Selection, l as Slice, m as DOMSerializer, F as Fragment, n as Mark$1, p as dropPoint, A as AllSelection, q as Schema$1, s as canSplit, t as resolveRunProperties, u as encodeMarksFromRPr, v as liftTarget, x as canJoin, y as joinPoint, z as replaceStep$1, R as ReplaceAroundStep$1, B as htmlHandler, C as ReplaceStep, E as getResolvedParagraphProperties, G as changeListLevel, H as isList$1, I as updateNumberingProperties, L as ListHelpers, J as inputRulesPlugin, K as TrackDeleteMarkName$1, O as TrackInsertMarkName$1, Q as TrackFormatMarkName$1, U as AddMarkStep, V as RemoveMarkStep, W as CommandService, S as SuperConverter, X as EditorState, Y as unflattenListsInHtml, Z as SelectionRange, _ as Transform, $ as createOoxmlResolver, a0 as translator, a1 as translator$1, a2 as resolveDocxFontFamily, a3 as combineIndentProperties, a4 as _getReferencedTableStyles, a5 as decodeRPrFromMarks, a6 as calculateResolvedParagraphProperties, a7 as encodeCSSFromPPr, a8 as encodeCSSFromRPr, a9 as generateOrderedListIndex, aa as docxNumberingHelpers, ab as InputRule, ac as insertNewRelationship, ad as kebabCase$1, ae as getUnderlineCssString } from "./SuperConverter-DAO7c_d4.es.js";
+import { g as generateDocxRandomId, T as TextSelection$1, o as objectIncludes, w as wrapTextsInRuns, D as DOMParser$1, c as createDocFromMarkdown, a as createDocFromHTML, b as chainableEditorState, d as convertMarkdownToHTML, f as findParentNode, e as findParentNodeClosestToPos, h as generateRandom32BitHex, i as generateRandomSigned32BitIntStrId, P as PluginKey, j as Plugin, M as Mapping, N as NodeSelection, k as Selection, l as Slice, m as DOMSerializer, F as Fragment, n as Mark$1, p as dropPoint, A as AllSelection, q as Schema$1, s as canSplit, t as resolveRunProperties, u as encodeMarksFromRPr, v as liftTarget, x as canJoin, y as joinPoint, z as replaceStep$1, R as ReplaceAroundStep$1, B as htmlHandler, C as ReplaceStep, E as getResolvedParagraphProperties, G as changeListLevel, H as isList$1, I as updateNumberingProperties, L as ListHelpers, J as inputRulesPlugin, K as TrackDeleteMarkName$1, O as TrackInsertMarkName$1, Q as TrackFormatMarkName$1, U as AddMarkStep, V as RemoveMarkStep, W as CommandService, S as SuperConverter, X as EditorState, Y as unflattenListsInHtml, Z as SelectionRange, _ as Transform, $ as createOoxmlResolver, a0 as translator, a1 as translator$1, a2 as resolveDocxFontFamily, a3 as combineIndentProperties, a4 as _getReferencedTableStyles, a5 as decodeRPrFromMarks, a6 as calculateResolvedParagraphProperties, a7 as encodeCSSFromPPr, a8 as encodeCSSFromRPr, a9 as generateOrderedListIndex, aa as docxNumberingHelpers, ab as InputRule, ac as insertNewRelationship, ad as kebabCase$1, ae as getUnderlineCssString } from "./SuperConverter-BuK6B5Kx.es.js";
 import { p as process$1, r as ref, C as global$1, c as computed, E as createElementBlock, F as Fragment$1, S as renderList, O as withModifiers, G as openBlock, P as normalizeClass, M as createCommentVNode, H as toDisplayString, K as createBaseVNode, U as createApp, f as onMounted, X as onUnmounted, R as withDirectives, v as unref, Y as vModelText, y as nextTick, L as normalizeStyle, u as watch, Z as withKeys, _ as createTextVNode, I as createVNode, h, $ as readonly, s as getCurrentInstance, o as onBeforeUnmount, j as reactive, b as onBeforeMount, i as inject, a0 as onActivated, a1 as onDeactivated, a2 as Comment, d as defineComponent, a as provide, g as Teleport, t as toRef, a3 as renderSlot, a4 as isVNode, D as shallowRef, w as watchEffect, T as Transition, a5 as mergeProps, a6 as vShow, a7 as cloneVNode, a8 as Text$2, m as markRaw, N as createBlock, J as withCtx, a9 as useCssVars, V as resolveDynamicComponent, aa as normalizeProps, ab as guardReactiveProps } from "./vue-BnBKJwCW.es.js";
 import "./jszip.min-DCl8qkFO.es.js";
 import { E as EventEmitter$1 } from "./eventemitter3-CwrdEv8r.es.js";
@@ -12621,11 +12621,15 @@ const resolveCommentMeta = ({ converter, importedId }) => {
   const matchingImportedComment = comments.find((c2) => c2.importedId == importedId);
   const resolvedCommentId = matchingImportedComment?.commentId ?? (importedId ? String(importedId) : v4());
   const internal = matchingImportedComment?.internal ?? matchingImportedComment?.isInternal ?? false;
+  const parentCommentId = matchingImportedComment?.parentCommentId;
+  const trackedChangeIds = converter?.trackedChangeIdMap ? new Set(Array.from(converter.trackedChangeIdMap.values()).map((id) => String(id))) : null;
+  const isTrackedChangeParent = parentCommentId && trackedChangeIds ? trackedChangeIds.has(String(parentCommentId)) : false;
   return {
     resolvedCommentId,
     importedId,
     internal,
-    matchingImportedComment
+    matchingImportedComment,
+    trackedChange: matchingImportedComment?.trackedChange === true || isTrackedChangeParent
   };
 };
 const ensureFallbackComment = ({ converter, matchingImportedComment, commentId, importedId }) => {
@@ -12643,6 +12647,7 @@ const ensureFallbackComment = ({ converter, matchingImportedComment, commentId,
     isDone: false
   });
 };
+const TRACK_CHANGE_MARKS$1 = [TrackInsertMarkName$1, TrackDeleteMarkName$1, TrackFormatMarkName$1];
 const removeCommentsById = ({ commentId, state, tr, dispatch }) => {
   const positions = getCommentPositionsById(commentId, state.doc);
   positions.forEach(({ from: from3, to }) => {
@@ -12786,6 +12791,35 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
         });
       });
     });
+    const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+    if (trackedChangeMark) {
+      const trackedChangeId = trackedChangeMark.attrs?.id;
+      if (trackedChangeId) {
+        const childComments = comments.filter((c2) => c2.parentCommentId === trackedChangeId && !c2.trackedChange).sort((a, b) => a.createdTime - b.createdTime);
+        childComments.forEach((c2) => {
+          if (seen.has(c2.commentId)) return;
+          seen.add(c2.commentId);
+          const childMark = getPreparedComment({
+            commentId: c2.commentId,
+            internal: c2.isInternal
+          });
+          const childStartNode = schema.nodes.commentRangeStart.create(childMark);
+          startNodes.push({
+            pos,
+            node: childStartNode,
+            commentId: c2.commentId,
+            parentCommentId: c2.parentCommentId
+          });
+          const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
+          endNodes.push({
+            pos: pos + node.nodeSize,
+            node: childEndNode,
+            commentId: c2.commentId,
+            parentCommentId: c2.parentCommentId
+          });
+        });
+      }
+    }
   });
   startNodes.sort((a, b) => {
     if (a.pos !== b.pos) return a.pos - b.pos;
@@ -12840,17 +12874,18 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
     const { type } = node;
     const commentNodes = ["commentRangeStart", "commentRangeEnd", "commentReference"];
     if (!commentNodes.includes(type.name)) return;
-    const { resolvedCommentId, importedId, internal, matchingImportedComment } = resolveCommentMeta({
+    const { resolvedCommentId, importedId, internal, matchingImportedComment, trackedChange } = resolveCommentMeta({
       converter,
       importedId: node.attrs["w:id"]
     });
     const isDone = !!matchingImportedComment?.isDone;
     if (type.name === "commentRangeStart") {
-      if (!isDone) {
+      if (!matchingImportedComment || !matchingImportedComment.isDone) {
         toMark.push({
           commentId: resolvedCommentId,
           importedId,
           internal,
+          trackedChange,
           start: pos
         });
       }
@@ -12889,7 +12924,8 @@ const prepareCommentsForImport = (doc2, tr, schema, converter) => {
       const markAttrs = {
         commentId: itemToMark.commentId,
         importedId,
-        internal: itemToMark.internal
+        internal: itemToMark.internal,
+        trackedChange: itemToMark.trackedChange
       };
       tr.addMark(start2, pos + 1, schema.marks[CommentMarkName$1].create(markAttrs));
       toDelete.push({ start: pos, end: pos + 1 });
@@ -13451,26 +13487,30 @@ const handleTrackedChangeTransaction = (trackedChangeMeta, trackedChanges, newEd
   if (emitParams) editor.emit("commentsUpdate", emitParams);
   return newTrackedChanges;
 };
-const getTrackedChangeText = ({ nodes, mark, trackedChangeType, isDeletionInsertion }) => {
+const getTrackedChangeText = ({ nodes, mark, trackedChangeType, isDeletionInsertion, marks }) => {
   let trackedChangeText = "";
   let deletionText = "";
-  if (trackedChangeType === TrackInsertMarkName$1) {
+  if (trackedChangeType === TrackDeleteMarkName$1 || isDeletionInsertion) {
+    deletionText = nodes.reduce((acc, node) => {
+      const hasDeleteMark = node.marks.find((nodeMark) => nodeMark.type.name === TrackDeleteMarkName$1);
+      if (!hasDeleteMark) return acc;
+      const nodeText = node?.text || node?.textContent || "";
+      acc += nodeText;
+      return acc;
+    }, "");
+  }
+  if (trackedChangeType === TrackInsertMarkName$1 || isDeletionInsertion) {
     trackedChangeText = nodes.reduce((acc, node) => {
-      if (!node.marks.find((nodeMark) => nodeMark.type.name === mark.type.name)) return acc;
-      acc += node?.text || node?.textContent || "";
+      const hasInsertMark = node.marks.find((nodeMark) => nodeMark.type.name === TrackInsertMarkName$1);
+      if (!hasInsertMark) return acc;
+      const nodeText = node?.text || node?.textContent || "";
+      acc += nodeText;
       return acc;
     }, "");
   }
   if (trackedChangeType === TrackFormatMarkName$1) {
     trackedChangeText = translateFormatChangesToEnglish(mark.attrs);
   }
-  if (trackedChangeType === TrackDeleteMarkName$1 || isDeletionInsertion) {
-    deletionText = nodes.reduce((acc, node) => {
-      if (!node.marks.find((nodeMark) => nodeMark.type.name === TrackDeleteMarkName$1)) return acc;
-      acc += node?.text || node?.textContent || "";
-      return acc;
-    }, "");
-  }
   return {
     deletionText,
     trackedChangeText
@@ -13483,22 +13523,41 @@ const createOrUpdateTrackedChangeComment = ({ event, marks, deletionNodes, nodes
   const { author, authorEmail, authorImage, date, importedAuthor } = attrs;
   const id = attrs.id;
   const node = nodes[0];
-  const isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
+  const trackedChangesWithId = getTrackChanges(newEditorState, id);
+  let isDeletionInsertion = !!(marks.insertedMark && marks.deletionMark);
+  if (!isDeletionInsertion) {
+    const hasInsertMark = trackedChangesWithId.some(({ mark }) => mark.type.name === TrackInsertMarkName$1);
+    const hasDeleteMark = trackedChangesWithId.some(({ mark }) => mark.type.name === TrackDeleteMarkName$1);
+    isDeletionInsertion = hasInsertMark && hasDeleteMark;
+  }
   let nodesWithMark = [];
-  newEditorState.doc.descendants((node2) => {
-    const { marks: marks2 = [] } = node2;
-    const changeMarks = marks2.filter((mark) => TRACK_CHANGE_MARKS.includes(mark.type.name));
-    if (!changeMarks.length) return;
-    const hasMatchingId = changeMarks.find((mark) => mark.attrs.id === id);
-    if (hasMatchingId) nodesWithMark.push(node2);
+  trackedChangesWithId.forEach(({ from: from3, to, mark }) => {
+    newEditorState.doc.nodesBetween(from3, to, (node2, pos) => {
+      if (node2.isText) {
+        const hasMatchingMark = node2.marks?.some((m) => TRACK_CHANGE_MARKS.includes(m.type.name) && m.attrs.id === id);
+        if (hasMatchingMark) {
+          const alreadyAdded = nodesWithMark.some((n) => n === node2);
+          if (!alreadyAdded) {
+            nodesWithMark.push(node2);
+          }
+        }
+      }
+    });
   });
-  const nodesToProcess = nodesWithMark.length ? nodesWithMark : node ? [node] : [];
-  if (!nodesToProcess.length) {
+  let nodesToUse;
+  if (isDeletionInsertion) {
+    const allNodes = [...nodesWithMark, ...nodes, ...deletionNodes || []];
+    nodesToUse = Array.from(new Set(allNodes));
+  } else {
+    nodesToUse = nodesWithMark.length ? nodesWithMark : node ? [node] : [];
+  }
+  if (!nodesToUse.length) {
     return;
   }
   const { deletionText, trackedChangeText } = getTrackedChangeText({
-    nodes: nodesToProcess,
+    nodes: nodesToUse,
     mark: trackedMark,
+    marks,
     trackedChangeType,
     isDeletionInsertion
   });
@@ -15440,7 +15499,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.4.0";
+const summaryVersion = "1.4.1-next.1";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -18072,7 +18131,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.4.0");
+    console.debug("[checkVersionMigrations] Current editor version", "1.4.1-next.1");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -27180,12 +27239,15 @@ class DomPainter {
       }
     }
     applyRunStyles(elem, run, isActiveLink);
-    const commentColor = getCommentHighlight(run);
-    if (commentColor && !run.highlight) {
+    const textRun = run;
+    const commentAnnotations = textRun.comments;
+    const hasAnyComment = !!commentAnnotations?.length;
+    const hasHighlightableComment = !!commentAnnotations?.some((c2) => !c2.trackedChange);
+    const commentColor = getCommentHighlight(textRun);
+    if (commentColor && !textRun.highlight && hasHighlightableComment) {
       elem.style.backgroundColor = commentColor;
     }
-    const commentAnnotations = run.comments;
-    if (commentAnnotations?.length) {
+    if (hasAnyComment) {
       elem.dataset.commentIds = commentAnnotations.map((c2) => c2.commentId).join(",");
       if (commentAnnotations.some((c2) => c2.internal)) {
         elem.dataset.commentInternal = "true";
@@ -41165,6 +41227,7 @@ const pushCommentAnnotation = (run, attrs) => {
   const commentId = typeof attrs?.commentId === "string" ? attrs.commentId : void 0;
   const importedId = typeof attrs?.importedId === "string" ? attrs.importedId : void 0;
   const internal = attrs?.internal === true;
+  const trackedChange = attrs?.trackedChange === true;
   if (!commentId && !importedId) return;
   const annotations = run.comments ? [...run.comments] : [];
   const key2 = `${commentId ?? ""}::${importedId ?? ""}`;
@@ -41173,7 +41236,8 @@ const pushCommentAnnotation = (run, attrs) => {
     annotations.push({
       commentId: commentId ?? importedId,
       importedId,
-      internal
+      internal,
+      trackedChange
     });
   }
   run.comments = annotations;
@@ -60158,6 +60222,10 @@ const CommentsMark = Mark.create({
       internal: {
         default: true,
         rendered: false
+      },
+      trackedChange: {
+        default: false,
+        rendered: false
       }
     };
   },

package/dist/chunks/{index-CZ5yJPHg.cjs → index-lAO6pLM-.cjs}

@@ -1,6 +1,6 @@
 "use strict";
-const index = require("./index-BKXWekME.cjs");
-require("./SuperConverter-C4XfNZf6.cjs");
+const index = require("./index-Bpm2bUws.cjs");
+require("./SuperConverter-nKpvrgP6.cjs");
 const blankDocx = require("./blank-docx-DfW3Eeh2.cjs");
 const eventemitter3 = require("./eventemitter3-BQuRcMPI.cjs");
 const provider = require("@hocuspocus/provider");
@@ -5130,11 +5130,14 @@ const groupChanges = (changes) => {
     trackFormat: "formatMark"
   };
   const grouped = [];
+  const processed = /* @__PURE__ */ new Set();
   for (let i = 0; i < changes.length; i++) {
+    if (processed.has(i)) continue;
     const c1 = changes[i];
-    const c2 = changes[i + 1];
     const c1Key = markMetaKeys[c1.mark.type.name];
-    if (c1 && c2 && c1.to === c2.from && c1.mark.attrs.id === c2.mark.attrs.id) {
+    const c1Id = c1.mark.attrs.id;
+    const c2 = changes[i + 1];
+    if (c2 && c1.to === c2.from && c1Id === c2.mark.attrs.id) {
       const c2Key = markMetaKeys[c2.mark.type.name];
       grouped.push({
         from: c1.from,
@@ -5142,13 +5145,35 @@ const groupChanges = (changes) => {
         [c1Key]: c1,
         [c2Key]: c2
       });
-      i++;
-    } else {
+      processed.add(i);
+      processed.add(i + 1);
+      continue;
+    }
+    let foundMatch = false;
+    for (let j = i + 1; j < changes.length; j++) {
+      if (processed.has(j)) continue;
+      const c22 = changes[j];
+      if (c1Id === c22.mark.attrs.id && c1.mark.type.name !== c22.mark.type.name) {
+        const c2Key = markMetaKeys[c22.mark.type.name];
+        grouped.push({
+          from: Math.min(c1.from, c22.from),
+          to: Math.max(c1.to, c22.to),
+          [c1Key]: c1,
+          [c2Key]: c22
+        });
+        processed.add(i);
+        processed.add(j);
+        foundMatch = true;
+        break;
+      }
+    }
+    if (!foundMatch) {
       grouped.push({
         from: c1.from,
         to: c1.to,
         [c1Key]: c1
       });
+      processed.add(i);
     }
   }
   return grouped;
@@ -5450,7 +5475,12 @@ const useCommentsStore = /* @__PURE__ */ defineStore("comments", () => {
         trackedChange: comment.trackedChange || false,
         trackedChangeText: comment.trackedChangeText,
         trackedChangeType: comment.trackedChangeType,
-        deletedText: comment.trackedDeletedText
+        deletedText: comment.trackedDeletedText,
+        // Preserve origin metadata for export
+        origin: comment.origin || "word",
+        // Default to 'word' for backward compatibility
+        threadingMethod: comment.threadingMethod,
+        originalXmlStructure: comment.originalXmlStructure
       });
       addComment({ superdoc, comment: newComment });
     });
@@ -6230,7 +6260,11 @@ const _sfc_main$c = {
         const isThreadedComment = c.parentCommentId === parentComment.commentId;
         const isThisComment = c.commentId === props.comment.commentId;
         return isThreadedComment || isThisComment;
-      }).sort((a, b) => a.commentId === props.comment.commentId && a.createdTime - b.createdTime);
+      }).sort((a, b) => {
+        if (a.commentId === props.comment.commentId) return -1;
+        if (b.commentId === props.comment.commentId) return 1;
+        return a.createdTime - b.createdTime;
+      });
     });
     const isInternalDropdownDisabled = vue.computed(() => {
       if (props.comment.resolvedTime) return true;
@@ -6489,7 +6523,7 @@ const _sfc_main$c = {
     };
   }
 };
-const CommentDialog = /* @__PURE__ */ index._export_sfc(_sfc_main$c, [["__scopeId", "data-v-d50fd675"]]);
+const CommentDialog = /* @__PURE__ */ index._export_sfc(_sfc_main$c, [["__scopeId", "data-v-f9956635"]]);
 const _hoisted_1$a = { class: "comments-list" };
 const _hoisted_2$5 = { key: 0 };
 const _hoisted_3$3 = { class: "comment-item" };
@@ -7496,7 +7530,7 @@ const _sfc_main = {
   __name: "SuperDoc",
   emits: ["selection-update"],
   setup(__props, { emit: __emit }) {
-    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-Dl9_ocZH.cjs")));
+    const PdfViewer = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./PdfViewer-BaDWswEX.cjs")));
     const superdocStore = useSuperdocStore();
     const commentsStore = useCommentsStore();
     const {
@@ -8450,7 +8484,7 @@ class SuperDoc extends eventemitter3.EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "1.4.0";
+    this.version = "1.4.1-next.1";
     this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || uuid.v4();
     this.colors = this.config.colors;