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

package/dist/chunks/{SuperConverter-krwrYQkW.cjs → SuperConverter-PbxPQOyI.cjs}

@@ -27558,7 +27558,46 @@ const decode$l = (params) => {
     };
     commentSchema = [commentSchema, commentReference];
   }
-  return commentSchema;
+  const usesRangeThreading = originalComment.threadingStyleOverride === "range-based" || originalComment.threadingMethod === "range-based" || originalComment.originalXmlStructure?.hasCommentsExtended === false;
+  if (!usesRangeThreading) {
+    return commentSchema;
+  }
+  const trackedMark = node.marks?.find((mark) => mark.type === "trackInsert" || mark.type === "trackDelete");
+  if (trackedMark) {
+    const wrapperName2 = trackedMark.type === "trackDelete" ? "w:del" : "w:ins";
+    const markAttrs = trackedMark.attrs || {};
+    const date2 = markAttrs.date || new Date(Date.now()).toISOString().replace(/\.\d{3}Z$/, "Z");
+    const wrapperAttributes2 = {
+      ...markAttrs.id ? { "w:id": String(markAttrs.id) } : {},
+      ...markAttrs.author ? { "w:author": markAttrs.author } : {},
+      ...markAttrs.authorEmail ? { "w:authorEmail": markAttrs.authorEmail } : {},
+      "w:date": date2
+    };
+    return {
+      name: wrapperName2,
+      attributes: wrapperAttributes2,
+      elements: Array.isArray(commentSchema) ? commentSchema : [commentSchema]
+    };
+  }
+  if (!parentComment?.trackedChange) {
+    return commentSchema;
+  }
+  const trackedChangeType = parentComment.trackedChangeType;
+  const isReplace = trackedChangeType === "both";
+  const wrapperName = type === "commentRangeStart" ? "w:ins" : isReplace ? "w:del" : trackedChangeType === "trackDelete" ? "w:del" : "w:ins";
+  const createdTime = parentComment.createdTime || Date.now();
+  const date = new Date(createdTime).toISOString().replace(/\.\d{3}Z$/, "Z");
+  const wrapperAttributes = {
+    "w:id": String(parentComment.commentId),
+    ...parentComment.creatorName ? { "w:author": parentComment.creatorName } : {},
+    ...parentComment.creatorEmail ? { "w:authorEmail": parentComment.creatorEmail } : {},
+    "w:date": date
+  };
+  return {
+    name: wrapperName,
+    attributes: wrapperAttributes,
+    elements: Array.isArray(commentSchema) ? commentSchema : [commentSchema]
+  };
 };
 const getCommentSchema = (type, commentIndex) => {
   return {
@@ -29161,6 +29200,15 @@ function importCommentData({ docx, editor, converter }) {
   const nodeListHandler = defaultNodeListHandler();
   const comments = docx["word/comments.xml"];
   if (!comments) return;
+  const commentThreadingProfile = converter?.commentThreadingProfile || {
+    defaultStyle: docx["word/commentsExtended.xml"] ? "commentsExtended" : "range-based",
+    mixed: false,
+    fileSet: {
+      hasCommentsExtended: !!docx["word/commentsExtended.xml"],
+      hasCommentsExtensible: !!docx["word/commentsExtensible.xml"],
+      hasCommentsIds: !!docx["word/commentsIds.xml"]
+    }
+  };
   const { elements } = comments;
   if (!elements || !elements.length) return;
   const { elements: allComments = [] } = elements[0];
@@ -29188,8 +29236,7 @@ function importCommentData({ docx, editor, converter }) {
     });
     const lastElement = parsedElements[parsedElements.length - 1];
     const paraId = lastElement?.attrs?.["w14:paraId"];
-    const commentsExtended = docx["word/commentsExtended.xml"];
-    const threadingMethod = commentsExtended ? "commentsExtended" : "range-based";
+    const threadingMethod = commentThreadingProfile.defaultStyle;
     return {
       commentId: internalId || uuid.v4(),
       importedId,
@@ -29207,21 +29254,45 @@ function importCommentData({ docx, editor, converter }) {
       isDone: false,
       origin: converter?.documentOrigin || "word",
       threadingMethod,
+      threadingStyleOverride: void 0,
       originalXmlStructure: {
-        hasCommentsExtended: !!commentsExtended,
-        hasCommentsExtensible: !!docx["word/commentsExtensible.xml"],
-        hasCommentsIds: !!docx["word/commentsIds.xml"]
+        ...commentThreadingProfile.fileSet
       }
     };
   });
-  const extendedComments = generateCommentsWithExtendedData({ docx, comments: extractedComments, converter });
+  const extendedComments = generateCommentsWithExtendedData({
+    docx,
+    comments: extractedComments,
+    converter,
+    threadingProfile: commentThreadingProfile
+  });
+  if (converter) {
+    const hasOverride = extendedComments.some(
+      (comment) => comment.threadingStyleOverride && comment.threadingStyleOverride !== commentThreadingProfile.defaultStyle
+    );
+    converter.commentThreadingProfile = {
+      ...commentThreadingProfile,
+      mixed: hasOverride || commentThreadingProfile.mixed
+    };
+  }
   return extendedComments;
 }
-const generateCommentsWithExtendedData = ({ docx, comments, converter }) => {
+const generateCommentsWithExtendedData = ({ docx, comments, converter, threadingProfile }) => {
   if (!comments?.length) return [];
   const rangeData = extractCommentRangesFromDocument(docx, converter);
   const { commentsInTrackedChanges } = rangeData;
   const trackedChangeParentMap = detectThreadingFromTrackedChanges(comments, commentsInTrackedChanges);
+  const rangeThreadedComments = detectThreadingFromRanges(comments, {
+    ...rangeData,
+    commentsInTrackedChanges: /* @__PURE__ */ new Map()
+  });
+  const commentIdSet = new Set(comments.map((comment) => comment.commentId));
+  const rangeParentMap = /* @__PURE__ */ new Map();
+  rangeThreadedComments.forEach((comment) => {
+    if (comment.parentCommentId && commentIdSet.has(comment.parentCommentId)) {
+      rangeParentMap.set(comment.commentId, comment.parentCommentId);
+    }
+  });
   const commentsExtended = docx["word/commentsExtended.xml"];
   if (!commentsExtended) {
     const commentsWithThreading = detectThreadingFromRanges(comments, rangeData);
@@ -29240,25 +29311,43 @@ const generateCommentsWithExtendedData = ({ docx, comments, converter }) => {
     });
     let isDone = comment.isDone ?? false;
     let parentCommentId = void 0;
+    let threadingParentCommentId = void 0;
+    let threadingStyleOverride = void 0;
     const trackedChangeParent = trackedChangeParentMap.get(comment.importedId);
     const isInsideTrackedChange = trackedChangeParent?.isTrackedChangeParent;
     if (extendedDef) {
       const details = getExtendedDetails(extendedDef);
       isDone = details.isDone ?? false;
-      if (!isInsideTrackedChange && details.paraIdParent) {
+      if (details.paraIdParent) {
         const parentComment = comments.find(
           (c) => c.paraId === details.paraIdParent || c.elements?.some((el) => el.attrs?.["w14:paraId"] === details.paraIdParent)
         );
-        parentCommentId = parentComment?.commentId;
+        const rangeParent = rangeParentMap.get(comment.commentId);
+        if (parentComment?.trackedChange && rangeParent) {
+          threadingParentCommentId = rangeParent;
+        } else {
+          threadingParentCommentId = parentComment?.commentId;
+        }
+        if (!isInsideTrackedChange) {
+          parentCommentId = threadingParentCommentId;
+        }
       }
     }
     if (isInsideTrackedChange) {
       parentCommentId = trackedChangeParent.trackedChangeId;
     }
+    if (!parentCommentId && rangeParentMap.has(comment.commentId)) {
+      parentCommentId = rangeParentMap.get(comment.commentId);
+      if (threadingProfile?.defaultStyle === "commentsExtended") {
+        threadingStyleOverride = "range-based";
+      }
+    }
     return {
       ...comment,
       isDone,
-      parentCommentId
+      parentCommentId,
+      threadingStyleOverride,
+      threadingParentCommentId
     };
   });
 };
@@ -30134,12 +30223,27 @@ const detectDocumentOrigin = (docx) => {
   }
   return "unknown";
 };
+const detectCommentThreadingProfile = (docx) => {
+  const hasCommentsExtended = !!docx["word/commentsExtended.xml"];
+  const hasCommentsExtensible = !!docx["word/commentsExtensible.xml"];
+  const hasCommentsIds = !!docx["word/commentsIds.xml"];
+  return {
+    defaultStyle: hasCommentsExtended ? "commentsExtended" : "range-based",
+    mixed: false,
+    fileSet: {
+      hasCommentsExtended,
+      hasCommentsExtensible,
+      hasCommentsIds
+    }
+  };
+};
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
   if (!json) return null;
   if (converter) {
     importFootnotePropertiesFromSettings(docx, converter);
     converter.documentOrigin = detectDocumentOrigin(docx);
+    converter.commentThreadingProfile = detectCommentThreadingProfile(docx);
   }
   if (converter?.telemetry) {
     const files = Object.keys(docx).map((filePath) => {
@@ -32297,8 +32401,18 @@ const determineExportStrategy = (comments) => {
   }
   return "word";
 };
-const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, exportStrategy = "word") => {
-  const shouldGenerateCommentsExtended = exportStrategy === "word" || comments.some((c) => c.originalXmlStructure?.hasCommentsExtended);
+const resolveThreadingStyle = (comment, threadingProfile) => {
+  if (comment?.threadingStyleOverride) return comment.threadingStyleOverride;
+  if (threadingProfile?.defaultStyle) return threadingProfile.defaultStyle;
+  return comment?.originalXmlStructure?.hasCommentsExtended ? "commentsExtended" : "range-based";
+};
+const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, threadingProfile = null) => {
+  if (!commentsExtendedXml) {
+    return null;
+  }
+  const exportStrategy = typeof threadingProfile === "string" ? threadingProfile : "word";
+  const profile = typeof threadingProfile === "string" ? null : threadingProfile;
+  const shouldGenerateCommentsExtended = profile ? profile.defaultStyle === "commentsExtended" || profile.mixed || comments.some((comment) => resolveThreadingStyle(comment, profile) === "commentsExtended") : exportStrategy === "word" || comments.some((c) => c.originalXmlStructure?.hasCommentsExtended);
   if (!shouldGenerateCommentsExtended && exportStrategy === "google-docs") {
     return null;
   }
@@ -32309,10 +32423,12 @@ const updateCommentsExtendedXml = (comments = [], commentsExtendedXml, exportStr
       "w15:paraId": comment.commentParaId,
       "w15:done": isResolved ? "1" : "0"
     };
-    const parentId = comment.parentCommentId;
-    if (parentId && (exportStrategy === "word" || comment.originalXmlStructure?.hasCommentsExtended)) {
+    const parentId = comment.threadingParentCommentId || comment.parentCommentId;
+    const threadingStyle = resolveThreadingStyle(comment, profile);
+    if (parentId && threadingStyle === "commentsExtended") {
       const parentComment = comments.find((c) => c.commentId === parentId);
-      if (parentComment && !parentComment.trackedChange) {
+      const allowTrackedParent = profile?.defaultStyle === "commentsExtended";
+      if (parentComment && (allowTrackedParent || !parentComment.trackedChange)) {
         attributes["w15:paraIdParent"] = parentComment.commentParaId;
       }
     }
@@ -32356,12 +32472,15 @@ const updateCommentsIdsAndExtensible = (comments = [], commentsIds, extensible)
     extensibleUpdated
   };
 };
-const generateConvertedXmlWithCommentFiles = (convertedXml) => {
+const generateConvertedXmlWithCommentFiles = (convertedXml, fileSet = null) => {
   const newXml = carbonCopy(convertedXml);
   newXml["word/comments.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_XML_DEF;
-  newXml["word/commentsExtended.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENDED_XML_DEF;
-  newXml["word/commentsExtensible.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENSIBLE_XML_DEF;
-  newXml["word/commentsIds.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_IDS_XML_DEF;
+  const includeExtended = fileSet ? fileSet.hasCommentsExtended : true;
+  const includeExtensible = fileSet ? fileSet.hasCommentsExtensible : true;
+  const includeIds = fileSet ? fileSet.hasCommentsIds : true;
+  if (includeExtended) newXml["word/commentsExtended.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENDED_XML_DEF;
+  if (includeExtensible) newXml["word/commentsExtensible.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_EXTENSIBLE_XML_DEF;
+  if (includeIds) newXml["word/commentsIds.xml"] = COMMENTS_XML_DEFINITIONS.COMMENTS_IDS_XML_DEF;
   newXml["[Content_Types].xml"] = COMMENTS_XML_DEFINITIONS.CONTENT_TYPES;
   return newXml;
 };
@@ -32378,20 +32497,26 @@ const generateRelationship = (target) => {
   const rel = relsDefault.find((rel2) => rel2.attributes.Target === target);
   return { ...rel };
 };
-const prepareCommentsXmlFilesForExport = ({ convertedXml, defs, commentsWithParaIds, exportType }) => {
+const prepareCommentsXmlFilesForExport = ({
+  convertedXml,
+  defs,
+  commentsWithParaIds,
+  exportType,
+  threadingProfile
+}) => {
   const relationships = [];
   if (exportType === "clean") {
     const documentXml = removeCommentsFilesFromConvertedXml(convertedXml);
     return { documentXml, relationships };
   }
   const exportStrategy = determineExportStrategy(commentsWithParaIds);
-  const updatedXml = generateConvertedXmlWithCommentFiles(convertedXml);
+  const updatedXml = generateConvertedXmlWithCommentFiles(convertedXml, threadingProfile?.fileSet);
   updatedXml["word/comments.xml"] = updateCommentsXml(defs, updatedXml["word/comments.xml"]);
   relationships.push(generateRelationship("comments.xml"));
   const commentsExtendedXml = updateCommentsExtendedXml(
     commentsWithParaIds,
     updatedXml["word/commentsExtended.xml"],
-    exportStrategy
+    threadingProfile || exportStrategy
   );
   if (commentsExtendedXml !== null) {
     updatedXml["word/commentsExtended.xml"] = commentsExtendedXml;
@@ -32399,15 +32524,17 @@ const prepareCommentsXmlFilesForExport = ({ convertedXml, defs, commentsWithPara
   } else {
     delete updatedXml["word/commentsExtended.xml"];
   }
-  const { documentIdsUpdated, extensibleUpdated } = updateCommentsIdsAndExtensible(
-    commentsWithParaIds,
-    updatedXml["word/commentsIds.xml"],
-    updatedXml["word/commentsExtensible.xml"]
-  );
-  updatedXml["word/commentsIds.xml"] = documentIdsUpdated;
-  updatedXml["word/commentsExtensible.xml"] = extensibleUpdated;
-  relationships.push(generateRelationship("commentsIds.xml"));
-  relationships.push(generateRelationship("commentsExtensible.xml"));
+  if (updatedXml["word/commentsIds.xml"] && updatedXml["word/commentsExtensible.xml"]) {
+    const { documentIdsUpdated, extensibleUpdated } = updateCommentsIdsAndExtensible(
+      commentsWithParaIds,
+      updatedXml["word/commentsIds.xml"],
+      updatedXml["word/commentsExtensible.xml"]
+    );
+    updatedXml["word/commentsIds.xml"] = documentIdsUpdated;
+    updatedXml["word/commentsExtensible.xml"] = extensibleUpdated;
+    relationships.push(generateRelationship("commentsIds.xml"));
+    relationships.push(generateRelationship("commentsExtensible.xml"));
+  }
   return {
     relationships,
     documentXml: updatedXml
@@ -32758,6 +32885,7 @@ class SuperConverter {
     this.footnotes = [];
     this.footnoteProperties = null;
     this.inlineDocumentFonts = [];
+    this.commentThreadingProfile = null;
     this.docHiglightColors = /* @__PURE__ */ new Set([]);
     this.xml = params?.xml;
     this.declaration = null;
@@ -33072,7 +33200,7 @@ class SuperConverter {
   static getStoredSuperdocVersion(docx) {
     return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.7.0-next.8") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.7.0-next.9") {
     return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
   }
   /**
@@ -33472,7 +33600,8 @@ class SuperConverter {
       exportType,
       convertedXml: this.convertedXml,
       defs,
-      commentsWithParaIds
+      commentsWithParaIds,
+      threadingProfile: this.commentThreadingProfile
     });
     return { documentXml, relationships };
   }

package/dist/chunks/{index-DTJCOo2w.es.js → index-C070FBOz.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-D0hhe2nV.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-B0zMkLdc.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 h$1, $ 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";
@@ -12927,9 +12927,43 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
   comments.forEach((c2) => {
     commentMap.set(c2.commentId, c2);
   });
+  const trackedChangeSpanById = /* @__PURE__ */ new Map();
+  const trackedChangeMarksById = /* @__PURE__ */ new Map();
+  doc2.descendants((node, pos) => {
+    const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+    if (!trackedChangeMark) return;
+    const trackedChangeId = trackedChangeMark.attrs?.id;
+    if (!trackedChangeId) return;
+    const existing = trackedChangeSpanById.get(trackedChangeId);
+    const startPos = pos;
+    const endPos = pos + node.nodeSize;
+    if (!existing) {
+      trackedChangeSpanById.set(trackedChangeId, { startPos, endPos });
+    } else {
+      existing.startPos = Math.min(existing.startPos, startPos);
+      existing.endPos = Math.max(existing.endPos, endPos);
+    }
+    const marksEntry = trackedChangeMarksById.get(trackedChangeId) || {};
+    if (trackedChangeMark.type?.name === TrackInsertMarkName$1 && !marksEntry.insertMark) {
+      marksEntry.insertMark = trackedChangeMark;
+    }
+    if (trackedChangeMark.type?.name === TrackDeleteMarkName$1 && !marksEntry.deleteMark) {
+      marksEntry.deleteMark = trackedChangeMark;
+    }
+    trackedChangeMarksById.set(trackedChangeId, marksEntry);
+  });
+  const getThreadingParentId = (comment) => {
+    if (!comment) return comment?.parentCommentId;
+    const usesRangeThreading = comment.threadingStyleOverride === "range-based" || comment.threadingMethod === "range-based" || comment.originalXmlStructure?.hasCommentsExtended === false;
+    if (usesRangeThreading && comment.threadingParentCommentId) {
+      return comment.threadingParentCommentId;
+    }
+    return comment.parentCommentId;
+  };
   const startNodes = [];
   const endNodes = [];
   const seen = /* @__PURE__ */ new Set();
+  const trackedChangeCommentMeta = /* @__PURE__ */ new Map();
   doc2.descendants((node, pos) => {
     const commentMarks = node.marks?.filter((mark) => mark.type.name === CommentMarkName$1) || [];
     commentMarks.forEach((commentMark) => {
@@ -12937,9 +12971,21 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
       const { commentId } = attrs;
       if (commentId === "pending") return;
       if (seen.has(commentId)) return;
-      seen.add(commentId);
       const comment = commentMap.get(commentId);
-      const parentCommentId = comment?.parentCommentId;
+      const parentCommentId = getThreadingParentId(comment);
+      const trackedChangeMark = node.marks?.find((mark) => TRACK_CHANGE_MARKS$1.includes(mark.type.name));
+      const trackedChangeId = trackedChangeMark?.attrs?.id;
+      const trackedSpan = trackedChangeId ? trackedChangeSpanById.get(trackedChangeId) : null;
+      if (trackedSpan) {
+        trackedChangeCommentMeta.set(commentId, {
+          comment,
+          parentCommentId,
+          trackedChangeId
+        });
+        seen.add(commentId);
+        return;
+      }
+      seen.add(commentId);
       const commentStartNodeAttrs = getPreparedComment(commentMark.attrs);
       const startNode = schema.nodes.commentRangeStart.create(commentStartNodeAttrs);
       startNodes.push({
@@ -12955,7 +13001,7 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
         commentId,
         parentCommentId
       });
-      const childComments = comments.filter((c2) => c2.parentCommentId === commentId).sort((a, b2) => a.createdTime - b2.createdTime);
+      const childComments = comments.filter((c2) => getThreadingParentId(c2) === commentId).sort((a, b2) => a.createdTime - b2.createdTime);
       childComments.forEach((c2) => {
         if (seen.has(c2.commentId)) return;
         seen.add(c2.commentId);
@@ -12968,47 +13014,74 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
           pos,
           node: childStartNode,
           commentId: c2.commentId,
-          parentCommentId: c2.parentCommentId
+          parentCommentId: getThreadingParentId(c2)
         });
         const childEndNode = schema.nodes.commentRangeEnd.create(childMark);
         endNodes.push({
           pos: pos + node.nodeSize,
           node: childEndNode,
           commentId: c2.commentId,
-          parentCommentId: c2.parentCommentId
+          parentCommentId: getThreadingParentId(c2)
         });
       });
     });
-    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, b2) => a.createdTime - b2.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
-          });
-        });
-      }
-    }
   });
+  if (trackedChangeSpanById.size > 0) {
+    trackedChangeCommentMeta.forEach(({ comment, parentCommentId, trackedChangeId }) => {
+      if (!comment || !trackedChangeSpanById.has(trackedChangeId)) return;
+      const span = trackedChangeSpanById.get(trackedChangeId);
+      if (!span) return;
+      const childMark = getPreparedComment({
+        commentId: comment.commentId,
+        internal: comment.isInternal
+      });
+      const trackedMarks = trackedChangeMarksById.get(trackedChangeId) || {};
+      const startMarks = trackedMarks.insertMark ? [trackedMarks.insertMark] : trackedMarks.deleteMark ? [trackedMarks.deleteMark] : void 0;
+      const endMarks = trackedMarks.deleteMark ? [trackedMarks.deleteMark] : trackedMarks.insertMark ? [trackedMarks.insertMark] : void 0;
+      const childStartNode = schema.nodes.commentRangeStart.create(childMark, null, startMarks);
+      startNodes.push({
+        pos: span.startPos,
+        node: childStartNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+      const childEndNode = schema.nodes.commentRangeEnd.create(childMark, null, endMarks);
+      endNodes.push({
+        pos: span.endPos,
+        node: childEndNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+    });
+    comments.filter((comment) => trackedChangeSpanById.has(comment.parentCommentId) && !comment.trackedChange).sort((a, b2) => a.createdTime - b2.createdTime).forEach((comment) => {
+      if (seen.has(comment.commentId)) return;
+      seen.add(comment.commentId);
+      const span = trackedChangeSpanById.get(comment.parentCommentId);
+      if (!span) return;
+      const childMark = getPreparedComment({
+        commentId: comment.commentId,
+        internal: comment.isInternal
+      });
+      const parentCommentId = getThreadingParentId(comment);
+      const trackedMarks = trackedChangeMarksById.get(comment.parentCommentId) || {};
+      const startMarks = trackedMarks.insertMark ? [trackedMarks.insertMark] : trackedMarks.deleteMark ? [trackedMarks.deleteMark] : void 0;
+      const endMarks = trackedMarks.deleteMark ? [trackedMarks.deleteMark] : trackedMarks.insertMark ? [trackedMarks.insertMark] : void 0;
+      const childStartNode = schema.nodes.commentRangeStart.create(childMark, null, startMarks);
+      startNodes.push({
+        pos: span.startPos,
+        node: childStartNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+      const childEndNode = schema.nodes.commentRangeEnd.create(childMark, null, endMarks);
+      endNodes.push({
+        pos: span.endPos,
+        node: childEndNode,
+        commentId: comment.commentId,
+        parentCommentId
+      });
+    });
+  }
   startNodes.sort((a, b2) => {
     if (a.pos !== b2.pos) return a.pos - b2.pos;
     const aIsParentOfB = a.commentId === b2.parentCommentId;
@@ -15771,7 +15844,7 @@ const canUseDOM = () => {
     return false;
   }
 };
-const summaryVersion = "1.7.0-next.8";
+const summaryVersion = "1.7.0-next.9";
 const nodeKeys = ["group", "content", "marks", "inline", "atom", "defining", "code", "tableRole", "summary"];
 const markKeys = ["group", "inclusive", "excludes", "spanning", "code"];
 function mapAttributes(attrs) {
@@ -18064,19 +18137,22 @@ class Editor extends EventEmitter {
       }
       if (comments.length) {
         const commentsXml = this.converter.schemaToXml(this.converter.convertedXml["word/comments.xml"].elements[0]);
-        const commentsExtendedXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsExtended.xml"].elements[0]
-        );
-        const commentsExtensibleXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsExtensible.xml"].elements[0]
-        );
-        const commentsIdsXml = this.converter.schemaToXml(
-          this.converter.convertedXml["word/commentsIds.xml"].elements[0]
-        );
         updatedDocs["word/comments.xml"] = String(commentsXml);
-        updatedDocs["word/commentsExtended.xml"] = String(commentsExtendedXml);
-        updatedDocs["word/commentsExtensible.xml"] = String(commentsExtensibleXml);
-        updatedDocs["word/commentsIds.xml"] = String(commentsIdsXml);
+        const commentsExtended = this.converter.convertedXml["word/commentsExtended.xml"];
+        if (commentsExtended?.elements?.[0]) {
+          const commentsExtendedXml = this.converter.schemaToXml(commentsExtended.elements[0]);
+          updatedDocs["word/commentsExtended.xml"] = String(commentsExtendedXml);
+        }
+        const commentsExtensible = this.converter.convertedXml["word/commentsExtensible.xml"];
+        if (commentsExtensible?.elements?.[0]) {
+          const commentsExtensibleXml = this.converter.schemaToXml(commentsExtensible.elements[0]);
+          updatedDocs["word/commentsExtensible.xml"] = String(commentsExtensibleXml);
+        }
+        const commentsIds = this.converter.convertedXml["word/commentsIds.xml"];
+        if (commentsIds?.elements?.[0]) {
+          const commentsIdsXml = this.converter.schemaToXml(commentsIds.elements[0]);
+          updatedDocs["word/commentsIds.xml"] = String(commentsIdsXml);
+        }
       }
       const zipper = new DocxZipper();
       if (getUpdatedDocs) {
@@ -18438,7 +18514,7 @@ class Editor extends EventEmitter {
    * Process collaboration migrations
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.8");
+    console.debug("[checkVersionMigrations] Current editor version", "1.7.0-next.9");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");