oasis-editor 0.0.12 → 0.0.13

package/dist/{OasisEditorApp-DsSNl4Fj.js → OasisEditorApp-DYcAe_1n.js}

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { n as normalizeSelection, g as getParagraphs, c as createEditorParagraphFromRuns, a as getParagraphLength, b as createEditorRun, d as getDocumentSections, e as createEditorStyledRun, f as getParagraphText, h as getActiveZone, i as getActiveSectionIndex, p as positionToParagraphOffset, j as paragraphOffsetToPosition, k as clampPosition, l as findParagraphIndex, m as createCollapsedSelection, o as isSelectionCollapsed, q as createEditorParagraph, r as getBlockParagraphs, s as findParagraphTableLocation, t as buildTableCellLayout, u as createEditorTableCell, v as createEditorTable, w as createEditorTableRow, x as underlineStyleToCssDecorationStyle, y as resolveImageSrc, z as createEditorFootnote, A as createFootnoteReferenceRun, B as renumberFootnotes, C as iterateFootnoteReferenceRuns, D as getFootnoteDisplayMarker, E as createSignal, F as createEffect, G as onCleanup, H as buildCanvasLayoutSnapshot, I as on, J as onMount, K as debounce, L as unwrap, M as getDocumentParagraphs, N as getDocumentSectionsCanonical, O as createEditorDocument, P as getPageContentWidth, Q as getDocumentPageSettings, R as getTableCellContentWidthForParagraph, S as resolveResizedDimensions, T as resolveTextBoxRenderHeight, U as resolveEffectiveParagraphStyle, V as resolveEffectiveTextStyleForParagraph, W as iterateEndnoteReferenceRuns, X as JSZip, Y as imageContentTypeDefaults, Z as imageExtensionFromMime, _ as pxToPt$1, $ as buildSegmentTable, a0 as buildCanvasTableLayout, a1 as resolveFloatingObjectRect, a2 as getTextBoxFloatingGeometry, a3 as getPresetPathSegments, a4 as projectBlocksLayout, a5 as textStyleToFontSizePt, a6 as PX_PER_POINT, a7 as DEFAULT_FONT_SIZE_PX, a8 as isDoubleUnderlineStyle, a9 as isWavyUnderlineStyle, aa as underlineStyleLineWidthPx, ab as underlineStyleDashArray, ac as getListLabelInset, ad as getParagraphBorderInsets, ae as normalizeFamily, af as ROBOTO_FONT_FILES, ag as loadFontAsset, ah as OFFICE_COMPAT_FONT_FAMILIES, ai as buildSfnt, aj as defaultFontDecoderRegistry, ak as SfntFontProgram, al as collectPdfFontFamilies, am as projectDocumentLayout, an as getPageHeaderZoneTop, ao as getPageBodyTop, ap as findFootnoteReference, aq as FOOTNOTE_MARKER_GUTTER_PX, ar as resolveImporterForFile, as as createEditorStateFromDocument, at as getDocumentParagraphsCanonical, au as getToolbarStyleState, av as STANDARD_FONT_SIZES_PT, aw as fontSizePxToPt, ax as probeLocalFontFamilies, ay as createInitialEditorState, az as parseFontSizePtToPx, aA as formatFontSizePt, aB as listKindForTag, aC as isParagraphTag, aD as collectInlineRuns, aE as parseParagraphStyle, aF as t, aG as preciseFontModeVersion, aH as isPreciseFontModeEnabled, aI as togglePreciseFontMode, aJ as nextFontSizePt, aK as previousFontSizePt, aL as fontSizePtToPx, aM as createDefaultToolbarPreset, aN as defaultMenuItems, aO as MenuRegistry, aP as createToolbarRegistry, aQ as Editor, aR as resolveCommandRef, aS as commandRefName, aT as InlineShell, aU as BalloonShell, aV as DocumentShell, aW as createMemo, aX as getCaretRectFromSnapshot, aY as getParagraphRectFromSnapshot, aZ as createComponent, a_ as CaretOverlay, a$ as Show, b0 as createRenderEffect, b1 as style, b2 as setAttribute, b3 as setStyleProperty, b4 as memo, b5 as template, b6 as insert, b7 as use, b8 as addEventListener, b9 as Dialog, ba as delegateEvents, bb as className, bc as For, bd as UNDERLINE_STYLE_OPTIONS, be as Tabs, bf as measureParagraphMinContentWidthPx, bg as getEditableBlocksForZone, bh as findParagraphLocation, bi as createSectionBoundaryParagraph, bj as normalizePageSettings, bk as DEFAULT_EDITOR_PAGE_SETTINGS, bl as markStart, bm as markEnd, bn as getParagraphEntries, bo as getParagraphById, bp as PluginUiHost, bq as OasisEditorEditor, br as perfTimer, bs as OasisBrandMark, bt as setPreciseFontPreference, bu as setWelcomeSeen, bv as enablePreciseFontMode, bw as createOasisEditorClient, bx as setLocale, by as startLongTaskObserver, bz as installGlobalReport, bA as applyStoredPreciseFontPreference, bB as getWelcomeSeen, bC as isLocalFontAccessSupported, bD as EDITOR_SCROLL_PADDING_PX, bE as Toolbar, bF as OasisEditorLoading, bG as createEditorLogger, bH as getCachedCanvasImage, bI as registerDomStatsSurface } from "./index-BUOuw27s.js";
+import { n as normalizeSelection, g as getParagraphs, c as createEditorParagraphFromRuns, a as getParagraphLength, b as createEditorRun, d as getDocumentSections, e as createEditorStyledRun, f as getParagraphText, h as getActiveZone, i as getActiveSectionIndex, p as positionToParagraphOffset, j as paragraphOffsetToPosition, k as clampPosition, l as findParagraphIndex, m as createCollapsedSelection, o as isSelectionCollapsed, q as createEditorParagraph, r as getBlockParagraphs, s as findParagraphTableLocation, t as buildTableCellLayout, u as createEditorTableCell, v as createEditorTable, w as createEditorTableRow, x as underlineStyleToCssDecorationStyle, y as resolveImageSrc, z as createEditorFootnote, A as createFootnoteReferenceRun, B as renumberFootnotes, C as iterateFootnoteReferenceRuns, D as getFootnoteDisplayMarker, E as createSignal, F as createEffect, G as onCleanup, H as buildCanvasLayoutSnapshot, I as on, J as onMount, K as debounce, L as unwrap, M as getDocumentParagraphs, N as getDocumentSectionsCanonical, O as createEditorDocument, P as getPageContentWidth, Q as getDocumentPageSettings, R as getTableCellContentWidthForParagraph, S as resolveResizedDimensions, T as resolveTextBoxRenderHeight, U as resolveEffectiveParagraphStyle, V as resolveEffectiveTextStyleForParagraph, W as iterateEndnoteReferenceRuns, X as JSZip, Y as imageContentTypeDefaults, Z as imageExtensionFromMime, _ as pxToPt$1, $ as buildSegmentTable, a0 as buildCanvasTableLayout, a1 as resolveFloatingObjectRect, a2 as getTextBoxFloatingGeometry, a3 as getPresetPathSegments, a4 as projectBlocksLayout, a5 as textStyleToFontSizePt, a6 as PX_PER_POINT, a7 as DEFAULT_FONT_SIZE_PX, a8 as isDoubleUnderlineStyle, a9 as isWavyUnderlineStyle, aa as underlineStyleLineWidthPx, ab as underlineStyleDashArray, ac as getListLabelInset, ad as getParagraphBorderInsets, ae as normalizeFamily, af as ROBOTO_FONT_FILES, ag as loadFontAsset, ah as OFFICE_COMPAT_FONT_FAMILIES, ai as buildSfnt, aj as defaultFontDecoderRegistry, ak as SfntFontProgram, al as collectPdfFontFamilies, am as projectDocumentLayout, an as getPageHeaderZoneTop, ao as getPageBodyTop, ap as findFootnoteReference, aq as FOOTNOTE_MARKER_GUTTER_PX, ar as resolveImporterForFile, as as createEditorStateFromDocument, at as getDocumentParagraphsCanonical, au as getToolbarStyleState, av as STANDARD_FONT_SIZES_PT, aw as fontSizePxToPt, ax as probeLocalFontFamilies, ay as createInitialEditorState, az as parseFontSizePtToPx, aA as formatFontSizePt, aB as listKindForTag, aC as isParagraphTag, aD as collectInlineRuns, aE as parseParagraphStyle, aF as t, aG as preciseFontModeVersion, aH as isPreciseFontModeEnabled, aI as togglePreciseFontMode, aJ as nextFontSizePt, aK as previousFontSizePt, aL as fontSizePtToPx, aM as createDefaultToolbarPreset, aN as defaultMenuItems, aO as MenuRegistry, aP as createToolbarRegistry, aQ as Editor, aR as resolveCommandRef, aS as commandRefName, aT as InlineShell, aU as BalloonShell, aV as DocumentShell, aW as createMemo, aX as getCaretRectFromSnapshot, aY as getParagraphRectFromSnapshot, aZ as createComponent, a_ as CaretOverlay, a$ as Show, b0 as createRenderEffect, b1 as style, b2 as setAttribute, b3 as setStyleProperty, b4 as memo, b5 as template, b6 as insert, b7 as use, b8 as addEventListener, b9 as Dialog, ba as delegateEvents, bb as className, bc as For, bd as UNDERLINE_STYLE_OPTIONS, be as Tabs, bf as measureParagraphMinContentWidthPx, bg as getEditableBlocksForZone, bh as findParagraphLocation, bi as createSectionBoundaryParagraph, bj as normalizePageSettings, bk as DEFAULT_EDITOR_PAGE_SETTINGS, bl as markStart, bm as markEnd, bn as getParagraphEntries, bo as getParagraphById, bp as PluginUiHost, bq as OasisEditorEditor, br as perfTimer, bs as OasisBrandMark, bt as setPreciseFontPreference, bu as setWelcomeSeen, bv as enablePreciseFontMode, bw as createOasisEditorClient, bx as setLocale, by as startLongTaskObserver, bz as installGlobalReport, bA as applyStoredPreciseFontPreference, bB as getWelcomeSeen, bC as isLocalFontAccessSupported, bD as EDITOR_SCROLL_PADDING_PX, bE as Toolbar, bF as OasisEditorLoading, bG as createEditorLogger, bH as getCachedCanvasImage, bI as registerDomStatsSurface } from "./index-CWev1Jg0.js";
 function getSelectedObjectRun(state, predicate) {
   const normalized = normalizeSelection(state);
   if (normalized.isCollapsed || normalized.startIndex !== normalized.endIndex || normalized.endParagraphOffset - normalized.startParagraphOffset !== 1) {
@@ -5392,6 +5392,63 @@ function computeCanvasSelectionGeometry(snapshot, state) {
     selectedTextBoxBox
   };
 }
+function computeCommentHighlights(snapshot, state) {
+  const registry = state.document.comments;
+  if (!registry || registry.order.length === 0) {
+    return [];
+  }
+  const surfaceRect = snapshot.surfaceRect;
+  const paragraphIndexById = new Map(
+    getParagraphs(state).map(
+      (paragraph, index) => [paragraph.id, index]
+    )
+  );
+  const boxes = [];
+  for (const id of registry.order) {
+    const comment = registry.items[id];
+    if (!(comment == null ? void 0 : comment.start) || !(comment == null ? void 0 : comment.end)) {
+      continue;
+    }
+    const startIndex = paragraphIndexById.get(comment.start.paragraphId);
+    const endIndex = paragraphIndexById.get(comment.end.paragraphId);
+    if (startIndex === void 0 || endIndex === void 0) {
+      continue;
+    }
+    for (const segment of snapshot.paragraphs) {
+      const segmentIndex = paragraphIndexById.get(segment.paragraphId);
+      if (segmentIndex === void 0 || segmentIndex < startIndex || segmentIndex > endIndex) {
+        continue;
+      }
+      const rangeStart = segmentIndex === startIndex ? comment.start.offset : 0;
+      const rangeEnd = segmentIndex === endIndex ? comment.end.offset : Number.POSITIVE_INFINITY;
+      const segStart = Math.max(rangeStart, segment.startOffset);
+      const segEnd = Math.min(rangeEnd, segment.endOffset);
+      if (segStart >= segEnd) {
+        continue;
+      }
+      for (const line of segment.lines) {
+        const lineStart = Math.max(segStart, line.startOffset);
+        const lineEnd = Math.min(segEnd, line.endOffset);
+        if (lineStart >= lineEnd) {
+          continue;
+        }
+        const startSlot = line.slots.find((slot) => slot.offset === lineStart);
+        const endSlot = line.slots.find((slot) => slot.offset === lineEnd) ?? line.slots[line.slots.length - 1];
+        if (!startSlot || !endSlot) {
+          continue;
+        }
+        boxes.push({
+          commentId: id,
+          left: startSlot.left - surfaceRect.left,
+          top: line.top - surfaceRect.top,
+          width: Math.max(1, endSlot.left - startSlot.left),
+          height: line.height
+        });
+      }
+    }
+  }
+  return boxes;
+}
 function scheduleFrame(callback) {
   if (typeof window !== "undefined" && typeof window.requestAnimationFrame === "function") {
     return window.requestAnimationFrame(() => callback());
@@ -5417,6 +5474,7 @@ function useEditorLayout(props) {
     height: 28
   });
   const [selectionBoxes, setSelectionBoxes] = createSignal([]);
+  const [commentHighlights, setCommentHighlights] = createSignal([]);
   const [selectedImageBox, setSelectedImageBox] = createSignal(null);
   const [selectedTextBoxBox, setSelectedTextBoxBox] = createSignal(null);
   const [caretBox, setCaretBox] = createSignal({
@@ -5433,6 +5491,7 @@ function useEditorLayout(props) {
     const surface = props.surfaceRef();
     if (!surface) {
       setSelectionBoxes([]);
+      setCommentHighlights([]);
       setSelectedImageBox(null);
       setSelectedTextBoxBox(null);
       setCaretBox((current) => ({ ...current, visible: false }));
@@ -5446,6 +5505,7 @@ function useEditorLayout(props) {
     });
     if (!snapshot) {
       setSelectionBoxes([]);
+      setCommentHighlights([]);
       setSelectedImageBox(null);
       setSelectedTextBoxBox(null);
       setCaretBox((current) => ({ ...current, visible: false }));
@@ -5453,6 +5513,7 @@ function useEditorLayout(props) {
     }
     const geometry = computeCanvasSelectionGeometry(snapshot, props.state);
     setSelectionBoxes(geometry.selectionBoxes);
+    setCommentHighlights(computeCommentHighlights(snapshot, props.state));
     setSelectedImageBox(geometry.selectedImageBox);
     setSelectedTextBoxBox(geometry.selectedTextBoxBox);
     setInputBox(geometry.inputBox);
@@ -5552,6 +5613,7 @@ function useEditorLayout(props) {
     measuredParagraphLayouts,
     inputBox,
     selectionBoxes,
+    commentHighlights,
     selectedImageBox,
     selectedTextBoxBox,
     caretBox,
@@ -7787,6 +7849,105 @@ function serializeBookmarkEvent(event) {
     event.name ?? ""
   )}"${col}/>`;
 }
+const WORD15_NS = "http://schemas.microsoft.com/office/word/2012/wordml";
+function buildCommentExportPlan(document2) {
+  const registry = document2.comments;
+  if (!registry || registry.order.length === 0) {
+    return void 0;
+  }
+  const assignedId = /* @__PURE__ */ new Map();
+  const used = /* @__PURE__ */ new Set();
+  for (const id of registry.order) {
+    const c = registry.items[id];
+    if (!c) continue;
+    const hint = c.docxIdHint;
+    if (hint !== void 0 && hint >= 0 && !used.has(hint)) {
+      assignedId.set(id, hint);
+      used.add(hint);
+    }
+  }
+  let next = 0;
+  for (const id of registry.order) {
+    if (assignedId.has(id)) continue;
+    while (used.has(next)) next += 1;
+    assignedId.set(id, next);
+    used.add(next);
+    next += 1;
+  }
+  const eventsByParagraph = /* @__PURE__ */ new Map();
+  const push = (paragraphId, event) => {
+    const list = eventsByParagraph.get(paragraphId);
+    if (list) {
+      list.push(event);
+    } else {
+      eventsByParagraph.set(paragraphId, [event]);
+    }
+  };
+  const comments = [];
+  registry.order.forEach((id, index) => {
+    const comment = registry.items[id];
+    if (!comment) return;
+    const wId = assignedId.get(id);
+    const paraId = (1073741824 + index).toString(16).toUpperCase();
+    comments.push({ comment, wId, paraId });
+    if (comment.start) {
+      push(comment.start.paragraphId, {
+        kind: "start",
+        offset: comment.start.offset,
+        seq: comment.start.seq ?? 0,
+        wId
+      });
+    }
+    if (comment.end) {
+      push(comment.end.paragraphId, {
+        kind: "end",
+        offset: comment.end.offset,
+        seq: comment.end.seq ?? 0,
+        wId
+      });
+      push(comment.end.paragraphId, {
+        kind: "reference",
+        offset: comment.end.offset,
+        seq: (comment.end.seq ?? 0) + 0.5,
+        wId
+      });
+    }
+  });
+  return { eventsByParagraph, comments };
+}
+function serializeCommentRangeEvent(event) {
+  switch (event.kind) {
+    case "start":
+      return `<w:commentRangeStart w:id="${event.wId}"/>`;
+    case "end":
+      return `<w:commentRangeEnd w:id="${event.wId}"/>`;
+    case "reference":
+      return `<w:r><w:commentReference w:id="${event.wId}"/></w:r>`;
+  }
+}
+const COMMENTS_XMLNS = `xmlns:w="${WORD_NS$1}" xmlns:w14="${WORD14_NS}" xmlns:w15="${WORD15_NS}"`;
+function serializeCommentBody(text) {
+  const lines = text.split("\n");
+  const runs = lines.map((line, i) => {
+    const brk = i > 0 ? "<w:br/>" : "";
+    return `${brk}<w:t xml:space="preserve">${escapeXml(line)}</w:t>`;
+  }).join("");
+  return `<w:r>${runs}</w:r>`;
+}
+function buildCommentsPartXml(plan) {
+  const body = plan.comments.map(({ comment, wId, paraId }) => {
+    const dateAttr = comment.date !== void 0 ? ` w:date="${new Date(comment.date).toISOString().replace(/\.\d{3}Z$/, "Z")}"` : "";
+    const initialsAttr = comment.initials ? ` w:initials="${escapeXml(comment.initials)}"` : "";
+    return `<w:comment w:id="${wId}" w:author="${escapeXml(comment.author)}"${dateAttr}${initialsAttr}><w:p w14:paraId="${paraId}">${serializeCommentBody(comment.text)}</w:p></w:comment>`;
+  }).join("");
+  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:comments ${COMMENTS_XMLNS}>${body}</w:comments>`;
+}
+function buildCommentsExtendedPartXml(plan) {
+  const body = plan.comments.map(
+    ({ comment, paraId }) => `<w15:commentEx w15:paraId="${paraId}" w15:done="${comment.resolved ? "1" : "0"}"/>`
+  ).join("");
+  return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w15:commentsEx ${COMMENTS_XMLNS}>${body}</w15:commentsEx>`;
+}
 function serializeDocxBorderAttrs(border, colorFallback = "000000") {
   if (border.type === "none" || border.width <= 0) {
     return 'w:val="nil"/>';
@@ -8958,8 +9119,8 @@ function stripRpr(rPr) {
 function isSplittableTextRun(run) {
   return !run.image && !run.textBox && !run.field && !run.fieldChar && run.fieldInstruction === void 0 && !run.footnoteReference && !run.endnoteReference;
 }
-function serializeRunsWithBookmarks(runs, events, context, paragraphStyleId, styles) {
-  const sorted = [...events].sort(
+function serializeRunsWithBoundaries(runs, tokens, context, paragraphStyleId, styles) {
+  const sorted = [...tokens].sort(
     (a, b) => a.offset - b.offset || a.seq - b.seq
   );
   let ei = 0;
@@ -8967,7 +9128,7 @@ function serializeRunsWithBookmarks(runs, events, context, paragraphStyleId, sty
   let out = "";
   const flushUpTo = (limit) => {
     while (ei < sorted.length && sorted[ei].offset <= limit) {
-      out += serializeBookmarkEvent(sorted[ei]);
+      out += sorted[ei].xml;
       ei += 1;
     }
   };
@@ -8978,21 +9139,21 @@ function serializeRunsWithBookmarks(runs, events, context, paragraphStyleId, sty
     if (isSplittableTextRun(run) && run.text.length > 0) {
       let cursor = runStart;
       while (ei < sorted.length && sorted[ei].offset < runEnd) {
-        const event = sorted[ei];
-        if (event.offset > cursor) {
+        const token = sorted[ei];
+        if (token.offset > cursor) {
           out += serializeRunWithRelationships(
             {
               ...run,
-              text: run.text.slice(cursor - runStart, event.offset - runStart)
+              text: run.text.slice(cursor - runStart, token.offset - runStart)
             },
             context,
             paragraphStyleId,
             styles
           );
         }
-        out += serializeBookmarkEvent(event);
+        out += token.xml;
         ei += 1;
-        cursor = event.offset;
+        cursor = token.offset;
       }
       if (cursor < runEnd) {
         out += serializeRunWithRelationships(
@@ -9034,15 +9195,28 @@ function serializeBlocksXml(blocks, context, styles) {
   }).join("");
 }
 function serializeParagraphXml(paragraph, context, styles, overrides) {
-  var _a, _b;
+  var _a, _b, _c;
   const runs = paragraph.runs.length > 0 ? paragraph.runs : [{ id: "", text: "" }];
   const dropCapFrame = paragraph.dropCap ? serializeDropCapFrameParagraph(paragraph.dropCap) : "";
   const bookmarkEvents = (_a = context.bookmarkEventsByParagraph) == null ? void 0 : _a.get(paragraph.id);
-  const runsXml = bookmarkEvents && bookmarkEvents.length > 0 ? serializeRunsWithBookmarks(
+  const commentEvents = (_b = context.commentEventsByParagraph) == null ? void 0 : _b.get(paragraph.id);
+  const boundaryTokens = [
+    ...(bookmarkEvents ?? []).map((e) => ({
+      offset: e.offset,
+      seq: e.seq,
+      xml: serializeBookmarkEvent(e)
+    })),
+    ...(commentEvents ?? []).map((e) => ({
+      offset: e.offset,
+      seq: e.seq,
+      xml: serializeCommentRangeEvent(e)
+    }))
+  ];
+  const runsXml = boundaryTokens.length > 0 ? serializeRunsWithBoundaries(
     runs,
-    bookmarkEvents,
+    boundaryTokens,
     context,
-    (_b = paragraph.style) == null ? void 0 : _b.styleId,
+    (_c = paragraph.style) == null ? void 0 : _c.styleId,
     styles
   ) : runs.map(
     (run) => {
@@ -9579,19 +9753,19 @@ function buildHeaderFooterXml(kind, blocks, context, styles) {
   const tag = kind === "header" ? "hdr" : "ftr";
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><w:${tag} ${DOCUMENT_XMLNS}>${serializeBlocksXml(blocks, context, styles)}</w:${tag}>`;
 }
-function buildContentTypesXml(hasNumbering, imageExtensions, hasSettings, parts, hasFootnotes, hasEndnotes, hasStyles) {
+function buildContentTypesXml(hasNumbering, imageExtensions, hasSettings, parts, hasFootnotes, hasEndnotes, hasStyles, hasComments) {
   const overrides = parts.map((part) => {
     const contentType = part.kind === "header" ? "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml" : "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml";
     return `<Override PartName="/word/${part.path}" ContentType="${contentType}"/>`;
   }).join("");
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types"><Default Extension="rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/><Default Extension="xml" ContentType="application/xml"/>${imageContentTypeDefaults(
     imageExtensions
-  )}<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>${hasStyles ? '<Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>' : ""}${hasNumbering ? '<Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>' : ""}${hasSettings ? '<Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>' : ""}${hasFootnotes ? '<Override PartName="/word/footnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>' : ""}${hasEndnotes ? '<Override PartName="/word/endnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"/>' : ""}${overrides}</Types>`;
+  )}<Override PartName="/word/document.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"/>${hasStyles ? '<Override PartName="/word/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"/>' : ""}${hasNumbering ? '<Override PartName="/word/numbering.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml"/>' : ""}${hasSettings ? '<Override PartName="/word/settings.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"/>' : ""}${hasFootnotes ? '<Override PartName="/word/footnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>' : ""}${hasEndnotes ? '<Override PartName="/word/endnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"/>' : ""}${hasComments ? '<Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"/><Override PartName="/word/commentsExtended.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.commentsExtended+xml"/>' : ""}${overrides}</Types>`;
 }
 function buildRootRelationshipsXml() {
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="${PACKAGE_REL_NS}"><Relationship Id="rId1" Type="${OFFICE_REL_NS}/officeDocument" Target="word/document.xml"/></Relationships>`;
 }
-function buildDocumentRelationshipsXml(hasNumbering, hasSettings, images, hyperlinks, parts, hasFootnotes, hasEndnotes, hasStyles) {
+function buildDocumentRelationshipsXml(hasNumbering, hasSettings, images, hyperlinks, parts, hasFootnotes, hasEndnotes, hasStyles, hasComments) {
   let rels = "";
   if (hasStyles)
     rels += `<Relationship Id="rIdStyles" Type="${OFFICE_REL_NS}/styles" Target="styles.xml"/>`;
@@ -9616,6 +9790,10 @@ function buildDocumentRelationshipsXml(hasNumbering, hasSettings, images, hyperl
   if (hasEndnotes) {
     rels += `<Relationship Id="rIdEndnotes" Type="${OFFICE_REL_NS}/endnotes" Target="endnotes.xml"/>`;
   }
+  if (hasComments) {
+    rels += `<Relationship Id="rIdComments" Type="${OFFICE_REL_NS}/comments" Target="comments.xml"/>`;
+    rels += `<Relationship Id="rIdCommentsExtended" Type="http://schemas.microsoft.com/office/2011/relationships/commentsExtended" Target="commentsExtended.xml"/>`;
+  }
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?><Relationships xmlns="${PACKAGE_REL_NS}">${rels}</Relationships>`;
 }
 function buildSettingsXml(hasEvenAndOddHeaders, defaultTabStop, footnoteSettings, endnoteSettings) {
@@ -9703,6 +9881,9 @@ async function exportEditorDocumentToDocx(document2) {
   bodyContext.endnoteIdMap = endnoteIdMap;
   const bookmarkEvents = buildBookmarkExportPlan(document2);
   bodyContext.bookmarkEventsByParagraph = bookmarkEvents;
+  const commentPlan = buildCommentExportPlan(document2);
+  bodyContext.commentEventsByParagraph = commentPlan == null ? void 0 : commentPlan.eventsByParagraph;
+  const hasComments = commentPlan !== void 0;
   const parts = [];
   const sectionReferences = sections.map(
     () => ({})
@@ -9728,6 +9909,7 @@ async function exportEditorDocumentToDocx(document2) {
       context.footnoteIdMap = footnoteIdMap;
       context.endnoteIdMap = endnoteIdMap;
       context.bookmarkEventsByParagraph = bookmarkEvents;
+      context.commentEventsByParagraph = commentPlan == null ? void 0 : commentPlan.eventsByParagraph;
       parts.push({
         kind,
         type,
@@ -9801,7 +9983,8 @@ async function exportEditorDocumentToDocx(document2) {
       parts,
       hasFootnotes,
       hasEndnotes,
-      hasStyles
+      hasStyles,
+      hasComments
     )
   );
   zip.file("_rels/.rels", buildRootRelationshipsXml());
@@ -9818,7 +10001,7 @@ async function exportEditorDocumentToDocx(document2) {
       buildNumberingXml(numberingContext.definitions)
     );
   }
-  if (hasStyles || hasNumbering || hasDocumentSettings || bodyContext.images.length > 0 || bodyContext.hyperlinks.length > 0 || parts.length > 0 || hasFootnotes || hasEndnotes) {
+  if (hasStyles || hasNumbering || hasDocumentSettings || bodyContext.images.length > 0 || bodyContext.hyperlinks.length > 0 || parts.length > 0 || hasFootnotes || hasEndnotes || hasComments) {
     zip.file(
       "word/_rels/document.xml.rels",
       buildDocumentRelationshipsXml(
@@ -9829,7 +10012,8 @@ async function exportEditorDocumentToDocx(document2) {
         parts,
         hasFootnotes,
         hasEndnotes,
-        hasStyles
+        hasStyles,
+        hasComments
       )
     );
   }
@@ -9885,6 +10069,13 @@ async function exportEditorDocumentToDocx(document2) {
       );
     }
   }
+  if (commentPlan) {
+    zip.file("word/comments.xml", buildCommentsPartXml(commentPlan));
+    zip.file(
+      "word/commentsExtended.xml",
+      buildCommentsExtendedPartXml(commentPlan)
+    );
+  }
   for (const img of allImages) {
     if (img.kind === "embedded" && img.base64) {
       zip.file(`word/${img.target}`, img.base64, { base64: true });
@@ -45698,6 +45889,7 @@ function buildEditorViewProps(ctx) {
   };
   const overlays = {
     selectionBoxes: ctx.selectionBoxes,
+    commentHighlights: ctx.commentHighlights,
     selectedImageBox: ctx.selectedImageBox,
     selectedTextBoxBox: ctx.selectedTextBoxBox,
     layoutOptions: ctx.layoutOptions,
@@ -46141,6 +46333,7 @@ function OasisEditorApp(props = {}) {
     measuredParagraphLayouts,
     inputBox,
     selectionBoxes,
+    commentHighlights,
     selectedImageBox,
     selectedTextBoxBox,
     caretBox,
@@ -46661,6 +46854,7 @@ function OasisEditorApp(props = {}) {
     className: ui().class,
     style: ui().style,
     selectionBoxes,
+    commentHighlights,
     selectedImageBox,
     selectedTextBoxBox,
     layoutOptions: layoutOptionsOverlay,

package/dist/app/controllers/useEditorLayout.d.ts

@@ -1,5 +1,5 @@
 import { EditorLayoutParagraph, EditorState } from '../../../../core/model.js';
-import { CaretBox, InputBox, SelectionBox } from '../../../../ui/editorUiTypes.js';
+import { CaretBox, CommentHighlightBox, InputBox, SelectionBox } from '../../../../ui/editorUiTypes.js';
 import { SelectedImageSelectionBox, SelectedTextBoxSelectionBox } from '../../../../ui/canvas/CanvasSelectionGeometry.js';
 
 interface UseEditorLayoutProps {
@@ -19,6 +19,7 @@ export declare function useEditorLayout(props: UseEditorLayoutProps): {
     measuredParagraphLayouts: import('../../solid-js').Accessor<Record<string, EditorLayoutParagraph>>;
     inputBox: import('../../solid-js').Accessor<InputBox>;
     selectionBoxes: import('../../solid-js').Accessor<SelectionBox[]>;
+    commentHighlights: import('../../solid-js').Accessor<CommentHighlightBox[]>;
     selectedImageBox: import('../../solid-js').Accessor<SelectedImageSelectionBox | null>;
     selectedTextBoxBox: import('../../solid-js').Accessor<SelectedTextBoxSelectionBox | null>;
     caretBox: import('../../solid-js').Accessor<CaretBox>;