ooxml-core 1.24.1 → 1.24.3

package/dist/docx/ui/index.mjs

@@ -926,12 +926,56 @@ var isPlaceholderStyle = (mark) => mark.type.name === "characterStyle" && mark.a
 function firstText(state, span) {
   if (span.level === "inline") return state.doc.nodeAt(span.from);
   let found = null;
-  state.doc.nodesBetween(span.from, span.to, (node) => {
+  state.doc.nodesBetween(span.from, span.to, (node, pos) => {
     if (!found && node.isText) found = node;
+    return !found && !(span.level === "cell" && node.type.name === "table" && pos > span.from);
+  });
+  return found;
+}
+function holdsNothing(doc, from, to) {
+  let nothing = true;
+  if (from < to)
+    doc.nodesBetween(from, to, (node) => {
+      if (node.isInline) nothing = false;
+      return nothing;
+    });
+  return nothing;
+}
+function touchesTable(doc, cell, from, to) {
+  let found = false;
+  doc.nodesBetween(from, to, (node, pos) => {
+    found ||= node.type.name === "table" && pos > cell;
     return !found;
   });
   return found;
 }
+function cellText(doc, pos) {
+  const cell = doc.nodeAt(pos);
+  const text2 = { from: pos + 2, to: pos + cell.nodeSize - 2 };
+  let first3 = true;
+  cell.forEach((child, offset) => {
+    if (child.type.name !== "paragraph") return;
+    if (first3) text2.from = pos + 2 + offset;
+    text2.to = pos + offset + child.nodeSize;
+    first3 = false;
+  });
+  return text2;
+}
+function cellContent(state, cell, text2) {
+  const nodes = [];
+  let placed = false;
+  cell.forEach((child) => {
+    if (child.type.name !== "paragraph") {
+      nodes.push(child);
+      return;
+    }
+    const attrs2 = child.attrs.contentControl ? { ...child.attrs, contentControl: null } : child.attrs;
+    nodes.push(child.type.create(attrs2, placed ? null : text2));
+    placed = true;
+  });
+  if (!placed) nodes.push(state.schema.nodes.paragraph.create(null, text2));
+  return Fragment.fromArray(nodes);
+}
 function contentMarks(state, span, change) {
   const schema = state.schema;
   const first3 = firstText(state, span);
@@ -963,10 +1007,7 @@ function replaceControlContent(state, span, edit) {
   if (span.level !== "cell")
     return state.tr.replaceWith(span.from, span.to, text2 ?? []).setMeta(CONTROL_EDIT_META, true);
   const cell = state.doc.nodeAt(span.from);
-  const first3 = cell.firstChild?.type.name === "paragraph" ? cell.firstChild : void 0;
-  const attrs2 = first3?.attrs.contentControl ? { ...first3.attrs, contentControl: null } : first3?.attrs;
-  const paragraph = (first3?.type ?? state.schema.nodes.paragraph).create(attrs2, text2);
-  const tr = state.tr.replaceWith(span.from + 1, span.to - 1, paragraph);
+  const tr = state.tr.replaceWith(span.from + 1, span.to - 1, cellContent(state, cell, text2));
   tr.setNodeMarkup(span.from, void 0, {
     ...cell.attrs,
     contentControl: change.removed ? null : change.control
@@ -974,7 +1015,7 @@ function replaceControlContent(state, span, edit) {
   const { from, to } = state.selection;
   if (from > span.from && to < span.to) {
     const shown = change.control.showingPlaceholder && !change.removed;
-    const start = span.from + 2;
+    const start = cellText(tr.doc, span.from).from;
     tr.setSelection(TextSelection.create(tr.doc, shown ? start : start + (text2?.nodeSize ?? 0)));
   }
   return tr.setMeta(CONTROL_EDIT_META, true);
@@ -1033,8 +1074,14 @@ function chooseDate(state, id, date, at) {
     return void 0;
   return replaceControlContent(state, span, setControlDate(span.control, date));
 }
+function inputControlAt(spans, pos) {
+  const span = controlAt(spans, pos, true);
+  if (span?.level !== "block") return span;
+  const cells = spans.filter((other) => other.level === "cell");
+  return controlAt(cells, pos) ?? span;
+}
 function typeOverPlaceholder(state, from, text2, to = from) {
-  const span = controlAt(controlSpans(state.doc), from, true);
+  const span = inputControlAt(controlSpans(state.doc), from);
   if (span?.level === "cell") return typeInCell(state, span, text2, to);
   if (span?.level !== "inline") return void 0;
   const { control } = span;
@@ -1057,7 +1104,9 @@ function typeInCell(state, span, text2, to) {
     return void 0;
   if (!editable(state, span)) return "blocked";
   const tr = replaceControlContent(state, span, afterEdit({ control: withValue(control), text: text2 }));
-  return tr.setSelection(TextSelection.create(tr.doc, span.from + 2 + text2.length));
+  return tr.setSelection(
+    TextSelection.create(tr.doc, cellText(tr.doc, span.from).from + text2.length)
+  );
 }
 function withoutPlaceholderStyle(fragment) {
   const nodes = [];
@@ -1070,7 +1119,7 @@ function withoutPlaceholderStyle(fragment) {
 }
 function pasteInCell(state, slice) {
   const { from, to } = state.selection;
-  const span = controlAt(controlSpans(state.doc), from, true);
+  const span = inputControlAt(controlSpans(state.doc), from);
   if (span?.level !== "cell" || to > span.to - 1) return void 0;
   const { control } = span;
   if (control.kind === "checkbox" || control.kind === "dropDownList") return "blocked";
@@ -1081,23 +1130,26 @@ function pasteInCell(state, slice) {
     span,
     afterEdit({ control: withValue(control), text: "" })
   );
-  const at = TextSelection.create(tr.doc, span.from + 2);
+  const at = TextSelection.create(tr.doc, cellText(tr.doc, span.from).from);
   return tr.setSelection(at).replaceSelection(
     new Slice(withoutPlaceholderStyle(slice.content), slice.openStart, slice.openEnd)
   );
 }
 function deleteToPlaceholder(state, direction) {
   const { selection } = state;
-  const span = controlAt(controlSpans(state.doc), selection.from, true);
+  const span = inputControlAt(controlSpans(state.doc), selection.from);
   if (!span || span.level === "block" || span.control.showingPlaceholder) return void 0;
   if (!editable(state, span) || span.control.kind === "checkbox") return void 0;
   if (!replaceable(state, span)) return void 0;
   if (removedByEdit(span.control)) return void 0;
   const [from, to] = selection.empty ? direction === "backward" ? [selection.from - 1, selection.from] : [selection.from, selection.from + 1] : [selection.from, selection.to];
   const cell = span.level === "cell";
-  const inner = cell ? { from: span.from + 2, to: span.to - 2 } : span;
+  const inner = cell ? cellText(state.doc, span.from) : span;
   const outer = cell ? { from: span.from + 1, to: span.to - 1 } : span;
-  if (from > inner.from || to < inner.to || from < outer.from || to > outer.to) return void 0;
+  if (from < outer.from || to > outer.to) return void 0;
+  if (cell && touchesTable(state.doc, span.from, from, to)) return void 0;
+  if (!holdsNothing(state.doc, inner.from, from) || !holdsNothing(state.doc, to, inner.to))
+    return void 0;
   return replaceControlContent(state, span, placeholderChange(span.control));
 }
 var newControlId = (doc) => freshControlId(new Set(everyControlSpan(doc).map((span) => span.control.id)));
@@ -1130,6 +1182,43 @@ function insertContentControl(state, kind, options2 = {}) {
     tr.setSelection(TextSelection.create(tr.doc, start, start + change.text.length));
   return tr.setMeta(CONTROL_EDIT_META, true);
 }
+
+// docx/ui/content-control-occurrences.ts
+function continues(doc, inline, end, span) {
+  if (span.from === end) return true;
+  if (span.level === "inline") {
+    let at = end;
+    for (const other of inline) if (other.from === at && other.to <= span.from) at = other.to;
+    return at === span.from;
+  }
+  if (span.level !== "block") return false;
+  const $end = doc.resolve(end);
+  if (doc.resolve(span.from).parent !== $end.parent) return false;
+  let split = true;
+  $end.parent.forEach((node, offset) => {
+    const pos = $end.start() + offset;
+    if (pos < end || pos >= span.from || node.type.name !== "paragraph") return;
+    if (!node.attrs.contentControl) split = false;
+  });
+  return split;
+}
+function controlOccurrences(doc, spans, inline) {
+  const found = [];
+  const last = /* @__PURE__ */ new Map();
+  for (const span of [...spans].sort((a, b) => a.from - b.from)) {
+    const key = `${span.level}:${span.control.id}`;
+    const previous = last.get(key);
+    if (previous && continues(doc, inline, previous.to, span)) {
+      previous.spans.push(span);
+      previous.to = span.to;
+      continue;
+    }
+    const occurrence = { key, spans: [span], from: span.from, to: span.to };
+    found.push(occurrence);
+    last.set(key, occurrence);
+  }
+  return found;
+}
 var VERBATIM = ["sourceXml", "endSourceXml"];
 var INLINE = ["endSourceXml"];
 var sourcesOf = (control, fields = VERBATIM) => fields.flatMap((field) => {
@@ -4119,8 +4208,8 @@ function resolveChartStyleDefinition(style, resolve) {
   }
   return Object.keys(out).length ? out : void 0;
 }
-function effectiveBuiltInChartStyle(formatting) {
-  return formatting?.builtInStyle ?? (formatting?.sourceXml ? void 0 : 102);
+function effectiveBuiltInChartStyle(formatting2) {
+  return formatting2?.builtInStyle ?? (formatting2?.sourceXml ? void 0 : 102);
 }
 function builtInChartTextStyle(id) {
   if (id === void 0 || !Number.isInteger(id) || !(id >= 1 && id <= 48 || id >= 101 && id <= 148))
@@ -5893,10 +5982,10 @@ function properties(run) {
   };
 }
 function chartTitleText(chart, theme) {
-  const formatting = chart.formatting;
-  const entry = formatting?.entries.title;
+  const formatting2 = chart.formatting;
+  const entry = formatting2?.entries.title;
   const body = entry?.textBody;
-  if (!formatting || !body || body.text !== chart.title) return void 0;
+  if (!formatting2 || !body || body.text !== chart.title) return void 0;
   if (body.paragraphs.length === 1 && body.paragraphs[0].runs.length <= 1 && !body.text.includes("\n") && !body.paragraphs[0].lineSpacing && !body.paragraphs[0].spaceBefore && !body.paragraphs[0].spaceAfter)
     return void 0;
   return {
@@ -5915,7 +6004,7 @@ function chartTitleText(chart, theme) {
         const appearance = chartAppearance(
           {
             ...chart,
-            formatting: { ...formatting, entries: { ...formatting.entries, title: direct } }
+            formatting: { ...formatting2, entries: { ...formatting2.entries, title: direct } }
           },
           theme
         )?.title ?? {};
@@ -7284,9 +7373,9 @@ function chartSpaceKind(space) {
   return { type, drawn: DRAWN_CHART_TYPES.has(type) };
 }
 function renderChartSpaceSvg(space, options2) {
-  const { width, height, theme, fonts, formatting, colorPalette, styleDefinition, ...svg } = options2;
+  const { width, height, theme, fonts, formatting: formatting2, colorPalette, styleDefinition, ...svg } = options2;
   const summary = chartSummaryFromSpace(space, {
-    ...formatting ? { formatting } : {},
+    ...formatting2 ? { formatting: formatting2 } : {},
     ...colorPalette !== void 0 ? { colorPalette } : {},
     ...styleDefinition ? { styleDefinition } : {}
   });
@@ -8767,12 +8856,12 @@ function resolveTableStyleFormatting(tableStyleId, catalog, look, rowIndex, rowC
     if (style.borders) result.borders = { ...result.borders, ...style.borders };
     if (style.shadingFill) result.shadingFill = style.shadingFill;
     for (const region of regions) {
-      const formatting = style.conditional[region];
-      if (!formatting) continue;
-      if (formatting.borders) result.borders = { ...result.borders, ...formatting.borders };
-      if (formatting.shadingFill) result.shadingFill = formatting.shadingFill;
-      if (formatting.shadingThemeFill) result.shadingThemeFill = formatting.shadingThemeFill;
-      if (formatting.run) result.run = { ...result.run, ...formatting.run };
+      const formatting2 = style.conditional[region];
+      if (!formatting2) continue;
+      if (formatting2.borders) result.borders = { ...result.borders, ...formatting2.borders };
+      if (formatting2.shadingFill) result.shadingFill = formatting2.shadingFill;
+      if (formatting2.shadingThemeFill) result.shadingThemeFill = formatting2.shadingThemeFill;
+      if (formatting2.run) result.run = { ...result.run, ...formatting2.run };
     }
   }
   return result;
@@ -12685,7 +12774,7 @@ function trackChangesPlugin(getAuthor, isEnabled, idGenerator = createCollaborat
       if (boundary) return boundary.setMeta(trackChangesPluginKey, { tracked: true });
       if (!steps.length || !steps.every((step) => step instanceof ReplaceStep)) {
         if (newState.doc.attrs.trackFormatting === false) return null;
-        const formatting = trackRunFormatting(
+        const formatting2 = trackRunFormatting(
           steps,
           oldState,
           newState,
@@ -12700,7 +12789,7 @@ function trackChangesPlugin(getAuthor, isEnabled, idGenerator = createCollaborat
           date,
           () => idGenerator("revision")
         );
-        return formatting?.setMeta(trackChangesPluginKey, { tracked: true }) ?? null;
+        return formatting2?.setMeta(trackChangesPluginKey, { tracked: true }) ?? null;
       }
       const transform = new Transform(oldState.doc);
       const untracked = new Mapping();
@@ -12787,46 +12876,15 @@ function removeControl(tr, span) {
   return tr;
 }
 var BLOCKS = /* @__PURE__ */ new Set(["paragraph", "table"]);
-function continues(doc, inline, end, span) {
-  if (span.from === end) return true;
-  if (span.level === "inline") {
-    let at = end;
-    for (const other of inline) if (other.from === at && other.to <= span.from) at = other.to;
-    return at === span.from;
-  }
-  if (span.level !== "block") return false;
-  const $end = doc.resolve(end);
-  if (doc.resolve(span.from).parent !== $end.parent) return false;
-  let split = true;
-  $end.parent.forEach((node, offset) => {
-    const pos = $end.start() + offset;
-    if (pos < end || pos >= span.from || node.type.name !== "paragraph") return;
-    if (!node.attrs.contentControl) split = false;
-  });
-  return split;
-}
 function temporaryControls(doc) {
   const spans = controlSpans(doc);
   const inline = spans.filter((span) => span.level === "inline");
-  const found = [];
-  const last = /* @__PURE__ */ new Map();
-  const candidates = [...spans, ...tableControlSpans(doc), ...rowControlSpans(doc)].sort(
-    (a, b) => a.from - b.from
+  const candidates = [...spans, ...tableControlSpans(doc), ...rowControlSpans(doc)];
+  return controlOccurrences(
+    doc,
+    candidates.filter((span) => removedByEdit(span.control)),
+    inline
   );
-  for (const span of candidates) {
-    if (!removedByEdit(span.control)) continue;
-    const key = `${span.level}:${span.control.id}`;
-    const previous = last.get(key);
-    if (previous && continues(doc, inline, previous.to, span)) {
-      previous.spans.push(span);
-      previous.to = span.to;
-      continue;
-    }
-    const occurrence = { key, spans: [span], from: span.from, to: span.to };
-    found.push(occurrence);
-    last.set(key, occurrence);
-  }
-  return found;
 }
 function removeEditedTemporaryControls(transactions, before, after) {
   const local = transactions.filter(
@@ -12885,22 +12943,46 @@ function changesAttributesOnly(step, doc) {
   const next = slice.content.firstChild;
   return insert === 1 && gapFrom === from + 1 && gapTo === to - 1 && slice.openStart === 0 && slice.openEnd === 0 && slice.content.childCount === 1 && node !== null && next !== null && !node.isLeaf && next.content.size === 0 && node.nodeSize === to - from && next.type === node.type && sameControl(nodeControlOf(node)?.value, nodeControlOf(next)?.value);
 }
-var isMarkOf = (mark, control) => mark.type.name === "contentControl" && sameControl(controlOfMark(mark), control);
+function sameId(left, right) {
+  const id = left?.id;
+  return typeof id === "string" && id === right?.id;
+}
+var isMarkOf = (mark, control, same2 = sameControl) => mark.type.name === "contentControl" && same2(controlOfMark(mark), control);
+function holdsControl(node, span, same2 = sameControl) {
+  if (span.level === "inline") return node.marks.some((mark) => isMarkOf(mark, span.control, same2));
+  const held = nodeControlOf(node);
+  return held?.level === span.level && same2(held.value, span.control);
+}
+function putsBack(step, span, same2 = sameControl) {
+  let found = false;
+  if (step instanceof ReplaceStep)
+    step.slice.content.descendants((node) => {
+      found ||= holdsControl(node, span, same2);
+      return !found;
+    });
+  return found;
+}
 function keepsControl(step, span) {
   if (step instanceof AddMarkStep)
     return span.level !== "inline" || step.mark.type.name !== "contentControl" || isMarkOf(step.mark, span.control);
   if (step instanceof RemoveMarkStep)
     return span.level !== "inline" || !isMarkOf(step.mark, span.control);
-  let kept = false;
-  if (span.level === "inline" && step instanceof ReplaceStep)
-    step.slice.content.descendants((node) => {
-      kept ||= node.marks.some((mark) => isMarkOf(mark, span.control));
-      return !kept;
-    });
-  return kept;
+  return putsBack(step, span);
+}
+function lockedControls(doc) {
+  const locked = everyControlSpan(doc).filter((span) => span.control.lock);
+  const inline = locked.filter((span) => span.level === "inline");
+  return [
+    ...inline.map((span) => ({ key: "", spans: [span], from: span.from, to: span.to })),
+    ...controlOccurrences(
+      doc,
+      locked.filter((span) => span.level !== "inline"),
+      []
+    )
+  ];
 }
 function violatesControlLock(tr, state, history = false) {
-  const locked = everyControlSpan(state.doc).filter((span) => span.control.lock);
+  const locked = lockedControls(state.doc);
   return tr.steps.some((step, index) => {
     const before = tr.mapping.slice(0, index);
     if (step instanceof AttrStep) {
@@ -12908,18 +12990,20 @@ function violatesControlLock(tr, state, history = false) {
       if (node && isContentControlLocked(inlineRunProperties(node).contentControl, "content"))
         return true;
       return locked.some(
-        (span) => isContentControlLocked(span.control, "content") && step.pos >= before.map(span.from, 1) && step.pos < before.map(span.to, -1)
+        (occurrence) => isContentControlLocked(occurrence.spans[0].control, "content") && step.pos >= before.map(occurrence.from, 1) && step.pos < before.map(occurrence.to, -1)
       );
     }
     if (!locked.length || !isRangeStep(step)) return false;
     const { from, to } = step;
     const inserts = from === to;
     const kept = changesAttributesOnly(step, tr.docs[index]);
-    return locked.some((span) => {
-      const spanFrom = before.map(span.from, 1);
-      const spanTo = before.map(span.to, -1);
+    return locked.some((occurrence) => {
+      const span = occurrence.spans[0];
+      const spanFrom = before.map(occurrence.from, 1);
+      const spanTo = before.map(occurrence.to, -1);
       const removesWhole = !inserts && from <= spanFrom && to >= spanTo;
       const keeps = kept || keepsControl(step, span);
+      if (removesWhole && !keeps && putsBack(step, span, sameId)) return true;
       if (isContentControlLocked(span.control, "control") && removesWhole && !keeps && !history)
         return true;
       if (!isContentControlLocked(span.control, "content") || removesWhole && !keeps)
@@ -16357,25 +16441,6 @@ function replacedBlanks(before, beforeResults, after, afterResults, mapping) {
     (space) => filled.some((result) => space.from >= result.from && space.to <= result.to)
   );
 }
-
-// docx/ui/form-field-guard.ts
-var isRemote2 = (tr) => tr.getMeta("y-sync$") !== void 0;
-var isHistory = (tr) => tr.getMeta("history$") !== void 0;
-var isFormsProtected = (protection) => Boolean(protection?.enforced) && protection?.edit === "forms";
-function exceedsFormTextLength(tr) {
-  const beforeResults = formTextResults(tr.before);
-  const afterResults = formTextResults(tr.doc);
-  const replaced = replacedBlanks(tr.before, beforeResults, tr.doc, afterResults, tr.mapping);
-  const length = (doc, result, removed = []) => isBlankFormText(doc, result) ? 0 : result.length - removed.filter((space) => space.from >= result.from && space.to <= result.to).length;
-  const before = new Map(
-    beforeResults.map((result) => [tr.mapping.map(result.begin), length(tr.before, result)])
-  );
-  return afterResults.some((result) => {
-    const max = result.field.textInput?.maxLength;
-    const now = length(tr.doc, result, replaced);
-    return Boolean(max) && now > max && now > (before.get(result.begin) ?? 0);
-  });
-}
 function unprotectedSections(doc) {
   if (typeof doc.attrs.sections !== "string") return [];
   const sections2 = JSON.parse(doc.attrs.sections);
@@ -16428,14 +16493,92 @@ function renamesBlock(step, before, after) {
     )
   );
 }
-function staysInFormFields(tr) {
+function inProtectedFormText(doc, from, to, free) {
+  return formTextResults(doc).some(
+    (result) => result.field.enabled !== false && from >= result.from && to <= result.to && !free.some((range) => result.from >= range.from && result.to <= range.to)
+  );
+}
+function inFormatting(fragment, marks) {
+  const children3 = [];
+  fragment.forEach((node) => {
+    if (node.isText) children3.push(node.mark(marks));
+    else children3.push(node.isLeaf ? node : node.copy(inFormatting(node.content, marks)));
+  });
+  return Fragment.fromArray(children3);
+}
+function landingMarks(state) {
+  const { $from, $to, empty } = state.selection;
+  if (state.storedMarks) return state.storedMarks;
+  if (!empty) return $from.marksAcross($to) ?? $from.marks();
+  const after = $from.nodeAfter;
+  return !$from.nodeBefore?.isText && after?.isText ? after.marks : $from.marks();
+}
+function pasteIntoFormText(view, slice, free) {
+  const { state } = view;
+  const { from, to } = state.selection;
+  if (!slice.size || !inProtectedFormText(state.doc, from, to, free)) return false;
+  const text2 = new Slice(
+    inFormatting(slice.content, landingMarks(state)),
+    slice.openStart,
+    slice.openEnd
+  );
+  view.dispatch(
+    state.tr.replaceSelection(text2).scrollIntoView().setMeta("paste", true).setMeta("uiEvent", "paste")
+  );
+  return true;
+}
+var formatting = (marks) => marks.filter((mark) => mark.type.name !== "field");
+function writesFormatting(step, doc, stored) {
+  const $from = doc.resolve(step.from);
+  const allowed = [...$from.marks(), ...stored ?? []];
+  const around = [$from.nodeBefore, doc.resolve(step.to).nodeAfter];
+  for (const node of around) if (node?.isText) allowed.push(...node.marks);
+  doc.nodesBetween(step.from, step.to, (node) => {
+    if (node.isText) allowed.push(...node.marks);
+  });
+  let found = false;
+  step.slice.content.descendants((node) => {
+    found ||= node.isText && formatting(node.marks).some((mark) => !mark.isInSet(allowed));
+    return !found;
+  });
+  return found;
+}
+function storesFormatting(tr, free) {
+  if (tr.docChanged || !tr.storedMarksSet || !tr.storedMarks) return false;
+  const { from, to, $from } = tr.selection;
+  if (Mark.sameSet(formatting(tr.storedMarks), formatting($from.marks()))) return false;
+  return inProtectedFormText(tr.doc, from, to, free());
+}
+
+// docx/ui/form-field-guard.ts
+var isRemote2 = (tr) => tr.getMeta("y-sync$") !== void 0;
+var isHistory = (tr) => tr.getMeta("history$") !== void 0;
+var isFormsProtected = (protection) => Boolean(protection?.enforced) && protection?.edit === "forms";
+function exceedsFormTextLength(tr) {
+  const beforeResults = formTextResults(tr.before);
+  const afterResults = formTextResults(tr.doc);
+  const replaced = replacedBlanks(tr.before, beforeResults, tr.doc, afterResults, tr.mapping);
+  const length = (doc, result, removed = []) => isBlankFormText(doc, result) ? 0 : result.length - removed.filter((space) => space.from >= result.from && space.to <= result.to).length;
+  const before = new Map(
+    beforeResults.map((result) => [tr.mapping.map(result.begin), length(tr.before, result)])
+  );
+  return afterResults.some((result) => {
+    const max = result.field.textInput?.maxLength;
+    const now = length(tr.doc, result, replaced);
+    return Boolean(max) && now > max && now > (before.get(result.begin) ?? 0);
+  });
+}
+function staysInFormFields(tr, kept) {
   const doc = tr.before;
-  const fields = [
-    ...formTextResults(doc).filter(({ field }) => field.enabled !== false).map(({ from, to }) => ({ from, to })),
-    ...controlSpans(doc).map(({ from, to }) => ({ from, to }))
-  ];
+  const results = formTextResults(doc);
+  const values = results.filter(({ field }) => field.enabled !== false);
+  const fields = [...values, ...controlSpans(doc).map(({ from, to }) => ({ from, to }))];
   const sections2 = unprotectedSections(doc);
-  const fixed = formTextResults(doc).filter(({ field }) => field.enabled === false).map(({ begin, to }) => ({ from: begin, to: to + 1 })).filter((range) => !sections2.some((free) => range.from >= free.from && range.to <= free.to));
+  const free = (range) => sections2.some((it) => range.from >= it.from && range.to <= it.to);
+  const fixed = results.filter(({ field }) => field.enabled === false).map(({ begin, to }) => ({ from: begin, to: to + 1 })).filter((range) => !free(range));
+  const plain = values.filter((range) => !free(range));
+  const internal = isHistory(tr) || Boolean(tr.getMeta(FIELD_RESULT_REPAIR_META));
+  const tracked = Boolean(tr.getMeta(trackChangesPluginKey));
   let sectionsAfter;
   return tr.steps.every((step, index) => {
     const after = tr.docs[index + 1] ?? tr.doc;
@@ -16450,16 +16593,23 @@ function staysInFormFields(tr) {
     if (!(step instanceof ReplaceStep || step instanceof ReplaceAroundStep || step instanceof AddMarkStep || step instanceof RemoveMarkStep))
       return false;
     const { from, to } = step;
-    const touchesFixed = (start2, end2) => fixed.some((range) => start2 < map.map(range.to, -1) && end2 > map.map(range.from, 1));
-    let changesFixed = (step instanceof AddMarkStep || step instanceof RemoveMarkStep) && touchesFixed(from, to);
+    const touches = (ranges, start2, end2) => ranges.some((range) => start2 < map.map(range.to, -1) && end2 > map.map(range.from, 1));
+    const marks = step instanceof AddMarkStep || step instanceof RemoveMarkStep;
+    if (!internal && !tracked && (within2(plain, from, to) || touches(plain, from, to))) {
+      if (marks) return false;
+      const stored = kept && from === map.map(kept.at) ? kept.marks : null;
+      if (step instanceof ReplaceStep && writesFormatting(step, tr.docs[index], stored))
+        return false;
+    }
+    let changesFixed = marks && touches(fixed, from, to);
     step.getMap().forEach((start2, end2) => {
-      changesFixed ||= touchesFixed(start2, end2);
+      changesFixed ||= touches(fixed, start2, end2);
     });
     if (changesFixed) return false;
     if (within2(fields, from, to))
       return !sections2.length || keepsSections(step, tr.docs[index], after);
     if (!within2(sections2, from, to)) return false;
-    if (step instanceof AddMarkStep || step instanceof RemoveMarkStep) return true;
+    if (marks) return true;
     const rest = tr.mapping.slice(index + 1);
     const own2 = step.getMap();
     const start = rest.map(own2.map(from, -1), -1);
@@ -16494,12 +16644,20 @@ function formFieldGuardPlugin(protection) {
       init: (_config, state) => textFieldsOf(state.doc),
       apply: (tr, fields) => insertsFieldMarker(tr) ? textFieldsOf(tr.doc) : fields
     },
+    props: {
+      handlePaste: (view, _event, slice) => isFormsProtected(protection()) && pasteIntoFormText(view, slice, unprotectedSections(view.state.doc))
+    },
     filterTransaction: (tr, state) => {
+      if (isFormsProtected(protection()) && storesFormatting(tr, () => unprotectedSections(tr.doc)))
+        return false;
       if (!tr.docChanged || isRemote2(tr)) return true;
       const limited = textFields.getState(state)?.limited || insertsFieldMarker(tr);
       if (limited && !isHistory(tr) && exceedsFormTextLength(tr)) return false;
       if (!isFormsProtected(protection())) return true;
-      return Boolean(tr.getMeta(CONTROL_EDIT_META) || tr.getMeta(FORM_FIELD_EDIT_META)) || staysInFormFields(tr);
+      return Boolean(tr.getMeta(CONTROL_EDIT_META) || tr.getMeta(FORM_FIELD_EDIT_META)) || staysInFormFields(
+        tr,
+        state.storedMarks && { marks: state.storedMarks, at: state.selection.from }
+      );
     },
     appendTransaction: (transactions, old, state) => {
       if (!transactions.some((tr2) => tr2.docChanged) || transactions.some(isRemote2)) return null;

package/dist/docx/write-table-controls.d.ts

@@ -9,7 +9,8 @@ export declare function placeTableControl(doc: XmlDocument, element: XmlElement,
 /**
  * Unwraps each `w:sdt` around `elements` (the rows of a table or the cells of a row, in place)
  * that the model takes off every one of them it holds: `next` is each element's control. The
- * rows or cells stay; a control the model keeps on any of them stays around all of them.
+ * rows or cells stay. One the model keeps on some of them stays around those: a row or cell it
+ * gives no control is taken out of it, as one given another control is.
  */
 export declare function unwrapDroppedControls(elements: readonly XmlElement[], next: readonly (ContentControl | undefined)[]): void;
 //# sourceMappingURL=write-table-controls.d.ts.map

package/dist/docx/write-table-controls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-table-controls.d.ts","sourceRoot":"","sources":["../../docx/write-table-controls.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAA+B,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAgFvF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,IAAI,EAAE,cAAc,GAAG,SAAS,GAC9B,IAAI,CA2CN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,SAAS,UAAU,EAAE,EAC/B,IAAI,EAAE,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,GAC3C,IAAI,CAON"}
+{"version":3,"file":"write-table-controls.d.ts","sourceRoot":"","sources":["../../docx/write-table-controls.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,EAA+B,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAwGvF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,IAAI,EAAE,cAAc,GAAG,SAAS,GAC9B,IAAI,CA4CN;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,SAAS,UAAU,EAAE,EAC/B,IAAI,EAAE,SAAS,CAAC,cAAc,GAAG,SAAS,CAAC,EAAE,GAC3C,IAAI,CAWN"}

package/dist/pptx/automation/index.cjs

@@ -41934,7 +41934,7 @@ function toArrayBuffer(bytes) {
   if (bytes.byteOffset === 0 && bytes.byteLength === bytes.buffer.byteLength) {
     return bytes.buffer;
   }
-  return bytes.slice().buffer;
+  return new Uint8Array(bytes).buffer;
 }
 function isCompoundFile(input2) {
   const bytes = toBytes(input2);
@@ -108217,7 +108217,7 @@ async function tiffToPicture(bytes) {
   try {
     const imported = await import('utif');
     const utif = "default" in imported ? imported.default : imported;
-    const buffer = bytes.slice().buffer;
+    const buffer = new Uint8Array(bytes).buffer;
     const page = utif.decode(buffer)[0];
     if (!page) {
       return void 0;
@@ -148221,7 +148221,7 @@ async function inflateZlib(data) {
     return void 0;
   }
   try {
-    const stream = new Blob([data.slice().buffer]).stream().pipeThrough(new DecompressionStream("deflate"));
+    const stream = new Blob([new Uint8Array(data).buffer]).stream().pipeThrough(new DecompressionStream("deflate"));
     const reader2 = stream.getReader();
     const chunks = [];
     let total = 0;
@@ -159642,7 +159642,7 @@ async function loadPresentation(filePath, execCtx) {
   return { pptxData, rawBytes };
 }
 function arrayBufferOf(bytes) {
-  return bytes.slice().buffer;
+  return new Uint8Array(bytes).buffer;
 }
 async function saveDeckBytes(result, original) {
   const handler = new PptxHandler();

package/dist/pptx/automation/index.d.ts

@@ -1363,7 +1363,10 @@ export declare function loadPresentation(filePath: string, execCtx: ExecutionCon
   pptxData: PptxData;
   rawBytes: Uint8Array;
 }>;
-/** The bytes as a standalone ArrayBuffer (a view into a pooled buffer must not leak the rest). */
+/**
+ * The bytes as a standalone ArrayBuffer (a view into a pooled buffer must not leak the rest). The copy
+ * goes through the Uint8Array constructor because `slice()` on a Node Buffer is a view, not a copy.
+ */
 export declare function arrayBufferOf(bytes: Uint8Array): ArrayBuffer;
 /**
  * Saves a deck a tool changed, loading the original first so package parts the model does not