ooxml-ui 0.31.0 → 1.1.0

package/dist/docx.js

@@ -1,13 +1,14 @@
-import { defineSmartArt } from './chunk-XDUYS4KK.js';
+import { defineSmartArt } from './chunk-BEN3453I.js';
 import { shadcnBridge } from './chunk-X7RINDJQ.js';
-import { createRibbonOverflow, defineRibbon, defineDialog, defineSearchField, defineSwitch, defineTitleBar, defineBackstage, defineStatusBar, defineZoomSlider, defineContextMenu, runKeyTips, assignKeyTips } from './chunk-2QW4QE56.js';
-import { registerIcon } from './chunk-HZ422LTR.js';
-import './chunk-OXKWNNNJ.js';
-import './chunk-ZV2Z4IWH.js';
+import { createRibbonOverflow, defineRibbon, defineDialog, defineSearchField, defineSwitch, defineTitleBar, defineBackstage, defineStatusBar, defineZoomSlider, defineContextMenu, runKeyTips, assignKeyTips } from './chunk-M5DTJSOV.js';
+import { registerIcon } from './chunk-BOX43CZD.js';
+import './chunk-3FPW7M6U.js';
+import './chunk-USDLALB5.js';
 import './chunk-JFJXBYRD.js';
-import { resolveRunFormatting, createDocument, saveDocx, sectionsFromLayout, sectionLayoutJson, sectionsOf, pageSizeOf, columnPreset, applyPageSetup, withSection, computeListLabels, numberNotesInOrder, tocEntries, tableOfFiguresInstruction, findTableOfContents, ensureListDefinition, resolveNumberingLevel, equalColumnDraft, readColumnDraft, PAGE_SIZE_OPTIONS, PAGE_SIZES, readPageSetup, isRunHiddenForReview, resolveTableStyleFormatting, resolveParagraphFormatting, displayListLabel, setTitlePage, setLineNumbering, setVerticalAlign, setPageNumbering, ST_NumberFormat, unequalColumnPreset, setColumns, setOrientation, setPageSize, setMargins, lineSpacingLabel, formatNoteNumber, reviewDocumentFormatting, reviewFormattingWarnings, listRevisions, plainText, tocHyperlinks, DEFAULT_TOC_INSTRUCTION, tocBookmarks, buildTableOfContents, tocCaptionLabel, twips as twips$1, signedTwips, formatListNumber, columnTextWidth, validColumnDraft, validatePageSetup, presetOf, LIGATURE_VALUES, isLigatures, reviewRunFormatting, reviewParagraphFormatting, resolveThemeColorReference, lineSpacingValue, transformCase, DEFAULT_TABLE_BORDERS, parseLineSpacingValue, twipsAttr, twipsFromPixels, headingLevel, isValidLanguageTag, WORD, isHeadingListKind, fieldName, lineSpacingOptions, changeColumnWidth, changeColumnGap, createListDefinition, linkStylesToList, headingListLevels, documentStats } from 'ooxml-core/docx';
+import { normalizeLocale, SUPPORTED_OFFICE_LOCALES, interpolate } from 'ooxml-core/i18n';
+import { createDocument, saveDocx, sectionsFromLayout, sectionLayoutJson, sectionsOf, pageSizeOf, columnPreset, applyPageSetup, withSection, computeListLabels, numberNotesInOrder, tocEntries, tableOfFiguresInstruction, findTableOfContents, ensureListDefinition, resolveNumberingLevel, equalColumnDraft, readColumnDraft, PAGE_SIZE_OPTIONS, PAGE_SIZES, readPageSetup, isRunHiddenForReview, resolveTableStyleFormatting, resolveParagraphFormatting, displayListLabel, setTitlePage, setLineNumbering, setVerticalAlign, setPageNumbering, ST_NumberFormat, unequalColumnPreset, setColumns, setOrientation, setPageSize, setMargins, lineSpacingLabel, formatNoteNumber, reviewDocumentFormatting, reviewFormattingWarnings, listRevisions, plainText, tocHyperlinks, DEFAULT_TOC_INSTRUCTION, tocBookmarks, buildTableOfContents, tocCaptionLabel, isFieldLocked, twips as twips$1, signedTwips, formatListNumber, columnTextWidth, validColumnDraft, validatePageSetup, presetOf, LIGATURE_VALUES, isLigatures, reviewRunFormatting, resolveRunFormatting, reviewParagraphFormatting, resolveThemeColorReference, lineSpacingValue, isStHighlightColor, transformCase, DEFAULT_TABLE_BORDERS, parseLineSpacingValue, twipsAttr, twipsFromPixels, headingLevel, isValidLanguageTag, WORD, isHeadingListKind, fieldName, lineSpacingOptions, halfPointsFromPoints, changeColumnWidth, changeColumnGap, createListDefinition, linkStylesToList, headingListLevels, documentStats } from 'ooxml-core/docx';
 import { Schema, DOMSerializer, Fragment } from 'prosemirror-model';
-import { markSpecs, imageNodeSpec, fieldMarkerNodeSpec, noteReferenceNodeSpec, pageBreakNodeSpec, tableCellStyle, tableStyle, expectDefined, paragraphBoxCss, themeToCssVars, lightTheme, darkTheme, appendInlineNode, normalizeThemeMode, applyThemeColors, refreshWordYjsPresence, normalizeRibbonActions, DirtyState, isWordYjsRemoteTransaction, REMOTE_TRANSACTION_META, repairCollaborativeDocumentIds, HEADER_FOOTER_INPUT, restoreSectionParts, CollaborationClient, createCollaborationIdGenerator, WordYjsCollaboration, sectionPartsJson, SectionPartsStep, fitZoomPercent, hasChangeAtCursor, hasAnyChange, commentIdsAtSelection, commentAnchors, countWords, fieldGuardPlugin, trackChangesPlugin, wordYjsPresencePlugin, placementClass, removeCommentAnchor, deleteComment, addComment, toggleTrackChanges, goToNextChange, goToPreviousChange, rejectAllChanges, acceptAllChanges, rejectChangeAtCursor, acceptChangeAtCursor, goToComment, sameJson, sameRuns, PARAGRAPH_KEEP_KEYS, paragraphFromAttrs, parseBordersJson, isNavigableHref, wordYjsPluginKey, setReviewRecordingPreferences, nodeNumbering, paragraphFormattingRevision, inlineNodeRun, formattingRevision, paragraphAttrs, resolveCellVisuals, themeDrawing, ribbonActionIdForLabel, ligatureCss as ligatureCss$1, wordYjsRedo, wordYjsUndo, runToInlineNodes as runToInlineNodes$1, backstageFocus, wordHighlightColors, ligatureStyle, swatchColor, cssBorderSide, resolveComment, replyToComment, CollaborationAuthority } from 'ooxml-core/docx/ui';
+import { markSpecs, imageNodeSpec, fieldMarkerNodeSpec, noteReferenceNodeSpec, pageBreakNodeSpec, hardBreakNodeSpec, commentHistoryAttributes, tableCellStyle, tableStyle, createToggleFormat, expectDefined, paragraphBoxCss, themeToCssVars, lightTheme, darkTheme, normalizeThemeMode, applyThemeColors, refreshWordYjsPresence, normalizeRibbonActions, DirtyState, isWordYjsRemoteTransaction, REMOTE_TRANSACTION_META, repairCollaborativeDocumentIds, HEADER_FOOTER_INPUT, restoreSectionParts, commentThreadsFromDoc, restoreNoteParts, CollaborationClient, createCollaborationIdGenerator, WordYjsCollaboration, sectionPartsJson, NotePartsStep, notePartsJson, SectionPartsStep, fitZoomPercent, hasChangeAtCursor, hasAnyChange, commentIdsAtSelection, commentAnchors, countWords, fieldGuardPlugin, trackChangesPlugin, wordYjsPresencePlugin, placementClass, removeCommentThread, removeCommentAnchor, deleteComment, updateCommentThreads, addComment, toggleTrackChanges, goToNextChange, goToPreviousChange, rejectAllChanges, acceptAllChanges, rejectChangeAtCursor, acceptChangeAtCursor, goToComment, appendInlineNode, sameJson, sameRuns, PARAGRAPH_KEEP_KEYS, paragraphFromAttrs, parseBordersJson, isNavigableHref, wordYjsPluginKey, setReviewRecordingPreferences, nodeNumbering, paragraphFormattingRevision, inlineNodeRun, formattingRevision, insertWordHardBreak, paragraphAttrs, resolveCellVisuals, themeDrawing, ribbonActionIdForLabel, removeWordLink, fieldResultRanges, wordLinkRangeAt, ligatureCss as ligatureCss$1, wordYjsRedo, wordYjsUndo, runToInlineNodes as runToInlineNodes$1, backstageFocus, applyRunFormattingPatch, clearDirectRunFormatting, applyWordLink, ligatureStyle, wordHighlightColors, swatchColor, cssBorderSide, deleteFieldSelection, resolveComment, replyToComment, CollaborationAuthority } from 'ooxml-core/docx/ui';
 export { CollaborationAuthority, CollaborationClient, RIBBON_ACTION_IDS, RIBBON_ACTION_LABELS, createCollaborationIdGenerator, darkTheme, isRibbonActionId, lightTheme, normalizeRibbonActions, repairCollaborativeDocumentIds, themeToCssVars } from 'ooxml-core/docx/ui';
 import { parseOmml, convertOmmlToLatex, convertOmmlToMathMl } from 'ooxml-core/math';
 import { PluginKey, EditorState, Plugin, NodeSelection, TextSelection, Selection } from 'prosemirror-state';
@@ -15,10 +16,10 @@ import { EditorView, Decoration, DecorationSet } from 'prosemirror-view';
 import { loadDocument } from 'ooxml-core/docx/load';
 import { closeHistory, undo, redo, history } from 'prosemirror-history';
 import { layoutDocumentModel, pageNumbers, createFakeMeasurer, ligatureCss, cssFontStack, pageNumberValues, sectionPageCounts, headerFooterForPage, tokenizeRun, paragraphFloats, floatPosition, placeTab, DEFAULT_FONT_SIZE_PT, fieldDisplayText } from 'ooxml-core/docx/layout';
-import { chainCommands, baseKeymap, toggleMark, selectAll, deleteSelection } from 'prosemirror-commands';
 import { sendableSteps, getVersion } from 'prosemirror-collab';
 import { sanitizeColor, sanitizeUserName, SequenceTracker, isValidId, classifyVersion, validateDisplayName } from 'ooxml-core/collab';
 import { keymap } from 'prosemirror-keymap';
+import { chainCommands, baseKeymap, selectAll } from 'prosemirror-commands';
 
 // src/docx/locales/columns.ts
 var enColumns = {
@@ -3949,30 +3950,17 @@ var zhCN = {
 
 // src/docx/localization-strings.ts
 var strings = { en, fr, de, es, "zh-CN": zhCN };
-var EDITOR_LOCALES = ["en", "fr", "de", "es", "zh-CN"];
+var EDITOR_LOCALES = SUPPORTED_OFFICE_LOCALES;
 
 // src/docx/localization.ts
 function normalizeEditorLocale(value) {
-  const parts = (value ?? "").trim().toLowerCase().split(/[-_]/);
-  switch (parts[0]) {
-    case "fr":
-    case "de":
-    case "es":
-      return parts[0];
-    case "zh":
-      return parts.some((part) => ["hant", "tw", "hk", "mo"].includes(part)) ? "en" : "zh-CN";
-    default:
-      return "en";
-  }
+  return normalizeLocale(value, EDITOR_LOCALES, "en");
 }
 function translate(locale, key2) {
   return strings[locale][key2] ?? strings.en[key2] ?? key2;
 }
 function translateTemplate(locale, key2, values2) {
-  return translate(locale, key2).replace(
-    /\{(\w+)\}/g,
-    (match, name) => name in values2 ? String(values2[name]) : match
-  );
+  return interpolate(translate(locale, key2), values2);
 }
 function translateDynamic(locale, text) {
   if (locale === "en") return text;
@@ -4182,7 +4170,9 @@ var schema = new Schema({
         endnoteNumFmt: { default: null },
         /** Section layout (no header/footer content) as JSON, so page setup is undoable. */
         sections: { default: null },
-        sectionParts: { default: null }
+        sectionParts: { default: null },
+        noteParts: { default: null },
+        ...commentHistoryAttributes
       }
     },
     paragraph: {
@@ -4282,15 +4272,7 @@ var schema = new Schema({
       ]
     },
     text: { group: "inline" },
-    hardBreak: {
-      group: "inline",
-      inline: true,
-      atom: true,
-      selectable: false,
-      leafText: () => "\n",
-      parseDOM: [{ tag: "br" }],
-      toDOM: () => ["br"]
-    },
+    hardBreak: hardBreakNodeSpec,
     pageBreak: pageBreakNodeSpec,
     noteReference: noteReferenceNodeSpec,
     fieldMarker: fieldMarkerNodeSpec,
@@ -4634,6 +4616,8 @@ function modelToDoc(model) {
       marginLeft: model.page.marginLeft,
       sections: model.sections ? sectionLayoutJson(model.sections) : null,
       sectionParts: sectionPartsJson(model.sections),
+      noteParts: notePartsJson(model),
+      commentThreads: JSON.stringify(model.comments ?? []),
       evenAndOddHeaders: Boolean(model.evenAndOddHeaders),
       trackChanges: Boolean(model.trackChanges),
       trackFormatting: model.trackFormatting !== false,
@@ -4722,6 +4706,9 @@ function docToModel(doc, prior) {
   });
   const {
     sections: priorSections,
+    footnotes: priorFootnotes,
+    endnotes: priorEndnotes,
+    comments: priorComments,
     evenAndOddHeaders: _evenOdd,
     trackChanges: _trackChanges,
     trackFormatting: _trackFormatting,
@@ -4732,8 +4719,14 @@ function docToModel(doc, prior) {
   } = prior;
   const sectionLayout = typeof doc.attrs.sections === "string" ? sectionsFromLayout(doc.attrs.sections, priorSections, blocks) : keepHeaderFooterSections(priorSections, blocks, doc).sections;
   const sections = typeof doc.attrs.sectionParts === "string" && sectionLayout ? restoreSectionParts(sectionLayout, doc.attrs.sectionParts, blocks) : sectionLayout;
+  const threads = commentThreadsFromDoc(doc);
   return {
     ...rest,
+    ...threads === void 0 ? priorComments !== void 0 ? { comments: priorComments } : {} : threads.length ? { comments: threads } : {},
+    ...restoreNoteParts(doc.attrs.noteParts, {
+      ...priorFootnotes ? { footnotes: priorFootnotes } : {},
+      ...priorEndnotes ? { endnotes: priorEndnotes } : {}
+    }),
     blocks,
     ...doc.attrs.evenAndOddHeaders ? { evenAndOddHeaders: true } : {},
     trackChanges: Boolean(doc.attrs.trackChanges),
@@ -7776,7 +7769,7 @@ function runStylesPlugin(getModel, getMode = () => "all") {
           const paragraphStyleId = displayParagraph(paragraph2, mode).value.style;
           let hasScale = false;
           paragraph2.forEach((child, offset) => {
-            if (!child.isText) return;
+            if (!child.isInline || child.type.name === "equation") return;
             const current2 = runOf(child);
             if (!current2) return;
             const projected = reviewRunFormatting(current2, mode);
@@ -7794,6 +7787,18 @@ function runStylesPlugin(getModel, getMode = () => "all") {
               ...projected.error ? { "data-review-format-error": projected.error } : {}
             } : {};
             const hidden = resolved.vanish === true;
+            if (!child.isText) {
+              decorations2.push(
+                Decoration.node(start + offset, start + offset + child.nodeSize, {
+                  style: `${runFormattingCss(resolved, model.theme)};${reviewRunCss(resolved)}`,
+                  ...run.language ? { lang: run.language } : {},
+                  ...run.rtl !== void 0 ? { dir: run.rtl ? "rtl" : "ltr" } : {},
+                  ...projected.error ? { "data-review-format-error": projected.error } : {},
+                  ...hidden ? { class: "dve-hidden-text" } : {}
+                })
+              );
+              return;
+            }
             const segments = scaledSegments(
               child.text,
               resolved,
@@ -7878,8 +7883,8 @@ function effectiveFont(state, text, paragraph2) {
   if (!run || !model) {
     const font = text.marks.find((mark) => mark.type === schema.marks.font);
     return {
-      family: String(font?.attrs.family ?? DEFAULT_FAMILY),
-      size: Number(font?.attrs.size ?? DEFAULT_SIZE)
+      family: String(run?.fontFamily ?? font?.attrs.family ?? DEFAULT_FAMILY),
+      size: Number(run?.fontSize ?? font?.attrs.size ?? DEFAULT_SIZE)
     };
   }
   const resolved = resolveRunFormatting(run, {
@@ -7907,7 +7912,7 @@ function syncFontControls(toolbar, state) {
   } else {
     let found = false;
     doc.nodesBetween(selection.from, selection.to, (node, _pos, parent) => {
-      if (!node.isText || !parent) return;
+      if (!node.isInline || node.type.name === "equation" || !parent) return;
       found = true;
       add(node, parent);
     });
@@ -7933,7 +7938,7 @@ function selectionScript(state) {
   };
   if (!state.selection.empty)
     state.doc.nodesBetween(state.selection.from, state.selection.to, (node, _pos, parent) => {
-      if (node.isText && parent) add(node, parent);
+      if (node.isInline && node.type.name !== "equation" && parent) add(node, parent);
     });
   if (!values2.size)
     add(
@@ -7942,62 +7947,26 @@ function selectionScript(state) {
     );
   return values2.size === 1 ? [...values2][0] : null;
 }
-
-// src/docx/inline-commands.ts
-function setInlineMark(view, type, attrs) {
-  if (!view.editable) return;
-  const { state } = view;
-  const { from: from2, to, empty } = state.selection;
-  const mark = attrs ? type.create(attrs) : void 0;
-  if (empty) {
-    const marks2 = (state.storedMarks ?? state.selection.$from.marks()).filter(
-      (item) => item.type !== type
-    );
-    view.dispatch(state.tr.setStoredMarks(mark ? [...marks2, mark] : marks2));
-  } else {
-    const transaction = state.tr.removeMark(from2, to, type);
-    view.dispatch(mark ? transaction.addMark(from2, to, mark) : transaction);
-  }
-}
 function applyHighlight(view, color) {
-  if (color !== "none" && !Object.hasOwn(wordHighlightColors, color)) return;
-  setInlineMark(view, schema.marks.highlight, color === "none" ? void 0 : { color });
+  if (!isStHighlightColor(color)) return;
+  applyRunFormattingPatch({ highlight: color === "none" ? void 0 : color })(
+    view.state,
+    view.dispatch,
+    view
+  );
 }
 function toggleVerticalAlign(view, value) {
   applyVerticalAlign(view, selectionScript(view.state) === value ? "baseline" : value);
 }
 function applyVerticalAlign(view, value) {
-  setInlineMark(view, schema.marks.verticalAlign, { value });
+  applyRunFormattingPatch({ verticalAlign: value })(view.state, view.dispatch, view);
 }
 function applyFont(view, key2, value) {
-  const attr = key2 === "family" ? "family" : key2 === "size" ? "size" : "color";
-  const mark = schema.marks.font;
-  const nextValue = key2 === "size" ? Number(value) : value;
-  const { state } = view;
-  if (state.selection.empty) {
-    const marks2 = state.storedMarks || state.selection.$from.marks();
-    const existing = marks2.find((item) => item.type === mark);
-    const type = mark.create({ ...existing?.attrs, [attr]: nextValue });
-    view.dispatch(state.tr.setStoredMarks([...marks2.filter((item) => item.type !== mark), type]));
-    return;
-  }
-  let transaction = state.tr;
-  state.doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
-    if (!node.isText) return;
-    const start = Math.max(pos, state.selection.from);
-    const end = Math.min(pos + node.nodeSize, state.selection.to);
-    const existing = node.marks.find((item) => item.type === mark);
-    const type = mark.create({ ...existing?.attrs, [attr]: nextValue });
-    transaction = transaction.removeMark(start, end, mark).addMark(start, end, type);
-  });
-  view.dispatch(transaction);
+  const patch = key2 === "family" ? { fontFamily: value } : key2 === "size" ? { fontSize: Number(value) } : { color: value };
+  applyRunFormattingPatch(patch)(view.state, view.dispatch, view);
 }
 function clearFormatting(view) {
-  const { state } = view;
-  let transaction = state.tr;
-  for (const mark of Object.values(schema.marks))
-    transaction = transaction.removeMark(state.selection.from, state.selection.to, mark);
-  view.dispatch(transaction.setStoredMarks([]));
+  clearDirectRunFormatting(view.state, view.dispatch, view);
 }
 var tableId = 0;
 var MAX_TABLE_ROWS = 100;
@@ -8089,84 +8058,7 @@ function applyPageStyles(paper, model, zoom) {
   else paper.style.removeProperty("--dve-page-color");
   paper.style.hyphens = model.autoHyphenation ? "auto" : "";
 }
-function selectedText(state) {
-  const pieces = [];
-  const { from: from2, to } = state.selection;
-  state.doc.nodesBetween(from2, to, (node, pos, parent) => {
-    if (!node.isText) return true;
-    pieces.push({
-      from: Math.max(pos, from2),
-      to: Math.min(pos + node.nodeSize, to),
-      node,
-      paragraphStyle: parent?.attrs.style || void 0
-    });
-    return false;
-  });
-  return pieces;
-}
-function isOn(state, piece, key2) {
-  const runs = [];
-  appendInlineNode(runs, piece.node);
-  const run = runs[0];
-  if (!run) return false;
-  if (run[key2] !== void 0) return Boolean(run[key2]);
-  const model = styleModelOf(state);
-  if (!model) return false;
-  return Boolean(
-    resolveRunFormatting(run, {
-      runCatalog: model.characterStyles,
-      paragraphCatalog: model.paragraphStyles,
-      paragraphStyleId: piece.paragraphStyle
-    })[key2]
-  );
-}
-function setExplicitOff(tr, piece, key2, off) {
-  const type = schema.marks.runProperties;
-  const current2 = type.isInSet(piece.node.marks);
-  const props = { ...current2?.attrs.props ?? {} };
-  if (off) props[key2] = false;
-  else delete props[key2];
-  tr.removeMark(piece.from, piece.to, type);
-  if (Object.keys(props).length) tr.addMark(piece.from, piece.to, type.create({ props }));
-}
-function toggleFormat(key2) {
-  const markType = schema.marks[key2];
-  const plain = toggleMark(markType);
-  return (state, dispatch) => {
-    if (state.selection.empty) return plain(state, dispatch);
-    const pieces = selectedText(state);
-    if (!pieces.length) return plain(state, dispatch);
-    const allOn = pieces.every((piece) => isOn(state, piece, key2));
-    if (!dispatch) return true;
-    const tr = state.tr;
-    for (const piece of pieces) {
-      if (allOn) {
-        tr.removeMark(piece.from, piece.to, markType);
-        const withoutMark2 = {
-          ...piece,
-          node: piece.node.mark(markType.removeFromSet(piece.node.marks))
-        };
-        setExplicitOff(tr, withoutMark2, key2, false);
-        const inherited = isOn(
-          state,
-          {
-            ...withoutMark2,
-            node: withoutMark2.node.mark(
-              schema.marks.runProperties.removeFromSet(withoutMark2.node.marks)
-            )
-          },
-          key2
-        );
-        if (inherited) setExplicitOff(tr, withoutMark2, key2, true);
-      } else {
-        setExplicitOff(tr, piece, key2, false);
-        tr.addMark(piece.from, piece.to, markType.create());
-      }
-    }
-    dispatch(tr.scrollIntoView());
-    return true;
-  };
-}
+var toggleFormat = createToggleFormat(schema, styleModelOf);
 
 // src/docx/font-format-batch.ts
 function batchFontFormat(view, apply) {
@@ -8190,8 +8082,6 @@ function batchFontFormat(view, apply) {
   if (scroll) combined.scrollIntoView();
   if (combined.steps.length || combined.storedMarksSet) view.dispatch(combined);
 }
-
-// src/docx/font-format.ts
 var FIELDS = [
   "family",
   "size",
@@ -8259,7 +8149,8 @@ function formatsOf(state) {
     formats.push(formatOf(state, schema.text("x", marks2), selection.$from.parent));
   } else {
     doc.nodesBetween(selection.from, selection.to, (node, _pos, parent) => {
-      if (node.isText && parent) formats.push(formatOf(state, node, parent));
+      if (node.isInline && node.type.name !== "equation" && parent)
+        formats.push(formatOf(state, node, parent));
     });
     if (!formats.length)
       formats.push(
@@ -8291,33 +8182,7 @@ function setToggle(view, key2, desired) {
   }
 }
 function patchExtraProps(view, patch) {
-  const type = schema.marks.runProperties;
-  const next = (marks2) => {
-    const existing = type.isInSet(marks2);
-    const props = { ...existing?.attrs.props ?? {} };
-    for (const [key2, value] of Object.entries(patch))
-      if (value === void 0) delete props[key2];
-      else props[key2] = value;
-    const others = marks2.filter((mark) => mark.type !== type);
-    return Object.keys(props).length ? [...others, type.create({ props })] : others;
-  };
-  const { state } = view;
-  if (state.selection.empty) {
-    view.dispatch(
-      state.tr.setStoredMarks(next(state.storedMarks ?? state.selection.$from.marks()))
-    );
-    return;
-  }
-  const tr = state.tr;
-  state.doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
-    if (!node.isText) return;
-    const from2 = Math.max(pos, state.selection.from);
-    const to = Math.min(pos + node.nodeSize, state.selection.to);
-    tr.removeMark(from2, to, type);
-    const wanted = type.isInSet(next(node.marks));
-    if (wanted) tr.addMark(from2, to, wanted);
-  });
-  view.dispatch(tr);
+  applyRunFormattingPatch(patch)(view.state, view.dispatch, view);
 }
 function applyFontFormat(view, changes) {
   if (!view.editable) return;
@@ -8350,14 +8215,14 @@ function applyFontFields(view, changes) {
   if (changes.smallCaps !== void 0) extras.smallCaps = changes.smallCaps;
   if (changes.caps !== void 0) extras.caps = changes.caps;
   if (changes.hidden !== void 0) extras.vanish = changes.hidden;
-  if (changes.spacing !== void 0)
-    extras.characterSpacingTwips = Math.round(changes.spacing * 20);
+  if (changes.spacing !== void 0 && Number.isFinite(changes.spacing))
+    extras.characterSpacingTwips = signedTwips(Math.round(changes.spacing * 20));
   if (changes.scale !== void 0 && Number.isInteger(changes.scale) && changes.scale >= 0 && changes.scale <= 600)
     extras.textScalePercent = changes.scale;
   if (changes.position !== void 0 && Number.isFinite(changes.position))
-    extras.positionHalfPoints = Math.sign(changes.position) * Math.round(Math.abs(changes.position) * 2);
+    extras.positionHalfPoints = halfPointsFromPoints(changes.position);
   if (changes.kerning !== void 0 && Number.isFinite(changes.kerning) && changes.kerning >= 0)
-    extras.kerningHalfPoints = Math.round(changes.kerning * 2);
+    extras.kerningHalfPoints = halfPointsFromPoints(changes.kerning);
   if (Object.keys(extras).length) patchExtraProps(view, extras);
 }
 
@@ -9876,32 +9741,6 @@ var REFERENCE = /^\s*(REF|PAGEREF)\s+("[^"]+"|\S+)(.*)$/i;
 function plainSwitches(rest) {
   return !/\\/.test(rest.replace(/\\h\b/gi, "").replace(/\\\*\s+\S+/g, ""));
 }
-function fieldRuns(doc) {
-  const runs = [];
-  doc.descendants((node, pos) => {
-    if (node.type.name !== "paragraph") return true;
-    let open;
-    node.forEach((child, offset) => {
-      const mark = child.isText ? child.marks.find((item) => item.type === schema.marks.field) : void 0;
-      const start = pos + 1 + offset;
-      if (mark && open?.mark.eq(mark)) {
-        open.to = start + child.nodeSize;
-        open.text += child.text ?? "";
-      } else if (mark) {
-        open = {
-          from: start,
-          to: start + child.nodeSize,
-          mark,
-          text: child.text ?? "",
-          marks: child.marks
-        };
-        runs.push(open);
-      } else open = void 0;
-    });
-    return false;
-  });
-  return runs;
-}
 function bookmarkTargets(doc) {
   const targets = /* @__PURE__ */ new Map();
   doc.descendants((node) => {
@@ -9930,12 +9769,13 @@ function updateFields(view, pageOf) {
 }
 function refreshFieldResults(tr, pageOf, captionsOnly = false) {
   for (const label of new Set(
-    fieldRuns(tr.doc).map((run) => seqLabelOf(schema.text("x", [run.mark]))).filter((label2) => label2 !== void 0).map((label2) => label2.toLowerCase())
+    fieldResultRanges(tr.doc).map((run) => seqLabelOf(schema.text("x", [run.mark]))).filter((label2) => label2 !== void 0).map((label2) => label2.toLowerCase())
   ))
     renumberCaptions(tr, label);
   const targets = bookmarkTargets(tr.doc);
   const changes = [];
-  for (const run of fieldRuns(tr.doc)) {
+  for (const run of fieldResultRanges(tr.doc)) {
+    if (isFieldLocked(inlineNodeRun(schema.text("x", run.marks)))) continue;
     const match = REFERENCE.exec(String(run.mark.attrs.instr ?? ""));
     if (!match || !plainSwitches(match[3] ?? "")) continue;
     const target = targets.get((match[2] ?? "").replace(/^"|"$/g, ""));
@@ -9971,6 +9811,7 @@ function renumberCaptions(tr, label) {
   });
   for (let index = fields.length - 1; index >= 0; index--) {
     const { from: from2, to, node } = fields[index];
+    if (isFieldLocked(inlineNodeRun(node))) continue;
     if (node.text !== String(index + 1))
       tr.replaceWith(from2, to, schema.text(String(index + 1), node.marks));
   }
@@ -14667,23 +14508,15 @@ function refreshStoryPreviews(model, sectionIndex, elements, mode, decorate) {
         slot2.querySelector(".dve-header-footer-body"),
         effectiveHeaderFooter(model, sectionIndex, kind, slot2.dataset.slot)?.blocks
       );
-  const notes = [...model.footnotes ?? [], ...model.endnotes ?? []];
-  for (const item of elements.notes?.querySelectorAll("[data-docx-note-id]") ?? [])
+  for (const item of elements.notes?.querySelectorAll("[data-docx-note-id]") ?? []) {
+    const notes = item.dataset.docxNoteKind === "endnote" ? model.endnotes : model.footnotes;
     refresh(
       item.querySelector(".dve-note-body"),
-      notes.find((note) => note.id === item.dataset.docxNoteId)?.blocks
+      notes?.find((note) => note.id === item.dataset.docxNoteId)?.blocks
     );
+  }
 }
 
-// src/docx/hard-break-command.ts
-var insertHardBreak = (state, dispatch, view) => {
-  if (view && !view.editable) return false;
-  if (!dispatch) return true;
-  const transaction = state.tr.replaceSelectionWith(schema.nodes.hardBreak.create(), true).scrollIntoView();
-  dispatch(transaction);
-  return true;
-};
-
 // src/docx/page-break-command.ts
 function insertBreakCommand(kind) {
   return (state, dispatch, view) => {
@@ -14820,7 +14653,7 @@ var editorBindings = {
   "Mod-b": marks.bold,
   "Mod-i": marks.italic,
   "Mod-u": marks.underline,
-  "Shift-Enter": insertHardBreak,
+  "Shift-Enter": insertWordHardBreak,
   Enter: chainCommands(
     exitListOnEmptyEnter,
     expectDefined(baseKeymap.Enter, "the base Enter command")
@@ -14998,6 +14831,7 @@ function noteList(notes, kind, numFmt, blocks, model) {
   for (const { note, number } of numbered) {
     const item = document.createElement("li");
     item.dataset.docxNoteId = note.id;
+    item.dataset.docxNoteKind = kind;
     item.value = number;
     const marker = document.createElement("span");
     marker.className = "dve-note-marker";
@@ -15071,19 +14905,21 @@ function withMark(blocks, mark) {
 function attachNoteEditing(root, options) {
   for (const item of root.querySelectorAll("li[data-docx-note-id]")) {
     const id = item.dataset.docxNoteId;
+    const kind = item.dataset.docxNoteKind;
+    if (kind !== "footnote" && kind !== "endnote") continue;
     const body = item.querySelector(".dve-note-body");
     if (!body) continue;
     item.title = translateUiText(root, "Double-click to edit");
     item.addEventListener("dblclick", () => {
       if (!options.editable() || item.classList.contains("dve-header-footer-editing")) return;
-      const note = options.note(id);
+      const note = options.note(kind, id);
       if (!note) return;
       const { editable: editable2, mark } = withoutMark(note.blocks);
       openBlocksEditor(
         item,
         body,
         editable2,
-        (blocks) => options.change(id, withMark(blocks, mark)),
+        (blocks) => options.change(kind, id, withMark(blocks, mark)),
         options.editor
       );
     });
@@ -15125,7 +14961,9 @@ function insertNote(view, model, kind) {
     number: 1,
     format: JSON.stringify(formatting)
   });
-  view.dispatch(view.state.tr.replaceSelectionWith(reference, false).scrollIntoView());
+  view.dispatch(
+    view.state.tr.replaceSelectionWith(reference, false).setDocAttribute("noteParts", notePartsJson(next)).scrollIntoView()
+  );
   return { model: next, id };
 }
 function noteNumberingPlugin() {
@@ -15354,13 +15192,13 @@ var PartsController = class {
         });
     if (this.notesEl)
       attachNoteEditing(this.notesEl, {
-        note: (id) => {
+        note: (kind, id) => {
           const current2 = this.host.model();
-          return [...current2.footnotes ?? [], ...current2.endnotes ?? []].find(
+          return current2[kind === "footnote" ? "footnotes" : "endnotes"]?.find(
             (note) => note.id === id
           );
         },
-        change: (id, blocks) => this.updateNote(id, blocks),
+        change: (kind, id, blocks) => this.updateNote(kind, id, blocks),
         editable: editable2,
         editor: this.editorOptions()
       });
@@ -15389,9 +15227,7 @@ var PartsController = class {
   insertNote(kind, canvas, paper) {
     const view = this.host.view();
     if (!view?.editable || !this.host.canEditOutsideBody()) return;
-    const { model, id } = insertNote(view, this.host.model(), kind);
-    const key2 = kind === "footnote" ? "footnotes" : "endnotes";
-    this.host.setModel({ ...this.host.model(), [key2]: model[key2] });
+    const { id } = insertNote(view, this.host.model(), kind);
     this.render(canvas, paper);
     const item = this.notesEl?.querySelector(
       `.dve-notes-${kind} li[data-docx-note-id="${id}"]`
@@ -15401,15 +15237,19 @@ var PartsController = class {
     this.host.edited();
   }
   /** Replaces one footnote's or endnote's blocks. */
-  updateNote(id, blocks) {
+  updateNote(kind, id, blocks) {
+    const view = this.host.view();
+    if (!view?.editable || !this.host.canEditOutsideBody()) return;
     const replace = (notes) => notes.map((note) => note.id === id ? { ...note, blocks: structuredClone(blocks) } : note);
     const model = this.host.model();
-    this.host.setModel({
+    const key2 = kind === "footnote" ? "footnotes" : "endnotes";
+    const next = {
       ...model,
-      ...model.footnotes && { footnotes: replace(model.footnotes) },
-      ...model.endnotes && { endnotes: replace(model.endnotes) }
-    });
-    this.host.edited();
+      ...model[key2] && { [key2]: replace(model[key2]) }
+    };
+    view.dispatch(
+      view.state.tr.step(new NotePartsStep(notePartsJson(next))).setMeta(HEADER_FOOTER_INPUT, true)
+    );
   }
   /** Applies header/footer edits to every section slot that shares the edited part. */
   updateHeaderFooter(kind, slot2, blocks) {
@@ -15781,28 +15621,7 @@ var PageController = class {
     this.host.printLayout()?.print(this.host.model(), (message) => emit(this.host.element, "document-warning", message));
   }
 };
-function linkRangeAt(view, pos) {
-  const $pos = view.state.doc.resolve(pos);
-  const items = [];
-  let cursor = $pos.start();
-  $pos.parent.forEach((child) => {
-    const link = child.marks.find((item) => item.type === schema.marks.link);
-    items.push({ from: cursor, to: cursor + child.nodeSize, ...link && { link } });
-    cursor += child.nodeSize;
-  });
-  let index = items.findIndex((item) => item.link && item.from <= pos && pos < item.to);
-  if (index < 0) index = items.findIndex((item) => item.link && item.from < pos && pos <= item.to);
-  if (index < 0) return void 0;
-  const mark = items[index]?.link;
-  if (!mark) return void 0;
-  let start = index;
-  let end = index;
-  while (start > 0 && items[start - 1]?.link?.eq(mark)) start--;
-  while (end < items.length - 1 && items[end + 1]?.link?.eq(mark)) end++;
-  const first = items[start];
-  const last = items[end];
-  return first && last ? { from: first.from, to: last.to, mark } : void 0;
-}
+var linkRangeAt = (view, pos) => wordLinkRangeAt(view.state, pos);
 function linkAtSelection(view) {
   const range = linkRangeAt(view, view.state.selection.from);
   if (!range) return void 0;
@@ -15814,43 +15633,10 @@ function linkAtSelection(view) {
   };
 }
 function applyLink(view, target, displayText) {
-  if (!target.href && !target.anchor) return false;
-  if (target.href && !isNavigableHref(target.href))
-    throw new Error("Links must start with http://, https:// or mailto:.");
-  const mark = schema.marks.link.create({
-    href: target.href ?? null,
-    anchor: target.anchor ?? null,
-    tooltip: target.tooltip || null
-  });
-  const { state } = view;
-  const { from: from2, to, empty } = state.selection;
-  const tr = state.tr;
-  if (!empty) tr.removeMark(from2, to, schema.marks.link).addMark(from2, to, mark);
-  else {
-    const existing = linkRangeAt(view, from2);
-    if (existing)
-      tr.removeMark(existing.from, existing.to, schema.marks.link).addMark(
-        existing.from,
-        existing.to,
-        mark
-      );
-    else {
-      const text = displayText || target.href || target.anchor;
-      tr.insert(
-        from2,
-        schema.text(text, [...state.storedMarks ?? state.selection.$from.marks(), mark])
-      );
-    }
-  }
-  view.dispatch(tr.scrollIntoView());
-  return true;
+  return applyWordLink(target, displayText)(view.state, view.dispatch, view);
 }
 function removeLink(view) {
-  const { from: from2, to, empty } = view.state.selection;
-  const range = empty ? linkRangeAt(view, from2) : { from: from2, to };
-  if (!range) return false;
-  view.dispatch(view.state.tr.removeMark(range.from, range.to, schema.marks.link));
-  return true;
+  return removeWordLink(view.state, view.dispatch, view);
 }
 function goToBookmark2(view, name) {
   let target = -1;
@@ -16612,30 +16398,38 @@ var EditorCore = class {
     }
     if (remote) transaction.setMeta(REMOTE_TRANSACTION_META, true);
     const previousParts = view.state.doc.attrs.sectionParts;
-    const applied = view.state.applyTransaction(transaction).state;
+    const previousNotes = view.state.doc.attrs.noteParts;
+    const previousComments = view.state.doc.attrs.commentThreads;
+    const result = view.state.applyTransaction(transaction);
+    const applied = result.state;
+    const docChanged = !applied.doc.eq(view.state.doc);
+    remote ||= Boolean(
+      this.collab.yjs && !transaction.docChanged && result.transactions.some(isWordYjsRemoteTransaction)
+    );
     if (applied === view.state) {
       view.updateState(applied);
       return;
     }
-    const repaired = remote || !transaction.docChanged ? null : this.collab.active ? repairCollaborativeDocumentIds(
+    const repaired = remote || !docChanged ? null : this.collab.active ? repairCollaborativeDocumentIds(
       applied,
       this.collab.client?.clientId ?? String(this.collab.yjs.session.clientId),
       this.collab.ids
     ) : assignMissingParagraphIds(applied);
     view.updateState(repaired ? applied.apply(repaired) : applied);
-    if (transaction.docChanged) {
+    if (docChanged) {
       this.model = docToModel(view.state.doc, this.model);
+      if (previousComments !== view.state.doc.attrs.commentThreads)
+        this.shell.review?.commentsPanel.refresh();
       this.pages.refreshPageStyles();
       this.pages.relayout();
       this.shell.chrome?.setSaveState("dirty");
       this.notifyChange();
-      if (previousParts !== view.state.doc.attrs.sectionParts && !transaction.getMeta(HEADER_FOOTER_INPUT))
+      if ((previousParts !== view.state.doc.attrs.sectionParts || previousNotes !== view.state.doc.attrs.noteParts) && !transaction.getMeta(HEADER_FOOTER_INPUT))
         this.parts.render(this.shell.canvas, this.shell.paper, true);
     }
     this.refreshControls();
-    if (transaction.docChanged || remote) this.scheduleCollaborationSend();
-    if (transaction.docChanged || transaction.selectionSet || remote)
-      this.collab.presence?.schedule();
+    if (docChanged || remote) this.scheduleCollaborationSend();
+    if (docChanged || transaction.selectionSet || remote) this.collab.presence?.schedule();
   }
   refreshControls() {
     this.parts.syncSection(this.shell.canvas, this.shell.paper);
@@ -17879,10 +17673,13 @@ var ReviewController = class {
       if (view) yjs.comments.delete(view, id);
       return;
     }
+    if (view && removeCommentThread(view, id)) return;
     if (view) removeCommentAnchor(view, id);
     this.updateComments(deleteComment(this.host.getModel().comments ?? [], id));
   }
   updateComments(next) {
+    const view = this.host.getView();
+    if (view && updateCommentThreads(view, next)) return;
     this.host.setModel({ ...this.host.getModel(), comments: next });
     this.host.notifyChange();
     this.host.refresh();
@@ -17902,7 +17699,8 @@ var ReviewController = class {
       text,
       this.host.getCollaborationIds()
     );
-    if (comment) this.updateComments([...this.host.getModel().comments ?? [], comment]);
+    if (comment && commentThreadsFromDoc(view.state.doc) === void 0)
+      this.updateComments([...this.host.getModel().comments ?? [], comment]);
   }
   handleReview(key2) {
     if (key2 === "trackChanges") {
@@ -18936,9 +18734,8 @@ async function copyOrCut(view, op) {
     return false;
   }
   if (op === "cut" && !view.isDestroyed && view.editable && view.state.doc.eq(doc) && view.state.selection.eq(selection))
-    deleteSelection(
-      view.state,
-      (transaction) => view.dispatch(transaction.setMeta("uiEvent", "cut"))
+    view.dispatch(
+      (deleteFieldSelection(view.state) ?? view.state.tr.deleteSelection()).scrollIntoView().setMeta("uiEvent", "cut")
     );
   return true;
 }