@stll/folio-core 0.54.1 → 0.55.0

package/dist/prosemirror/plugins/suggestionMode.js

@@ -1,4 +1,5 @@
 import { expectParagraphAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
+import { clearIndentOnBackspace } from "../commands/clearParagraphIndent.js";
 import { paragraphPropertiesSnapshot } from "../commands/propertyChangeScope.js";
 import { paragraphEndsItsContainer } from "../containerFinalParagraph.js";
 import { encloseWholeControls } from "../contentControlRevisions.js";
@@ -10,14 +11,16 @@ import { rebaseParagraphRuns } from "../rebaseParagraphRunFormatting.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { paragraphRunStyleContext } from "../runStyleFormatting.js";
 import { cellPasteRange, pasteTableCells } from "../tableCellPaste.js";
-import { handleEditorBeforeInput } from "../textInput.js";
+import { afterNativeCompositionFlush, handleEditorBeforeInput } from "../textInput.js";
 import { canCarryTrackedRunMark } from "../trackedRunInlineAtoms.js";
 import { getDocumentNumbering } from "./documentNumbering.js";
-import { getDocumentStyleResolver } from "./documentStyleState.js";
+import { documentStylesKey, getDocumentStyleResolver } from "./documentStyleState.js";
 import { mintRevisionId, seedRevisionIdsFromDoc } from "./revisionIds.js";
 import { Slice } from "prosemirror-model";
+import { CellSelection } from "prosemirror-tables";
 import { Mapping, ReplaceStep } from "prosemirror-transform";
-import { AllSelection, Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
+import { AllSelection, EditorState, Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
+import { joinBackward, joinForward, selectNodeBackward, selectNodeForward } from "prosemirror-commands";
 import { isHistoryTransaction } from "prosemirror-history";
 import { undoInputRule } from "prosemirror-inputrules";
 //#region src/prosemirror/plugins/suggestionMode.ts
@@ -241,10 +244,44 @@ function markRangeAsInserted(tr, doc, from, to, insertionType, deletionType, att
 function handleSuggestionPaste(view, slice, pluginState) {
 	const { selection } = view.state;
 	const selectsAll = selection instanceof AllSelection;
-	if (!(selection instanceof TextSelection || selectsAll) || selection.empty) return false;
+	if (!(selection instanceof TextSelection || selectsAll)) return false;
 	const insertionType = view.state.schema.marks["insertion"];
 	const deletionType = view.state.schema.marks["deletion"];
 	if (!insertionType || !deletionType) return false;
+	if (selection.empty) {
+		const { $from } = selection;
+		const closedTable = slice.openStart === 0 && slice.openEnd === 0 && slice.content.firstChild?.type.name === "table" && slice.content.lastChild?.type.name === "table";
+		const prefix = $from.parent.content.cut(0, $from.parentOffset);
+		let deletedPrefix = prefix.size > 0;
+		prefix.forEach((node) => {
+			if (!node.marks.some((mark) => mark.type === deletionType)) deletedPrefix = false;
+		});
+		if (!closedTable || $from.parent.type.name !== "paragraph" || !deletedPrefix) return false;
+		const suffix = $from.parent.content.cut($from.parentOffset);
+		let deletedSuffix = true;
+		suffix.forEach((node) => {
+			if (!node.marks.some((mark) => mark.type === deletionType)) deletedSuffix = false;
+		});
+		const tr = view.state.tr.setMeta(SUGGESTION_META, true).setMeta("paste", true);
+		const at = $from.before();
+		tr.replaceRange(at, at, slice);
+		const revision = makeMarkAttrs(pluginState);
+		const end = tr.mapping.map(at, 1);
+		enclosePastedRunRevisions({
+			tr,
+			from: at,
+			to: end,
+			revision
+		});
+		markRangeAsInserted(tr, tr.doc, at, end, insertionType, deletionType, revision);
+		if (deletedSuffix && $from.parent.attrs["pPrMark"] == null && !paragraphEndsItsContainer($from.doc.resolve($from.before()), "paragraph")) tr.setNodeAttribute(tr.mapping.map($from.before()), "pPrMark", {
+			kind: "del",
+			info: makeParagraphMarkInfo(pluginState)
+		});
+		tr.setSelection(TextSelection.create(tr.doc, tr.mapping.map(selection.from)));
+		view.dispatch(tr.scrollIntoView());
+		return true;
+	}
 	if (selectsAll && (slice.openStart > 0 || slice.openEnd > 0)) slice = new Slice(view.state.tr.replaceSelection(slice).doc.content, 0, 0);
 	const { from, to } = selectsAll ? {
 		from: Selection.atStart(view.state.doc).from,
@@ -372,16 +409,54 @@ function handleSuggestionTableCellPaste(view, slice, pluginState) {
 			const insertFrom = tr.mapping.slice(mapFrom).map(to);
 			const sizeBefore = tr.doc.content.size;
 			tr.replaceRange(insertFrom, insertFrom, content);
-			const insertTo = insertFrom + (tr.doc.content.size - sizeBefore);
+			let insertTo = insertFrom + (tr.doc.content.size - sizeBefore);
+			let pastedFrom = insertFrom;
+			const finalParagraph = cell.lastChild;
+			const $pasteFrom = tr.doc.resolve(pastedFrom);
+			const $pasteTo = tr.doc.resolve(insertTo);
+			if (content.openStart > 0 && content.openEnd > 0 && finalParagraph?.type.name === "paragraph" && $pasteFrom.parent.type.name === "paragraph" && $pasteTo.parent.type.name === "paragraph" && $pasteFrom.before() !== $pasteTo.before()) {
+				tr.setNodeAttribute($pasteFrom.before(), "pPrMark", {
+					kind: "ins",
+					info: {
+						id: revision.revisionId,
+						author: revision.author,
+						date: revision.date
+					}
+				});
+				tr.setNodeAttribute($pasteTo.before(), "pPrMark", finalParagraph.attrs["pPrMark"]);
+				recordReplacedParagraphProperties({
+					tr,
+					position: $pasteTo.before(),
+					replaced: finalParagraph,
+					revision: {
+						id: revision.revisionId,
+						author: revision.author,
+						date: revision.date
+					}
+				});
+			}
+			const emptyInsertions = [];
+			tr.doc.nodeAt(cellPos)?.forEach((node, offset) => {
+				const pos = cellPos + 1 + offset;
+				if (pos < pastedFrom && node.type.name === "paragraph" && node.content.size === 0 && isCurrentAuthorParagraphInsertion(node.attrs["pPrMark"], pluginState.author)) emptyInsertions.push({
+					from: pos,
+					to: pos + node.nodeSize
+				});
+			});
+			const retraction = tr.mapping.maps.length;
+			for (const range of emptyInsertions.toReversed()) tr.delete(range.from, range.to);
+			const retracted = tr.mapping.slice(retraction);
+			pastedFrom = retracted.map(pastedFrom);
+			insertTo = retracted.map(insertTo);
 			enclosePastedRunRevisions({
 				tr,
-				from: insertFrom,
+				from: pastedFrom,
 				to: insertTo,
 				revision
 			});
-			markRangeAsInserted(tr, tr.doc, insertFrom, insertTo, insertionType, deletionType, revision);
-			tr.doc.nodesBetween(insertFrom, insertTo, (node, pos) => {
-				if (node.type.name === "paragraph" && pos >= insertFrom && pos + node.nodeSize <= insertTo && node.attrs["pPrMark"] == null) tr.setNodeAttribute(pos, "pPrMark", {
+			markRangeAsInserted(tr, tr.doc, pastedFrom, insertTo, insertionType, deletionType, revision);
+			tr.doc.nodesBetween(pastedFrom, insertTo, (node, pos) => {
+				if (node.type.name === "paragraph" && pos >= pastedFrom && pos + node.nodeSize <= insertTo && node.attrs["pPrMark"] == null) tr.setNodeAttribute(pos, "pPrMark", {
 					kind: "ins",
 					info: {
 						id: revision.revisionId,
@@ -452,7 +527,9 @@ function applySuggestionInsert(view, from, to, text, pluginState) {
 	const tr = view.state.tr;
 	tr.setMeta(SUGGESTION_META, true);
 	tr.setMeta(SUGGESTED_TEXT_INPUT_META, text);
-	const selectsAll = view.state.selection instanceof AllSelection;
+	const { selection } = view.state;
+	const typesOverSelection = !selection.empty && selection.from === from && selection.to === to;
+	const selectsAll = selection instanceof AllSelection;
 	if (selectsAll) {
 		from = Math.max(from, Selection.atStart(view.state.doc).from);
 		to = Math.min(to, Selection.atEnd(view.state.doc).to);
@@ -473,7 +550,7 @@ function applySuggestionInsert(view, from, to, text, pluginState) {
 		for (const mark of replacedFormatting) tr.addMark(insertAt, insertAt + text.length, mark);
 	}
 	separateSplitStretch(tr, insertAt, insertAt + text.length, insertAttrs.revisionId);
-	if (view.state.selection instanceof AllSelection) tr.setSelection(TextSelection.create(tr.doc, insertAt + text.length));
+	if (typesOverSelection) tr.setSelection(TextSelection.create(tr.doc, insertAt + text.length));
 	view.dispatch(tr.scrollIntoView());
 	return true;
 }
@@ -533,15 +610,38 @@ function suggestRangeDeletion(state, tr, from, to) {
 * prior author's revision must not be silently overwritten.
 */
 function handleSuggestionEnter(view, pluginState) {
-	const { $from } = view.state.selection;
-	if ($from.parent.type.name !== "paragraph") return false;
+	const state = view.state;
+	if (state.selection.$from.parent.type.name !== "paragraph") return false;
+	const replacement = { tr: null };
+	let splitState = state;
+	if (state.selection instanceof TextSelection && !state.selection.empty) {
+		if (!handleSuggestionDelete(state, (tr) => {
+			replacement.tr = tr;
+			const styles = documentStylesKey.get(state);
+			const plugins = [];
+			if (styles) {
+				const spec = { ...styles.spec };
+				delete spec.appendTransaction;
+				delete spec.filterTransaction;
+				plugins.push(new Plugin(spec));
+			}
+			splitState = state.reconfigure({ plugins }).apply(tr);
+		}, "forward")) return false;
+	}
+	const { $from } = splitState.selection;
 	const sourcePos = $from.before();
 	const sourceAttrs = $from.parent.attrs;
 	const captured = { tr: null };
-	if (!splitBlockClearBorders(view.state, (tr) => {
+	if (!splitBlockClearBorders(splitState, (tr) => {
 		captured.tr = tr;
 	}, view) || !captured.tr) return false;
-	const tr = captured.tr;
+	const tr = replacement.tr ?? captured.tr;
+	if (replacement.tr) {
+		for (const step of captured.tr.steps) tr.step(step);
+		tr.setSelection(captured.tr.selection.getBookmark().resolve(tr.doc));
+		tr.setStoredMarks(captured.tr.storedMarks);
+	}
+	tr.setMeta(SUGGESTION_META, true);
 	if (sourceAttrs["pPrMark"] == null) {
 		if (tr.doc.nodeAt(sourcePos)?.type.name === "paragraph") {
 			const markInfo = {
@@ -561,6 +661,24 @@ function handleSuggestionEnter(view, pluginState) {
 	view.dispatch(tr.scrollIntoView());
 	return true;
 }
+/** Find the adjacent visible unit without consuming a bookmark range marker. */
+function caretDeleteTarget(state, direction) {
+	const { $from } = state.selection;
+	const backward = direction === "backward";
+	let from = backward ? $from.pos - 1 : $from.pos;
+	let to = backward ? $from.pos : $from.pos + 1;
+	while (from >= $from.start() && to <= $from.end()) {
+		const adjacent = state.doc.resolve(from).nodeAfter;
+		if (adjacent?.type.name !== "bookmarkBoundary") return {
+			type: "inlineUnit",
+			from,
+			to
+		};
+		from += backward ? -adjacent.nodeSize : adjacent.nodeSize;
+		to += backward ? -adjacent.nodeSize : adjacent.nodeSize;
+	}
+	return { type: "paragraphEdge" };
+}
 /**
 * Detect a caret-at-paragraph-boundary scenario where Backspace/Delete should
 * record a tracked paragraph-mark deletion instead of joining paragraphs.
@@ -572,8 +690,8 @@ function handleSuggestionEnter(view, pluginState) {
 * - Delete-at-paragraph-end     → current paragraph.
 *
 * Returns `null` when there is no adjacent sibling paragraph (the join would
-* not produce paragraph-mark merging — e.g. doc start, doc end, or sibling
-* is a table). The default merge path then runs unchanged.
+* not produce paragraph-mark merging, e.g. doc start, doc end, or a table).
+* Bookmark markers at an edge do not hide the adjacent paragraph break.
 */
 function paragraphBoundaryTarget(state, direction) {
 	const { $from, empty } = state.selection;
@@ -581,14 +699,13 @@ function paragraphBoundaryTarget(state, direction) {
 	if ($from.parent.type.name !== "paragraph") return null;
 	const paragraphStart = $from.before();
 	const paragraphEnd = $from.after();
+	if (caretDeleteTarget(state, direction).type !== "paragraphEdge") return null;
 	if (direction === "backward") {
-		if ($from.parentOffset !== 0) return null;
 		if (paragraphStart === 0) return null;
 		const prev = state.doc.resolve(paragraphStart).nodeBefore;
 		if (!prev || prev.type.name !== "paragraph") return null;
 		return paragraphStart - prev.nodeSize;
 	}
-	if ($from.parentOffset !== $from.parent.content.size) return null;
 	if (paragraphEnd >= state.doc.content.size) return null;
 	const next = state.doc.resolve(paragraphEnd).nodeAfter;
 	if (!next || next.type.name !== "paragraph") return null;
@@ -612,7 +729,13 @@ function applyPPrDel(view, targetParagraphPos, pluginState) {
 		const joined = view.state.doc.nodeAt(joinPos);
 		try {
 			tr.join(joinPos);
-			tr.setNodeAttribute(targetParagraphPos, "pPrMark", null);
+			tr.setNodeAttribute(targetParagraphPos, "pPrMark", joined?.type === targetNode.type ? expectParagraphAttrs(joined).pPrMark : null);
+			if (joined?.type === targetNode.type) recordReplacedParagraphProperties({
+				tr,
+				position: targetParagraphPos,
+				replaced: joined,
+				revision: existingMark.info
+			});
 			const styleResolver = getDocumentStyleResolver(view.state);
 			if (styleResolver && joined?.type === targetNode.type && joined.content.size > 0) rebaseParagraphRuns({
 				previousContext: paragraphRunStyleContext(joined, styleResolver),
@@ -671,15 +794,28 @@ function handleSuggestionDelete(state, dispatch, direction) {
 			to: rangeTo.pos
 		}).sort((a, b) => b.from - a.from);
 		for (const { from, to } of ranges) markRangeAsDeleted(tr, state.doc, from, to, insertionType, deletionType, pluginState, state);
-		const cursorPos = tr.mapping.map($to.pos);
-		tr.setSelection(TextSelection.near(tr.doc.resolve(cursorPos)));
+		if (state.selection instanceof CellSelection) tr.setSelection(state.selection.map(tr.doc, tr.mapping));
+		else {
+			const cursorPos = tr.mapping.map($to.pos);
+			tr.setSelection(TextSelection.near(tr.doc.resolve(cursorPos)));
+		}
 		dispatch(tr.scrollIntoView());
 		return true;
 	}
 	const isBackward = direction === "backward";
-	const deletePos = isBackward ? $from.pos - 1 : $from.pos;
-	const deleteEnd = isBackward ? $from.pos : $from.pos + 1;
-	if (deletePos < 0 || deleteEnd > state.doc.content.size) return true;
+	const target = caretDeleteTarget(state, direction);
+	if (target.type === "paragraphEdge") {
+		const edge = isBackward ? $from.start() : $from.end();
+		if ($from.pos === edge) return false;
+		const virtual = EditorState.create({
+			doc: state.doc,
+			selection: TextSelection.create(state.doc, edge)
+		});
+		if ((isBackward ? joinBackward : joinForward)(virtual, dispatch)) return true;
+		return (isBackward ? selectNodeBackward : selectNodeForward)(virtual, dispatch);
+	}
+	const deletePos = target.from;
+	const deleteEnd = target.to;
 	const noteRange = expandNoteReferenceDeletionRange(state.doc, deletePos, deleteEnd);
 	const rangeFrom = noteRange?.from ?? deletePos;
 	const rangeTo = noteRange?.to ?? deleteEnd;
@@ -701,19 +837,7 @@ function handleSuggestionDelete(state, dispatch, direction) {
 }
 /** Apply the editor's selected-content deletion path for a host cut action. */
 const deleteSelectionAsSuggestion = (state, dispatch) => state.selection.empty ? false : handleSuggestionDelete(state, dispatch, "forward");
-/**
-* Mark the text committed by an IME composition as a tracked insertion.
-*
-* Invoked from `compositionend` (deferred to a microtask) rather than from the
-* `appendTransaction` catch-all. ProseMirror commits composed text as part of
-* its own composition-end flush; adding the insertion mark *synchronously*
-* during that flush re-wraps the very text node the IME just finalized, which
-* corrupts CJK (Japanese / Chinese / Korean) input — characters duplicate or
-* garble. Running one tick later, after the composition has settled, wraps the
-* committed range safely. `markRangeAsInserted` skips nodes that already carry a
-* tracked-change mark, so this is idempotent. eigenpal/docx-editor#938.
-*/
-function markComposedAsInsertion(view, from, pluginState, replaced) {
+function markComposedAsInsertion({ view, from, pluginState, replaced, compositionId }) {
 	const insertionType = view.state.schema.marks["insertion"];
 	const deletionType = view.state.schema.marks["deletion"];
 	if (!insertionType || !deletionType) return;
@@ -721,9 +845,16 @@ function markComposedAsInsertion(view, from, pluginState, replaced) {
 	if (to <= from && !replaced) return;
 	const tr = view.state.tr;
 	tr.setMeta(SUGGESTION_META, true);
+	if (compositionId !== null) tr.setMeta("composition", compositionId);
 	if (replaced) {
-		tr.insert(from, replaced.content);
-		markRangeAsDeleted(tr, tr.doc, from, from + replaced.content.size, insertionType, deletionType, pluginState);
+		tr.replaceRange(from, from, replaced);
+		markRangeAsDeleted(tr, tr.doc, from, tr.mapping.map(from, 1), insertionType, deletionType, pluginState);
+		const restoredEnd = tr.doc.resolve(tr.mapping.map(from, 1));
+		const restoredStart = tr.doc.resolve(from);
+		if (restoredStart.parent.type.name === "paragraph" && restoredEnd.parent.type.name === "paragraph" && restoredStart.parent !== restoredEnd.parent) {
+			const mark = expectParagraphAttrs(restoredStart.parent).pPrMark;
+			if (mark?.kind === "del") carryIntoParagraphLeft(view.state, tr, view.state.doc.resolve(from).parent, restoredEnd.before(), mark.info);
+		}
 	}
 	const insertionFrom = tr.mapping.map(from, 1);
 	const insertionTo = tr.mapping.map(to, 1);
@@ -766,6 +897,38 @@ function recordSplitParagraph(tr, before, step, insertedFrom, insertedTo, attrs)
 	});
 }
 /**
+* The inline content a step removed from within one textblock, and where it
+* started: the node a node selection held (an image, a field, a note
+* reference) or a range of runs. Null for a step that removed nothing, or removed paragraph or table
+* structure the catch-all cannot put back.
+*/
+function replacedInline(before, step) {
+	if (!(step instanceof ReplaceStep) || !before || step.from === step.to) return null;
+	const $from = before.resolve(step.from);
+	if (!$from.parent.inlineContent || !$from.sameParent(before.resolve(step.to))) return null;
+	return {
+		from: step.from,
+		content: $from.parent.content.cut($from.parentOffset, step.to - $from.start())
+	};
+}
+/**
+* A transaction the plugin did not build (a command, a default paste, a
+* keymap) replaced inline content directly. Put it back in front of what
+* replaced it as a tracked deletion, as typing over a selection does, so
+* rejecting restores it and accepting removes it. The author's own
+* insertions are retracted instead.
+*/
+function restoreReplacedInline({ tr, replaced, insertionType, deletionType, pluginState }) {
+	for (const { at, content } of replaced) {
+		const pos = tr.mapping.map(at, -1);
+		const $pos = tr.doc.resolve(pos);
+		const index = $pos.index();
+		if (!$pos.parent.canReplace(index, index, content)) continue;
+		tr.insert(pos, content);
+		markRangeAsDeleted(tr, tr.doc, pos, pos + content.size, insertionType, deletionType, pluginState);
+	}
+}
+/**
 * Create the suggestion mode plugin.
 * When active, text edits become tracked changes.
 */
@@ -773,6 +936,7 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 	let composing = false;
 	let compositionFrom = null;
 	let compositionReplaced = null;
+	let compositionId = null;
 	return new Plugin({
 		key: suggestionModeKey,
 		state: {
@@ -784,6 +948,8 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 				};
 			},
 			apply(tr, state) {
+				const nativeCompositionId = tr.getMeta("composition");
+				if (composing && tr.docChanged && typeof nativeCompositionId === "number") compositionId = nativeCompositionId;
 				const meta = tr.getMeta(suggestionModeKey);
 				if (meta) return {
 					...state,
@@ -809,6 +975,7 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 					if (!suggestionModeKey.getState(view.state)?.active) return false;
 					if (composing) return false;
 					composing = true;
+					compositionId = null;
 					const { from, to } = view.state.selection;
 					compositionFrom = from;
 					compositionReplaced = from === to ? null : view.state.doc.slice(from, to);
@@ -822,14 +989,23 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 					compositionReplaced = null;
 					if (!pluginState?.active || from == null) {
 						composing = false;
+						compositionId = null;
 						return false;
 					}
-					queueMicrotask(() => {
+					afterNativeCompositionFlush(() => {
 						try {
 							const current = suggestionModeKey.getState(view.state);
-							if (current?.active) markComposedAsInsertion(view, from, current, replaced);
+							const nativeCompositionId = compositionId;
+							if (current?.active) markComposedAsInsertion({
+								view,
+								from,
+								pluginState: current,
+								replaced,
+								compositionId: nativeCompositionId
+							});
 						} finally {
 							composing = false;
+							compositionId = null;
 						}
 					});
 					return false;
@@ -851,6 +1027,20 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 				if (event.key === "Backspace" || event.key === "Delete") {
 					const { $from, empty } = view.state.selection;
 					if (event.key === "Backspace" && empty && $from.parentOffset === 0 && $from.parent.type.name === "paragraph" && expectParagraphAttrs($from.parent).numPr?.kind === "reference") return false;
+					if (event.key === "Backspace" && clearIndentOnBackspace(view.state, (tr) => {
+						const revision = makeMarkAttrs(pluginState);
+						recordReplacedParagraphProperties({
+							tr,
+							position: $from.before(),
+							replaced: $from.parent,
+							revision: {
+								id: revision.revisionId,
+								author: revision.author,
+								date: revision.date
+							}
+						});
+						view.dispatch(tr.setMeta("suggestionModeApplied", true));
+					})) return true;
 					const boundaryTarget = paragraphBoundaryTarget(view.state, event.key === "Backspace" ? "backward" : "forward");
 					if (boundaryTarget !== null) return applyPPrDel(view, boundaryTarget, pluginState);
 					const direction = event.key === "Backspace" ? "backward" : "forward";
@@ -883,9 +1073,16 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 			tr.setMeta(SUGGESTION_META, true);
 			const deletionType = newState.schema.marks["deletion"];
 			const laterMaps = transactions.slice(transactions.indexOf(userTr) + 1).flatMap((transaction) => transaction.mapping.maps);
+			const restoresReplaced = userTr.getMeta("appendedTransaction") === void 0;
+			const replaced = [];
 			for (const [stepIndex, step] of userTr.steps.entries()) {
 				const stepMap = step.getMap();
 				const following = new Mapping([...userTr.mapping.maps.slice(stepIndex + 1), ...laterMaps]);
+				const removed = restoresReplaced ? replacedInline(userTr.docs[stepIndex], step) : null;
+				if (removed) replaced.push({
+					at: following.map(removed.from, -1),
+					content: removed.content
+				});
 				stepMap.forEach((_oldFrom, _oldTo, stepFrom, stepTo) => {
 					const newFrom = following.map(stepFrom, -1);
 					const newTo = following.map(stepTo, 1);
@@ -901,6 +1098,13 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 					}
 				});
 			}
+			if (deletionType) restoreReplacedInline({
+				tr,
+				replaced,
+				insertionType,
+				deletionType,
+				pluginState
+			});
 			return tr.steps.length > 0 ? tr : null;
 		}
 	});

package/dist/prosemirror/rangeAnchorAttrs.d.ts

@@ -1,4 +1,5 @@
-import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
 import { RangeAnchorAttrs } from "./emptyRangeAnchor.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/rangeAnchorAttrs.d.ts

package/dist/prosemirror/runFormattingFromMarks.d.ts

@@ -1,6 +1,7 @@
 import { document_d_exports } from "../types/document.js";
 import { RunStyleResolver } from "./runStyleFormatting.js";
 import { Mark } from "prosemirror-model";
+import { RunPropsPatch } from "@stll/docx-core/ops";
 //#region src/prosemirror/runFormattingFromMarks.d.ts
 /**
  * Convert ProseMirror marks to TextFormatting
@@ -12,7 +13,9 @@ type MarksToTextFormattingOptions = {
   paragraphMarkPrecedesStyle?: boolean | undefined;
   styleResolver?: RunStyleResolver | null | undefined;
 };
+/** Overlay only changed visual marks; private authored properties stay with the run. */
+declare const runFormattingPatchFromMarks: (beforeMarks: readonly Mark[], afterMarks: readonly Mark[]) => RunPropsPatch;
 declare const sameFormattingValue: (left: unknown, right: unknown) => boolean;
 declare function marksToTextFormatting(marks: readonly Mark[], options?: MarksToTextFormattingOptions): document_d_exports.TextFormatting;
 //#endregion
-export { MarksToTextFormattingOptions, marksToTextFormatting, sameFormattingValue };
+export { MarksToTextFormattingOptions, marksToTextFormatting, runFormattingPatchFromMarks, sameFormattingValue };

package/dist/prosemirror/runFormattingFromMarks.js

@@ -203,6 +203,20 @@ const changedVisualFormattingGroups = (observedFormatting, expectedFormatting) =
 	}
 	return changed;
 };
+/** Overlay only changed visual marks; private authored properties stay with the run. */
+const runFormattingPatchFromMarks = (beforeMarks, afterMarks) => {
+	const observedMarks = (marks) => marks.filter(({ type }) => type.name !== "runFormattingOverride");
+	const before = marksToTextFormatting(observedMarks(beforeMarks));
+	const after = marksToTextFormatting(observedMarks(afterMarks));
+	const changed = changedVisualFormattingGroups(after, before);
+	const patch = before.styleId === after.styleId ? {} : { styleId: after.styleId ?? null };
+	const isFormattingKey = (key) => Object.hasOwn(RUN_FORMATTING_VISUAL_GROUPS, key);
+	for (const [key, group] of Object.entries(RUN_FORMATTING_VISUAL_GROUPS)) {
+		if (!isFormattingKey(key) || group === null || !changed.has(group)) continue;
+		Reflect.set(patch, key, after[key] ?? null);
+	}
+	return patch;
+};
 const VISUAL_BOOLEAN_FORMATTING_PROPERTIES = /* @__PURE__ */ new Set([
 	"allCaps",
 	"bold",
@@ -564,4 +578,4 @@ function marksToTextFormatting(marks, options) {
 	};
 }
 //#endregion
-export { marksToTextFormatting, sameFormattingValue };
+export { marksToTextFormatting, runFormattingPatchFromMarks, sameFormattingValue };

package/dist/prosemirror/runFormattingInlineCarriers.d.ts

@@ -1,7 +1,7 @@
 import { Mark, Node } from "prosemirror-model";
 import { Transaction } from "prosemirror-state";
 //#region src/prosemirror/runFormattingInlineCarriers.d.ts
-type RunFormattingInlineAtomDisposition = "break-run" | "field-run" | "not-a-run" | "page-break-carrier" | "preserved-xml-run" | "structured-field" | "symbol-run" | "tab-run" | "text-run";
+type RunFormattingInlineAtomDisposition = "break-run" | "field-run" | "not-a-run" | "note-marker-run" | "page-break-carrier" | "preserved-xml-run" | "structured-field" | "symbol-run" | "tab-run" | "text-run";
 /**
  * How every inline atom maps to a serialized run-formatting carrier.
  *
@@ -18,6 +18,7 @@ declare const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly image: "not-a-run";
   readonly math: "not-a-run";
   readonly moveRangeBoundary: "not-a-run";
+  readonly noteMarker: "note-marker-run";
   readonly pageBreakRun: "page-break-carrier";
   readonly preservedXml: "preserved-xml-run";
   readonly rangeAnchor: "not-a-run";

package/dist/prosemirror/runFormattingInlineCarriers.js

@@ -20,6 +20,7 @@ const RUN_FORMATTING_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	image: "not-a-run",
 	math: "not-a-run",
 	moveRangeBoundary: "not-a-run",
+	noteMarker: "note-marker-run",
 	pageBreakRun: "page-break-carrier",
 	preservedXml: "preserved-xml-run",
 	rangeAnchor: "not-a-run",
@@ -52,6 +53,7 @@ const CONTROL_CHARACTER_BY_DISPOSITION = Object.freeze({
 	"break-run": "\n",
 	"field-run": null,
 	"not-a-run": null,
+	"note-marker-run": null,
 	"page-break-carrier": null,
 	"preserved-xml-run": null,
 	"structured-field": null,
@@ -179,7 +181,8 @@ const runFormattingCarrierReviewText = (carrier) => {
 		case "tab-run":
 		case "break-run": return CONTROL_CHARACTER_BY_DISPOSITION[carrier.disposition];
 		case "text-run": return carrier.node.text ?? "";
-		case "page-break-carrier": return "";
+		case "page-break-carrier":
+		case "note-marker-run": return "";
 		case "symbol-run": {
 			const { char } = expectSymbolAttrs(carrier.node);
 			return decodeOoxmlSymbolCharacter(char) ?? "�";

package/dist/prosemirror/schema/marks.d.ts

@@ -107,6 +107,7 @@ type TrackedRevisionAncestor = {
   utcDate?: string;
   initials?: string;
   outerWrapperCount: number;
+  resolutionJoins?: document_d_exports.Insertion["resolutionJoins"];
 };
 type TrackedChangeMarkAttrs = {
   revisionId: number;
@@ -119,6 +120,7 @@ type TrackedChangeMarkAttrs = {
   moveKind?: "moveTo" | "moveFrom";
   /** Number of inline-wrapper layers authored outside this revision. */
   _docxOuterWrapperCount?: number;
+  _docxResolutionJoins?: document_d_exports.Insertion["resolutionJoins"];
   /** Outer revisions, in authored order, that ProseMirror cannot hold as nested marks. */
   _docxRevisionAncestors?: readonly TrackedRevisionAncestor[];
   /** Defaults to `"user"`; `"suggested"` for AI-proposed, non-serialized edits. */

package/dist/prosemirror/schema/nodes.d.ts

@@ -44,6 +44,10 @@ declare const PRESERVED_XML_LEVELS: {
   readonly inline: "inline";
 };
 type PreservedXmlLevel = (typeof PRESERVED_XML_LEVELS)[keyof typeof PRESERVED_XML_LEVELS];
+/** The automatic number mark authored inside a note story, with no reader text. */
+type NoteMarkerAttrs = {
+  kind: "footnote" | "endnote";
+};
 /** A run or inline child folio does not model, carried through the editor untouched. */
 type PreservedXmlAttrs = {
   /** Replayable markup, as `captureVerbatimXml` wrote it. */
@@ -51,6 +55,8 @@ type PreservedXmlAttrs = {
   /** The visible text the markup puts on the line, empty when it shows none. */
   text: string;
   level: PreservedXmlLevel;
+  /** `PreservedInline.foldedListNumber`, for a capture the list marker stands in for. */
+  foldedListNumber?: document_d_exports.FoldedListNumber;
 };
 /** A block child folio does not model, carried through the editor untouched. */
 type PreservedBlockAttrs = {
@@ -166,6 +172,8 @@ type ParagraphAttrs = {
    * next marker letter.
    */
   listImplicitChildLevelAdvances?: number;
+  /** Cached inline LISTNUM display text appended after the resolved list template. */
+  listFoldedMarkerSuffix?: string;
   /**
    * When the marker text contains a TAB separator, this column offset (in
    * twips) is where the slot after the tab should land — used to align an
@@ -338,7 +346,7 @@ type ParagraphPropertyChangeAttrs = Omit<document_d_exports.ParagraphPropertyCha
   };
   previousFormatting?: Omit<document_d_exports.ParagraphFormatting, "numPr"> & {
     numPr?: ParagraphAttrs["numPr"] | null;
-  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerTemplate" | "listMarkerHidden" | "listMarkerFormatting" | "listMarkerAlignment" | "listMarkerSuffix" | "listMarkerAllCaps" | "listImplicitChildLevelAdvances" | "listMarkerSecondSlotOffsetTwips" | "listLevelNumFmts" | "listLevelStarts" | "listLevelTabs" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
+  } & Partial<Pick<ParagraphAttrs, "listIsBullet" | "listIsLegal" | "listNumFmt" | "listMarker" | "listMarkerTemplate" | "listMarkerHidden" | "listMarkerFormatting" | "listMarkerAlignment" | "listMarkerSuffix" | "listMarkerAllCaps" | "listImplicitChildLevelAdvances" | "listFoldedMarkerSuffix" | "listMarkerSecondSlotOffsetTwips" | "listLevelNumFmts" | "listLevelStarts" | "listLevelTabs" | "listAbstractNumId" | "listStartOverride" | "lineSpacingExplicit" | "direction" | "_autospacingBase">>;
   currentFormatting?: document_d_exports.ParagraphFormatting;
 };
 /**
@@ -1258,4 +1266,4 @@ type TableCellAttrs = {
   _docxVMergeContinuationCells?: unknown;
 };
 //#endregion
-export { AlternateContentAttrs, AuthoredEmuAttrs, BlockCustomXmlAttrs, BlockSdtAttrs, BookmarkBoundaryAttrs, CommentReferenceAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, PRESERVED_XML_LEVELS, PageBreakRunAttrs, ParagraphAttrs, ParagraphAttrsPatch, ParagraphPropertyChangeAttrs, PreservedBlockAttrs, PreservedXmlAttrs, PreservedXmlLevel, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TEXT_BOX_TEXT_BODY_CONTENT_STATE_TYPES, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs, TextBoxTextBodyContentState };
+export { AlternateContentAttrs, AuthoredEmuAttrs, BlockCustomXmlAttrs, BlockSdtAttrs, BookmarkBoundaryAttrs, CommentReferenceAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, NoteMarkerAttrs, PRESERVED_XML_LEVELS, PageBreakRunAttrs, ParagraphAttrs, ParagraphAttrsPatch, ParagraphPropertyChangeAttrs, PreservedBlockAttrs, PreservedXmlAttrs, PreservedXmlLevel, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TEXT_BOX_TEXT_BODY_CONTENT_STATE_TYPES, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs, TextBoxTextBodyContentState };