@stll/folio-core 0.54.2 → 0.55.0

package/dist/prosemirror/extensions/marks/markUtils.js

@@ -2,6 +2,7 @@ import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
 import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
 import { normalizeHorizontalScalePercent } from "../../../utils/horizontalScale.js";
 import { expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectEmphasisMarkAttrs, expectFontFamilyMarkAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectStrikeMarkAttrs, expectTextEffectMarkAttrs } from "../../attrs/index.js";
+import { canonicalRunFormatting, withCanonicalCommand } from "../../canonicalCommands.js";
 import { runShadingAttrsToShading, shadingToRunShadingAttrs } from "../../conversion/runShadingMark.js";
 import { documentMarkType } from "../../documentSchema.js";
 import { selectRunFormattingCarrierRepresentations } from "../../runFormattingInlineCarriers.js";
@@ -12,6 +13,12 @@ import { applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs } from
 import { readThemeColor } from "@stll/docx-core/model";
 import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/markUtils.ts
+/**
+* Shared mark utility functions
+*
+* setMark, removeMark, isMarkActive, getMarkAttr, marksToTextFormatting,
+* textFormattingToMarks, clearFormatting
+*/
 const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
 const fontFamilyAttrsToFormatting = ({ ascii, hAnsi, eastAsia, cs, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme }) => ({
 	...ascii !== void 0 ? { ascii } : {},
@@ -179,8 +186,23 @@ function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
 	if (!markRequiresAttrMerge(markType)) return markType.create(nextAttrs);
 	return markType.create(mergeMarkAttrs(markType, currentMark, nextAttrs));
 }
+const canonicalSetMarkFormatting = ({ state, type, attrs }) => {
+	const markType = documentMarkType(state, type);
+	const { from, to, empty } = state.selection;
+	if (empty) return canonicalRunFormatting(state, marksToTextFormatting([createMarkWithMergedAttrs(markType, markType.isInSet(state.storedMarks ?? state.selection.$from.marks()), attrs)]));
+	return selectRunFormattingCarrierRepresentations({
+		doc: state.doc,
+		from,
+		to
+	}).map((representation) => ({
+		type: "formatRun",
+		from: representation.from,
+		to: representation.to,
+		patch: marksToTextFormatting([createMarkWithMergedAttrs(markType, markType.isInSet(representation.node.marks), attrs)])
+	}));
+};
 function setMark(type, attrs) {
-	return (state, dispatch) => {
+	const command = (state, dispatch) => {
 		const markType = documentMarkType(state, type);
 		const { from, to, empty } = state.selection;
 		if (empty) {
@@ -211,6 +233,12 @@ function setMark(type, attrs) {
 		}
 		return true;
 	};
+	if (!RUN_FORMATTING_MARK_NAMES.has(type.name)) return command;
+	return withCanonicalCommand(command, (state) => canonicalSetMarkFormatting({
+		state,
+		type,
+		attrs
+	}));
 }
 const DIRECT_FONT_PROPERTIES = [
 	"color",
@@ -287,17 +315,42 @@ const withRunFormattingOverride = (command, update) => (state, dispatch) => comm
 	dispatch(updateRunFormattingOverride(state, tr, update));
 } : void 0);
 /** `toggleMark` for the document's own counterpart of `type`. */
-const toggleDocumentMark = (type) => (state, dispatch, view) => toggleMark(documentMarkType(state, type))(state, dispatch, view);
+const toggleDocumentMark = (type) => {
+	const command = (state, dispatch, view) => toggleMark(documentMarkType(state, type))(state, dispatch, view);
+	if (!RUN_FORMATTING_MARK_NAMES.has(type.name)) return command;
+	return withCanonicalCommand(command, (state) => {
+		const markType = documentMarkType(state, type);
+		const formatting = marksToTextFormatting([markType.create()]);
+		if (!isMarkActive(state, markType)) return canonicalRunFormatting(state, formatting);
+		const keys = markType.name === "strike" ? ["strike", "doubleStrike"] : Object.keys(formatting);
+		return canonicalRunFormatting(state, Object.fromEntries(keys.map((key) => [key, null])));
+	});
+};
 /** UI toggle whose direct-formatting contract explicitly targets both script families. */
-const toggleMarkForAllScripts = (type, property) => (state, dispatch) => {
+const toggleMarkForAllScripts = (type, property) => withCanonicalCommand((state, dispatch) => {
 	const markType = documentMarkType(state, type);
 	const enabled = !isMarkActive(state, markType);
 	return withRunFormattingOverride(toggleMark(markType), (attrs) => updatePairedToggleAttrs(attrs, property, enabled))(state, dispatch);
-};
+}, (state) => {
+	const enabled = !isMarkActive(state, documentMarkType(state, type));
+	return canonicalRunFormatting(state, property === "bold" ? {
+		bold: enabled,
+		boldCs: enabled
+	} : {
+		italic: enabled,
+		italicCs: enabled
+	});
+});
 /** UI size command whose direct-formatting contract explicitly targets both script families. */
-const setFontSizeForAllScripts = (markType, size) => withRunFormattingOverride(setMark(markType, { size }), (attrs) => updateFontSizeCompanionAttrs(attrs, size));
+const setFontSizeForAllScripts = (markType, size) => withCanonicalCommand(withRunFormattingOverride(setMark(markType, { size }), (attrs) => updateFontSizeCompanionAttrs(attrs, size)), (state) => canonicalRunFormatting(state, {
+	fontSize: size,
+	fontSizeCs: size
+}));
 /** Clears both ordinary and complex-script direct size through the UI command boundary. */
-const clearFontSizeForAllScripts = (markType) => withRunFormattingOverride(removeMark(markType), (attrs) => updateFontSizeCompanionAttrs(attrs, void 0));
+const clearFontSizeForAllScripts = (markType) => withCanonicalCommand(withRunFormattingOverride(removeMark(markType), (attrs) => updateFontSizeCompanionAttrs(attrs, void 0)), (state) => canonicalRunFormatting(state, {
+	fontSize: null,
+	fontSizeCs: null
+}));
 function selectionHasVisibleUnderline(state, markType) {
 	const { from, to, empty, $from } = state.selection;
 	if (empty) {
@@ -317,10 +370,14 @@ function selectionHasVisibleUnderline(state, markType) {
 	return hasVisibleUnderline;
 }
 function toggleUnderlineMark(markType) {
-	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, documentMarkType(state, markType)) ? "none" : "single" })(state, dispatch);
+	return withCanonicalCommand((state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, documentMarkType(state, markType)) ? "none" : "single" })(state, dispatch), (state) => canonicalSetMarkFormatting({
+		state,
+		type: markType,
+		attrs: { style: selectionHasVisibleUnderline(state, documentMarkType(state, markType)) ? "none" : "single" }
+	}));
 }
 function removeMark(type) {
-	return (state, dispatch) => {
+	const command = (state, dispatch) => {
 		const markType = documentMarkType(state, type);
 		const { from, to, empty } = state.selection;
 		if (empty) {
@@ -330,6 +387,11 @@ function removeMark(type) {
 		if (dispatch) dispatch(state.tr.removeMark(from, to, markType).scrollIntoView());
 		return true;
 	};
+	if (!RUN_FORMATTING_MARK_NAMES.has(type.name)) return command;
+	return withCanonicalCommand(command, (state) => {
+		const formatting = marksToTextFormatting([documentMarkType(state, type).create()]);
+		return canonicalRunFormatting(state, Object.fromEntries(Object.keys(formatting).map((key) => [key, null])));
+	});
 }
 /**
 * Check if a mark is active in the current selection

package/dist/prosemirror/extensions/nodes/NoteMarkerExtension.d.ts

@@ -0,0 +1,6 @@
+import { NodeExtension } from "../types.js";
+//#region src/prosemirror/extensions/nodes/NoteMarkerExtension.d.ts
+declare const NOTE_MARKER_NODE_NAME = "noteMarker";
+declare const NoteMarkerExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
+//#endregion
+export { NOTE_MARKER_NODE_NAME, NoteMarkerExtension };

package/dist/prosemirror/extensions/nodes/NoteMarkerExtension.js

@@ -0,0 +1,36 @@
+import { expectNoteMarkerAttrs } from "../../../internal/noteMarkerAttrs.js";
+import { createNodeExtension } from "../create.js";
+//#region src/prosemirror/extensions/nodes/NoteMarkerExtension.ts
+/** An authored automatic note mark: invisible, but retained through PM JSON and edits. */
+const NOTE_MARKER_NODE_NAME = "noteMarker";
+const NoteMarkerExtension = createNodeExtension({
+	name: NOTE_MARKER_NODE_NAME,
+	schemaNodeName: NOTE_MARKER_NODE_NAME,
+	nodeSpec: {
+		inline: true,
+		group: "inline",
+		atom: true,
+		marks: "_",
+		selectable: false,
+		attrs: { kind: {} },
+		parseDOM: [{
+			tag: "span[data-docx-note-marker]",
+			getAttrs(node) {
+				if (!(node instanceof HTMLElement)) return false;
+				const kind = node.dataset["docxNoteMarker"];
+				return kind === "footnote" || kind === "endnote" ? { kind } : false;
+			}
+		}],
+		toDOM(node) {
+			const { kind } = expectNoteMarkerAttrs(node);
+			return ["span", {
+				"data-docx-note-marker": kind,
+				"aria-hidden": "true",
+				contenteditable: "false",
+				style: "display: none;"
+			}];
+		}
+	}
+});
+//#endregion
+export { NOTE_MARKER_NODE_NAME, NoteMarkerExtension };

package/dist/prosemirror/extensions/nodes/PreservedXmlExtension.js

@@ -25,7 +25,8 @@ const PreservedXmlExtension = createNodeExtension({
 		attrs: {
 			xml: {},
 			text: { default: "" },
-			level: { default: PRESERVED_XML_LEVELS.run }
+			level: { default: PRESERVED_XML_LEVELS.run },
+			foldedListNumber: { default: void 0 }
 		},
 		parseDOM: [{
 			tag: "span[data-docx-preserved-xml]",
@@ -42,7 +43,8 @@ const PreservedXmlExtension = createNodeExtension({
 			}
 		}],
 		toDOM(node) {
-			const { xml, text, level } = expectPreservedXmlAttrs(node);
+			const { xml, text, level, foldedListNumber } = expectPreservedXmlAttrs(node);
+			if (foldedListNumber) return ["span", { contenteditable: "false" }];
 			return [
 				"span",
 				{

package/dist/prosemirror/listMarker.d.ts

@@ -55,6 +55,7 @@ declare const CLEARED_LIST_RENDERING_ATTRS: Readonly<{
   listMarkerSuffix: null;
   listMarkerAllCaps: null;
   listImplicitChildLevelAdvances: null;
+  listFoldedMarkerSuffix: null;
   listMarkerSecondSlotOffsetTwips: null;
   listLevelNumFmts: null;
   listLevelStarts: null;

package/dist/prosemirror/listMarker.js

@@ -17,6 +17,7 @@ const CLEARED_LIST_RENDERING_ATTRS = Object.freeze({
 	listMarkerSuffix: null,
 	listMarkerAllCaps: null,
 	listImplicitChildLevelAdvances: null,
+	listFoldedMarkerSuffix: null,
 	listMarkerSecondSlotOffsetTwips: null,
 	listLevelNumFmts: null,
 	listLevelStarts: null,
@@ -76,6 +77,7 @@ function previousListAttrs(attrs) {
 		...previous.listNumFmt !== void 0 ? { listNumFmt: previous.listNumFmt } : {},
 		...previous.listMarker !== void 0 ? { listMarker: previous.listMarker } : {},
 		...previous.listMarkerTemplate !== void 0 ? { listMarkerTemplate: previous.listMarkerTemplate } : {},
+		...previous.listFoldedMarkerSuffix !== void 0 ? { listFoldedMarkerSuffix: previous.listFoldedMarkerSuffix } : {},
 		...previous.listMarkerHidden !== void 0 ? { listMarkerHidden: previous.listMarkerHidden } : {},
 		...previous.listMarkerFormatting !== void 0 ? { listMarkerFormatting: previous.listMarkerFormatting } : {},
 		...previous.listMarkerAlignment !== void 0 ? { listMarkerAlignment: previous.listMarkerAlignment } : {},
@@ -178,6 +180,7 @@ function formatNumberedMarker(counters, level) {
 }
 function advanceListMarker(attrs, state) {
 	const markerTemplate = attrs.listMarkerTemplate ?? attrs.listMarker;
+	const foldedMarkerSuffix = attrs.listFoldedMarkerSuffix ?? void 0;
 	const level = paragraphNumberingLevel(attrs.numPr) ?? 0;
 	if (!Number.isInteger(level) || level < 0 || level > 8) return null;
 	const numId = paragraphNumberingReferenceId(attrs.numPr);
@@ -205,7 +208,9 @@ function advanceListMarker(attrs, state) {
 			fromStyle: false,
 			numId: null
 		};
-		return convertBulletToUnicode(attrs.listMarker ?? markerTemplate ?? "", bulletMarkerFontName(attrs.listMarkerFormatting));
+		if (foldedMarkerSuffix !== void 0 && attrs.listMarkerTemplate == null) return attrs.listMarker ?? null;
+		const marker = convertBulletToUnicode(attrs.listMarkerTemplate ?? attrs.listMarker ?? "", bulletMarkerFontName(attrs.listMarkerFormatting));
+		return foldedMarkerSuffix === void 0 ? marker : `${marker}\t${foldedMarkerSuffix}`;
 	}
 	const firstInstanceEncounter = !state.counters.has(numId);
 	let counters = state.counters.get(numId) ?? Array.from({ length: 9 }, () => NaN);
@@ -250,12 +255,16 @@ function advanceListMarker(attrs, state) {
 		numId
 	};
 	const levelFormats = attrs.listLevelNumFmts ?? (attrs.listNumFmt ? [attrs.listNumFmt] : void 0);
-	if (markerTemplate?.includes("%")) return resolveListTemplate({
-		template: markerTemplate,
-		counters,
-		levelFormats,
-		forceDecimal: attrs.listIsLegal
-	});
+	if (markerTemplate?.includes("%") && (foldedMarkerSuffix === void 0 || attrs.listMarkerTemplate != null)) {
+		const marker = resolveListTemplate({
+			template: markerTemplate,
+			counters,
+			levelFormats,
+			forceDecimal: attrs.listIsLegal
+		});
+		return foldedMarkerSuffix === void 0 ? marker : `${marker}\t${foldedMarkerSuffix}`;
+	}
+	if (foldedMarkerSuffix !== void 0 && attrs.listMarkerTemplate != null) return `${attrs.listMarkerTemplate}\t${foldedMarkerSuffix}`;
 	if (attrs.listMarker) return attrs.listMarker;
 	if ((levelFormats?.[level] ?? attrs.listNumFmt) === "none" || attrs.listMarker === "") return null;
 	return formatNumberedMarker(counters, level);

package/dist/prosemirror/listNumbering.js

@@ -2,6 +2,7 @@ import { mintListInstance, restartListInstance } from "../docx/listNumberingInst
 import { createNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
 import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
+import { withCanonicalCommand } from "./canonicalCommands.js";
 import { paragraphPropertiesSnapshot } from "./commands/propertyChangeScope.js";
 import { listRenderingFor, recordsListRendering } from "./listRendering.js";
 import { LIST_RENDERING_ATTR_KEYS } from "./listRenderingAttrs.js";
@@ -11,6 +12,22 @@ import { getDocumentStyleResolver } from "./plugins/documentStyleState.js";
 import { SUGGESTION_META, makeRevisionInfo } from "./plugins/suggestionMode.js";
 import { listAttrsFromNumbering, listLevelIndentAttrPatch } from "./styles/resolvedStyleAttrs.js";
 //#region src/prosemirror/listNumbering.ts
+/**
+* Which numbering instance a list command puts a paragraph in, and the
+* *Restart Numbering*, *Continue Numbering* and *Set Numbering Value* commands.
+*
+* A paragraph made into a list item continues the list directly above or below
+* it when that list is of the requested kind (and, for a typed marker, has the
+* typed format). Otherwise it starts a new list: a new `w:num`, defined on the
+* paragraphs it numbers (see `docx/listNumberingInstances.ts`). A list that a
+* paragraph style supplies (a heading's numbering from `styles.xml`) is never
+* joined implicitly; it belongs to the style, not to the body text around it.
+*
+* Every change made while suggesting is recorded as one `w:pPrChange` per
+* paragraph. A paragraph that already carries one keeps a single record whose
+* previous state is the paragraph's original, so rejecting it restores what the
+* paragraph was before any of the tracked changes.
+*/
 const PARAGRAPH_NODE = "paragraph";
 /**
 * The paragraph's properties as a `w:pPrChange` records them before a list
@@ -187,6 +204,7 @@ const listItemAttrs = (attrs, { numId, ilvl }, numbering) => ({
 		ilvl
 	}, numbering),
 	listImplicitChildLevelAdvances: attrs["listImplicitChildLevelAdvances"] ?? null,
+	listFoldedMarkerSuffix: attrs["listFoldedMarkerSuffix"] ?? void 0,
 	listMarkerSecondSlotOffsetTwips: attrs["listMarkerSecondSlotOffsetTwips"] ?? null
 });
 /**
@@ -260,7 +278,7 @@ const moveItems = ({ state, items, numId, numbering }) => {
 * its list move to a new instance of the same definition, whose
 * `w:startOverride` at the item's level is `value`.
 */
-const setNumberingValue = (value) => (state, dispatch) => {
+const setNumberingValue = (value) => withCanonicalCommand((state, dispatch) => {
 	if (!Number.isSafeInteger(value) || value < 0) return false;
 	const selected = selectedListParagraph(state);
 	const numbering = getDocumentNumbering(state);
@@ -279,9 +297,12 @@ const setNumberingValue = (value) => (state, dispatch) => {
 		numbering: createNumberingMap(restarted.definitions)
 	}));
 	return true;
-};
+}, () => [{
+	type: "restartNumbering",
+	start: value
+}]);
 /** *Restart at 1*: the selected item starts its list over at one. */
-const restartNumbering = (state, dispatch) => setNumberingValue(1)(state, dispatch);
+const restartNumbering = withCanonicalCommand((state, dispatch) => setNumberingValue(1)(state, dispatch), () => [{ type: "restartNumbering" }]);
 /** The nearest list before `beforePos` of the kind `membership` has, other than its own. */
 const previousListOfKind = (state, beforePos, membership) => {
 	const numbering = getDocumentNumbering(state);
@@ -301,7 +322,7 @@ const previousListOfKind = (state, beforePos, membership) => {
 * join the nearest earlier list of the same kind, so their numbers carry on
 * from it. Not applicable when no such list precedes the item.
 */
-const continueNumbering = (state, dispatch) => {
+const continueNumbering = withCanonicalCommand((state, dispatch) => {
 	const selected = selectedListParagraph(state);
 	const numbering = getDocumentNumbering(state);
 	if (!selected || !numbering) return false;
@@ -315,7 +336,7 @@ const continueNumbering = (state, dispatch) => {
 		numbering
 	}));
 	return true;
-};
+}, () => [{ type: "continueNumbering" }]);
 const NO_LIST_NUMBERING_MENU = { type: "none" };
 /**
 * Whether the selection is in a list item whose numbering can be restarted

package/dist/prosemirror/listRenderingAttrs.d.ts

@@ -6,6 +6,7 @@ type ListRenderingAttrField = Exclude<keyof document_d_exports.ListRendering, "l
 declare const LIST_RENDERING_ATTR_BY_FIELD: {
   readonly marker: "listMarker";
   readonly markerTemplate: "listMarkerTemplate";
+  readonly foldedMarkerSuffix: "listFoldedMarkerSuffix";
   readonly isBullet: "listIsBullet";
   readonly isLegal: "listIsLegal";
   readonly numFmt: "listNumFmt";

package/dist/prosemirror/listRenderingAttrs.js

@@ -12,6 +12,7 @@ import { paragraphNumberingLevel } from "@stll/docx-core/model";
 const LIST_RENDERING_ATTR_BY_FIELD = {
 	marker: "listMarker",
 	markerTemplate: "listMarkerTemplate",
+	foldedMarkerSuffix: "listFoldedMarkerSuffix",
 	isBullet: "listIsBullet",
 	isLegal: "listIsLegal",
 	numFmt: "listNumFmt",
@@ -41,6 +42,7 @@ const listRenderingAttrPatch = (rendering) => {
 	const patch = {
 		listMarker: rendering.marker || void 0,
 		listMarkerTemplate: rendering.markerTemplate || void 0,
+		listFoldedMarkerSuffix: rendering.foldedMarkerSuffix,
 		listIsBullet: rendering.isBullet || void 0,
 		listIsLegal: rendering.isLegal || void 0,
 		listNumFmt: rendering.numFmt || void 0,
@@ -73,6 +75,7 @@ const hasListRendering = (attrs) => attrs.listMarker != null || attrs.listIsBull
 const listRenderingFromAttrs = ({ attrs, numId }) => {
 	const optional = {
 		markerTemplate: attrs.listMarkerTemplate ?? void 0,
+		foldedMarkerSuffix: attrs.listFoldedMarkerSuffix ?? void 0,
 		isLegal: attrs.listIsLegal ?? void 0,
 		numFmt: attrs.listNumFmt ?? void 0,
 		markerHidden: attrs.listMarkerHidden ?? void 0,

package/dist/prosemirror/markupViewNotes.js

@@ -10,10 +10,11 @@ const resolvedNote = (note, mode, state, document) => {
 	const styleResolver = getDocumentStyleResolver(state);
 	const cached = resolvedNotes.get(note)?.get(mode);
 	if (cached?.styleResolver === styleResolver) return cached.note;
-	const { styles, theme } = document.package;
+	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const result = resolveWholeStory({
 		doc,

package/dist/prosemirror/moveRangeBoundaryAttrs.d.ts

@@ -1,5 +1,6 @@
 import { document_d_exports } from "../types/document.js";
-import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/moveRangeBoundaryAttrs.d.ts
 type MoveRangeMarker = Extract<document_d_exports.ParagraphContent, {

package/dist/prosemirror/noteReferenceReview.js

@@ -64,7 +64,8 @@ const restoredNote = (note, document, reference) => {
 	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const revisions = noteDeletionRevisions(doc, reference);
 	if (revisions.length === 0) return note;
@@ -164,10 +165,11 @@ const deleteNoteWithReference = (transform, reference) => {
 * deleted too, by the reference's author at the reference's date.
 */
 const deletedNote = (note, document, reference) => {
-	const { styles, theme } = document.package;
+	const { styles, theme, numbering } = document.package;
 	const doc = footnoteToProseDoc(note.content, {
 		...styles !== void 0 && { styles },
-		...theme !== void 0 && { theme }
+		...theme !== void 0 && { theme },
+		...numbering !== void 0 && { numbering }
 	});
 	const transform = deleteNoteWithReference(new Transform(doc), reference);
 	if (!transform.docChanged) return note;

package/dist/prosemirror/plugins/suggestionMode.js

@@ -527,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);
@@ -548,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;
 }
@@ -895,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.
 */
@@ -1039,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);
@@ -1057,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. */