@stll/folio-core 0.54.2 → 0.56.0

package/dist/prosemirror/executeEditorCommand.d.ts

@@ -0,0 +1,11 @@
+import { Command } from "prosemirror-state";
+import { EditorView } from "prosemirror-view";
+//#region src/prosemirror/executeEditorCommand.d.ts
+/** The view's controller owns canonical command interpretation. */
+declare const registerEditorCommandOwner: (view: EditorView, execute: (command: Command) => boolean | undefined) => () => void;
+/** Keep commands on their selected view; a handled refusal must not fall through. */
+declare const executeEditorCommand: (view: EditorView, command: Command) => boolean;
+/** Legacy command chains stop at the first owner decision, including refusal. */
+declare const executeFirstEditorCommand: (view: EditorView, commands: readonly Command[]) => boolean;
+//#endregion
+export { executeEditorCommand, executeFirstEditorCommand, registerEditorCommandOwner };

package/dist/prosemirror/executeEditorCommand.js

@@ -0,0 +1,26 @@
+//#region src/prosemirror/executeEditorCommand.ts
+const owners = /* @__PURE__ */ new WeakMap();
+/** The view's controller owns canonical command interpretation. */
+const registerEditorCommandOwner = (view, execute) => {
+	owners.set(view, execute);
+	return () => {
+		owners.delete(view);
+	};
+};
+/** Keep commands on their selected view; a handled refusal must not fall through. */
+const executeEditorCommand = (view, command) => {
+	const handled = owners.get(view)?.(command);
+	if (handled !== void 0) return handled;
+	return command(view.state, (transaction) => view.dispatch(transaction), view);
+};
+/** Legacy command chains stop at the first owner decision, including refusal. */
+const executeFirstEditorCommand = (view, commands) => {
+	for (const command of commands) {
+		const handled = owners.get(view)?.(command);
+		if (handled !== void 0) return handled;
+		if (command(view.state, (transaction) => view.dispatch(transaction), view)) return true;
+	}
+	return false;
+};
+//#endregion
+export { executeEditorCommand, executeFirstEditorCommand, registerEditorCommandOwner };

package/dist/prosemirror/extensions/StarterKit.js

@@ -30,6 +30,7 @@ import { HorizontalRuleExtension } from "./nodes/HorizontalRuleExtension.js";
 import { ImageExtension } from "./nodes/ImageExtension.js";
 import { MathExtension } from "./nodes/MathExtension.js";
 import { MoveRangeBoundaryExtension } from "./nodes/MoveRangeBoundaryExtension.js";
+import { NoteMarkerExtension } from "./nodes/NoteMarkerExtension.js";
 import { PageBreakExtension } from "./nodes/PageBreakExtension.js";
 import { PageBreakRunExtension } from "./nodes/PageBreakRunExtension.js";
 import { PreservedBlockExtension } from "./nodes/PreservedBlockExtension.js";
@@ -76,6 +77,7 @@ function createStarterKit(options = {}) {
 	add("tab", TabExtension());
 	add("symbol", SymbolExtension());
 	add("preservedXml", PreservedXmlExtension());
+	add("noteMarker", NoteMarkerExtension());
 	add("image", ImageExtension());
 	add("textBox", TextBoxExtension());
 	add("textBoxAnchor", TextBoxAnchorExtension({ getInternalClipboardToken }));

package/dist/prosemirror/extensions/core/ParagraphExtension.js

@@ -8,6 +8,7 @@ import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
+import { withCanonicalCommand, withCanonicalParagraphFormatting, withCanonicalStartParagraphFormatting } from "../../canonicalCommands.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
@@ -232,6 +233,7 @@ const paragraphNodeSpec = {
 		listMarkerSuffix: { default: null },
 		listMarkerAllCaps: { default: null },
 		listImplicitChildLevelAdvances: { default: null },
+		listFoldedMarkerSuffix: { default: void 0 },
 		listMarkerSecondSlotOffsetTwips: { default: null },
 		listLevelNumFmts: { default: null },
 		listLevelStarts: { default: null },
@@ -631,27 +633,56 @@ const ParagraphExtension = createNodeExtension({
 	onSchemaReady() {
 		const applyStyleFn = makeApplyStyle();
 		return { commands: {
-			setAlignment: (alignment) => makeSetAlignment(alignment),
-			alignLeft: () => makeSetAlignment("left"),
-			alignCenter: () => makeSetAlignment("center"),
-			alignRight: () => makeSetAlignment("right"),
-			alignJustify: () => makeSetAlignment("both"),
-			setLineSpacing: (value, rule) => makeSetLineSpacing(value, rule),
-			singleSpacing: () => makeSetLineSpacing(240),
-			oneAndHalfSpacing: () => makeSetLineSpacing(360),
-			doubleSpacing: () => makeSetLineSpacing(480),
-			setSpaceBefore: (twips) => setParagraphSpacingAttr("before", twips),
-			setSpaceAfter: (twips) => setParagraphSpacingAttr("after", twips),
-			increaseIndent: (amount) => makeIncreaseIndent(amount),
-			decreaseIndent: (amount) => makeDecreaseIndent(amount),
-			setIndentLeft: (twips) => setParagraphAttr("indentLeft", twips > 0 ? twips : null),
-			setIndentRight: (twips) => setParagraphAttr("indentRight", twips > 0 ? twips : null),
-			setIndentFirstLine: (twips, hanging) => setParagraphAttrsCmd({
+			setAlignment: (alignment) => withCanonicalParagraphFormatting(makeSetAlignment(alignment), { alignment }),
+			alignLeft: () => withCanonicalParagraphFormatting(makeSetAlignment("left"), { alignment: "left" }),
+			alignCenter: () => withCanonicalParagraphFormatting(makeSetAlignment("center"), { alignment: "center" }),
+			alignRight: () => withCanonicalParagraphFormatting(makeSetAlignment("right"), { alignment: "right" }),
+			alignJustify: () => withCanonicalParagraphFormatting(makeSetAlignment("both"), { alignment: "both" }),
+			setLineSpacing: (value, rule) => withCanonicalParagraphFormatting(makeSetLineSpacing(value, rule), {
+				lineSpacing: value,
+				lineSpacingRule: rule ?? "auto"
+			}),
+			singleSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(240), {
+				lineSpacing: 240,
+				lineSpacingRule: "auto"
+			}),
+			oneAndHalfSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(360), {
+				lineSpacing: 360,
+				lineSpacingRule: "auto"
+			}),
+			doubleSpacing: () => withCanonicalParagraphFormatting(makeSetLineSpacing(480), {
+				lineSpacing: 480,
+				lineSpacingRule: "auto"
+			}),
+			setSpaceBefore: (twips) => withCanonicalParagraphFormatting(setParagraphSpacingAttr("before", twips), { spaceBefore: twips }),
+			setSpaceAfter: (twips) => withCanonicalParagraphFormatting(setParagraphSpacingAttr("after", twips), { spaceAfter: twips }),
+			increaseIndent: (amount) => withCanonicalParagraphFormatting(makeIncreaseIndent(amount), (node) => ({ indentLeft: (expectParagraphAttrs(node).indentLeft ?? 0) + (amount ?? 720) })),
+			decreaseIndent: (amount) => withCanonicalParagraphFormatting(makeDecreaseIndent(amount), (node) => {
+				const attrs = expectParagraphAttrs(node);
+				const indentLeft = Math.max(0, (attrs.indentLeft ?? 0) - (amount ?? 720));
+				return { indentLeft: indentLeft > 0 || paragraphNumberingReferenceId(attrs.numPr ?? void 0) !== void 0 ? indentLeft : null };
+			}),
+			setIndentLeft: (twips) => withCanonicalParagraphFormatting(setParagraphAttr("indentLeft", twips > 0 ? twips : null), { indentLeft: twips > 0 ? twips : null }),
+			setIndentRight: (twips) => withCanonicalParagraphFormatting(setParagraphAttr("indentRight", twips > 0 ? twips : null), { indentRight: twips > 0 ? twips : null }),
+			setIndentFirstLine: (twips, hanging) => withCanonicalParagraphFormatting(setParagraphAttrsCmd({
+				indentFirstLine: twips > 0 ? twips : null,
+				hangingIndent: hanging ?? false
+			}), {
 				indentFirstLine: twips > 0 ? twips : null,
 				hangingIndent: hanging ?? false
 			}),
-			applyStyle: (styleId, resolvedAttrs) => applyStyleFn(styleId, resolvedAttrs),
-			clearStyle: () => (state, dispatch) => {
+			applyStyle: (styleId, resolvedAttrs) => withCanonicalParagraphFormatting(applyStyleFn(styleId, resolvedAttrs), {
+				styleId,
+				...resolvedAttrs ? {
+					alignment: null,
+					outlineLevel: null,
+					spaceBefore: null,
+					spaceAfter: null,
+					lineSpacing: null,
+					lineSpacingRule: null
+				} : {}
+			}),
+			clearStyle: () => withCanonicalParagraphFormatting((state, dispatch) => {
 				const resolver = getDocumentStyleResolver(state);
 				if (!resolver) return applyStyleFn(null)(state, dispatch);
 				const resolved = resolver.resolveParagraphStyle(null);
@@ -662,10 +693,10 @@ const ParagraphExtension = createNodeExtension({
 					...styleName && { styleName },
 					numbering: getDocumentNumbering(state)
 				})(state, dispatch);
-			},
+			}, { styleId: null }),
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
-			generateTOC: ({ title }) => (state, dispatch) => {
+			generateTOC: ({ title }) => withCanonicalCommand((state, dispatch) => {
 				const builtInStyles = getDocumentBuiltInStyles(state);
 				const headings = collectHeadings(state.doc, builtInStyles);
 				if (headings.length === 0) return false;
@@ -742,44 +773,53 @@ const ParagraphExtension = createNodeExtension({
 				tr.insert(insertPos, Fragment.from(tocNodes));
 				dispatch(tr.scrollIntoView());
 				return true;
-			},
-			toggleBidi: () => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("direction", directionIsRtl(paragraph.attrs["direction"]) ? {
+			}, (state) => [{
+				type: "generateTOC",
+				at: state.selection.from,
+				title
+			}]),
+			toggleBidi: () => {
+				const directionFor = (paragraph) => ({
 					source: "manual",
-					value: "ltr"
-				} : {
-					source: "manual",
-					value: "rtl"
-				})(state, dispatch);
+					value: directionIsRtl(expectParagraphAttrs(paragraph).direction) ? "ltr" : "rtl"
+				});
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("direction", directionFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ bidi: directionIsRtl(directionFor(paragraph)) }));
 			},
-			setRtl: () => setParagraphAttr("direction", {
+			setRtl: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "rtl"
-			}),
-			setLtr: () => setParagraphAttr("direction", {
+			}), { bidi: true }),
+			setLtr: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "ltr"
-			}),
-			setTabs: (tabs) => setParagraphAttr("tabs", tabs.length > 0 ? tabs : null),
-			addTabStop: (position, alignment = "left", leader = "none") => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("tabs", [...(paragraph.attrs["tabs"] || []).filter((t) => t.position !== position), {
+			}), { bidi: false }),
+			setTabs: (tabs) => withCanonicalParagraphFormatting(setParagraphAttr("tabs", tabs.length > 0 ? tabs : null), { tabs: tabs.length > 0 ? tabs : null }),
+			addTabStop: (position, alignment = "left", leader = "none") => {
+				const tabsFor = (paragraph) => [...(expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position), {
 					position,
 					alignment,
 					leader
-				}].toSorted((a, b) => a.position - b.position))(state, dispatch);
+				}].toSorted((a, b) => a.position - b.position);
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			},
-			removeTabStop: (position) => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				const newTabs = (paragraph.attrs["tabs"] || []).filter((t) => t.position !== position);
-				return setParagraphAttr("tabs", newTabs.length > 0 ? newTabs : null)(state, dispatch);
+			removeTabStop: (position) => {
+				const tabsFor = (paragraph) => {
+					const tabs = (expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position);
+					return tabs.length > 0 ? tabs : null;
+				};
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			}
 		} };
 	}

package/dist/prosemirror/extensions/features/ListExtension.js

@@ -1,5 +1,6 @@
 import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../../../docx/numberingReference.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
+import { withCanonicalCommand } from "../../canonicalCommands.js";
 import { LIST_MARKER_PATTERN, listRequestsForMarker } from "../../listAutoformatMarkers.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { applyParagraphUpdates, continueNumbering, listItemAttrs, resolveListTarget, restartNumbering, setNumberingValue } from "../../listNumbering.js";
@@ -107,8 +108,14 @@ function toggleList(intent) {
 		return true;
 	};
 }
-const toggleBulletList = (state, dispatch) => toggleList("bullet")(state, dispatch);
-const toggleNumberedList = (state, dispatch) => toggleList("numbered")(state, dispatch);
+const toggleBulletList = withCanonicalCommand((state, dispatch) => toggleList("bullet")(state, dispatch), () => [{
+	type: "toggleList",
+	kind: "bullet"
+}]);
+const toggleNumberedList = withCanonicalCommand((state, dispatch) => toggleList("numbered")(state, dispatch), () => [{
+	type: "toggleList",
+	kind: "decimal"
+}]);
 const attrsForListLevel = (state, attrs, level) => {
 	if (!hasActiveListNumbering(attrs)) panic("Cannot change the level of a list without a numbering id");
 	return {
@@ -394,9 +401,15 @@ const ListExtension = createExtension({
 			commands: {
 				toggleBulletList: () => toggleBulletList,
 				toggleNumberedList: () => toggleNumberedList,
-				increaseListLevel: () => increaseListLevel,
-				decreaseListLevel: () => decreaseListLevel,
-				removeList: () => removeList,
+				increaseListLevel: () => withCanonicalCommand(increaseListLevel, () => [{
+					type: "changeListLevel",
+					direction: "increase"
+				}]),
+				decreaseListLevel: () => withCanonicalCommand(decreaseListLevel, () => [{
+					type: "changeListLevel",
+					direction: "decrease"
+				}]),
+				removeList: () => withCanonicalCommand(removeList, () => [{ type: "removeList" }]),
 				restartNumbering: () => restartNumbering,
 				continueNumbering: () => continueNumbering,
 				setNumberingValue: (value) => setNumberingValue(value)

package/dist/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts

@@ -2,7 +2,7 @@ import { document_d_exports } from "../../../types/document.js";
 import { Extension } from "../types.js";
 import { RemovedSectionReference, TrackedSectionEndpointRemoval } from "../../../internal/sectionEndpointResolution.js";
 import { Node } from "prosemirror-model";
-import { EditorState, PluginKey, Transaction } from "prosemirror-state";
+import { EditorState, Plugin, PluginKey, Transaction } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.d.ts
 declare const paragraphChangeTrackerKey: PluginKey<InternalParagraphChangeTrackerState>;
 type ParagraphChangeTrackerState = {
@@ -30,6 +30,7 @@ type InternalParagraphChangeTrackerState = ParagraphChangeTrackerState & {
   /** The section records themselves, by identity. */
   sectionRecords: ReadonlySet<document_d_exports.SectionProperties>;
 };
+declare function createParagraphChangeTrackerPlugin(): Plugin<InternalParagraphChangeTrackerState>;
 /**
  * Get the change tracker state from an EditorState
  */
@@ -85,6 +86,8 @@ declare function markSectionBreakRemoval(tr: Transaction, sourceDoc: Node): Tran
  */
 declare function clearTrackedChanges(state: EditorState): Transaction;
 declare function ignoreTrackedChanges(tr: Transaction): Transaction;
+/** A committed package-story/property edit requires the full package serializer. */
+declare const markPackageChange: (tr: Transaction) => Transaction;
 declare function markStructuralChange(tr: Transaction): Transaction;
 type MarkChangedParagraphRangesOptions = {
   ranges: readonly {
@@ -98,4 +101,4 @@ type MarkChangedParagraphRangesOptions = {
 declare function markChangedParagraphRanges(tr: Transaction, batch: MarkChangedParagraphRangesOptions): Transaction;
 declare const ParagraphChangeTrackerExtension: (options?: Partial<{}> | undefined) => Extension;
 //#endregion
-export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };
+export { ParagraphChangeTrackerExtension, ParagraphChangeTrackerState, clearTrackedChanges, createParagraphChangeTrackerPlugin, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markPackageChange, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };

package/dist/prosemirror/extensions/features/ParagraphChangeTrackerExtension.js

@@ -13,6 +13,7 @@ const paragraphChangeTrackerKey = new PluginKey("paragraphChangeTracker");
 const CLEAR_META = "clear";
 const IGNORE_META = "ignore";
 const STRUCTURAL_META = "structural";
+const PACKAGE_CHANGE_META = "package-change";
 const CHANGED_PARAGRAPH_RANGES_META = "folioChangedParagraphRanges";
 const SECTION_ENDPOINT_REMOVAL_META = "folioSectionEndpointRemoval";
 const SECTION_EDIT_META = "folioSectionEdit";
@@ -258,6 +259,11 @@ function createParagraphChangeTrackerPlugin() {
 						sectionRecords: counts.sectionRecords
 					};
 				}
+				if (meta === PACKAGE_CHANGE_META && !tr.docChanged) return {
+					...prevState,
+					hasUntrackedSourceChanges: true,
+					hasUntrackedChanges: true
+				};
 				if (!tr.docChanged) return isSectionEditMeta(sectionEditMeta) && sectionEditMeta.expectedEndpointFingerprint === prevState.sectionEndpointFingerprint ? {
 					...prevState,
 					sectionEndpointRemoval: sectionEditMeta.authorization
@@ -326,6 +332,10 @@ function createParagraphChangeTrackerPlugin() {
 						newState.hasUntrackedChanges = true;
 					}
 				}
+				if (meta === PACKAGE_CHANGE_META) {
+					newState.hasUntrackedSourceChanges = true;
+					newState.hasUntrackedChanges = true;
+				}
 				return newState;
 			}
 		},
@@ -503,6 +513,8 @@ function clearTrackedChanges(state) {
 function ignoreTrackedChanges(tr) {
 	return tr.setMeta(paragraphChangeTrackerKey, IGNORE_META);
 }
+/** A committed package-story/property edit requires the full package serializer. */
+const markPackageChange = (tr) => tr.setMeta(paragraphChangeTrackerKey, PACKAGE_CHANGE_META);
 function markStructuralChange(tr) {
 	return tr.setMeta(paragraphChangeTrackerKey, STRUCTURAL_META);
 }
@@ -523,4 +535,4 @@ const ParagraphChangeTrackerExtension = createExtension({
 	}
 });
 //#endregion
-export { ParagraphChangeTrackerExtension, clearTrackedChanges, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };
+export { ParagraphChangeTrackerExtension, clearTrackedChanges, createParagraphChangeTrackerPlugin, getChangeTrackerState, getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges, ignoreTrackedChanges, markChangedParagraphRanges, markPackageChange, markSectionBreakRemoval, markStructuralChange, markTrackedSectionEndpointRemoval, paragraphChangeTrackerKey, repackWithEditorSectionRemovals };

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

@@ -1,6 +1,10 @@
+import { BUILT_IN_STYLE_NAME } from "../../../docx/builtInStyles.js";
 import { anchorTargetAttrs, normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
+import { withCanonicalCommand } from "../../canonicalCommands.js";
+import { canonicalSelectionRange } from "../../canonicalSelectionRange.js";
 import { removeHyperlinkInRange } from "../../hyperlinkRemoval.js";
+import { getDocumentBuiltInStyles } from "../../plugins/documentStyleState.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
 import { panic } from "better-result";
@@ -121,7 +125,7 @@ const HyperlinkExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		if (!ctx.schema.marks["hyperlink"]) panic("Missing mark type: hyperlink");
 		const documentHyperlinkType = (state) => state.schema.marks["hyperlink"] ?? panic("Missing mark type: hyperlink");
-		const setHyperlink = (href, tooltip) => (state, dispatch) => {
+		const setHyperlink = (href, tooltip) => withCanonicalCommand((state, dispatch) => {
 			const hlType = documentHyperlinkType(state);
 			const { from, to, empty } = state.selection;
 			if (empty) return false;
@@ -136,34 +140,52 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(tr.scrollIntoView());
 			}
 			return true;
-		};
-		const removeHyperlink = (state, dispatch) => {
+		}, (state) => state.selection.empty ? [] : [{
+			type: "setHyperlink",
+			...canonicalSelectionRange(state),
+			href: normalizeHyperlinkInput(href),
+			...tooltip ? { tooltip } : {}
+		}]);
+		const removalRange = (state) => {
+			const { empty, $from } = state.selection;
+			const { from, to } = canonicalSelectionRange(state);
+			if (!empty) return {
+				from,
+				to
+			};
 			const hlType = documentHyperlinkType(state);
-			const { from, to, empty } = state.selection;
-			if (empty) {
-				const $pos = state.selection.$from;
-				if (!$pos.marks().find((m) => m.type === hlType)) return false;
-				let start = $pos.pos;
-				let end = $pos.pos;
-				$pos.parent.forEach((node, offset) => {
-					if (node.isText) {
-						const nodeStart = $pos.start() + offset;
-						const nodeEnd = nodeStart + node.nodeSize;
-						if (nodeStart <= $pos.pos && $pos.pos <= nodeEnd) {
-							if (node.marks.some((m) => m.type === hlType)) {
-								start = Math.min(start, nodeStart);
-								end = Math.max(end, nodeEnd);
-							}
-						}
-					}
-				});
-				if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, start, end).scrollIntoView());
-				return true;
-			}
-			if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, from, to).scrollIntoView());
-			return true;
+			if (!$from.marks().some((mark) => mark.type === hlType)) return void 0;
+			let start = from;
+			let end = to;
+			$from.parent.forEach((node, offset) => {
+				const nodeStart = $from.start() + offset;
+				const nodeEnd = nodeStart + node.nodeSize;
+				if (node.isText && nodeStart <= from && from <= nodeEnd && node.marks.some((mark) => mark.type === hlType)) {
+					start = Math.min(start, nodeStart);
+					end = Math.max(end, nodeEnd);
+				}
+			});
+			return {
+				from: start,
+				to: end
+			};
 		};
-		const insertHyperlink = (text, href, tooltip) => (state, dispatch) => {
+		const removeHyperlink = withCanonicalCommand((state, dispatch) => {
+			const range = removalRange(state);
+			if (!range) return false;
+			if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, range.from, range.to).scrollIntoView());
+			return true;
+		}, (state) => {
+			const range = removalRange(state);
+			if (!range) return [];
+			const hyperlinkStyleId = getDocumentBuiltInStyles(state).styleIdForBuiltInName(BUILT_IN_STYLE_NAME.hyperlink);
+			return [{
+				type: "removeHyperlink",
+				...range,
+				...hyperlinkStyleId === void 0 ? {} : { hyperlinkStyleId }
+			}];
+		});
+		const insertHyperlink = (text, href, tooltip) => withCanonicalCommand((state, dispatch) => {
 			const hlType = documentHyperlinkType(state);
 			if (dispatch) {
 				const mark = hlType.create({
@@ -174,7 +196,13 @@ const HyperlinkExtension = createMarkExtension({
 				dispatch(state.tr.replaceSelectionWith(textNode, false).scrollIntoView());
 			}
 			return true;
-		};
+		}, (state) => [{
+			type: "insertHyperlink",
+			...canonicalSelectionRange(state),
+			text,
+			href: normalizeHyperlinkInput(href),
+			...tooltip ? { tooltip } : {}
+		}]);
 		return { commands: {
 			setHyperlink,
 			removeHyperlink: () => removeHyperlink,

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

@@ -1,5 +1,6 @@
 import { textToStyle } from "../../../utils/formatToStyle.js";
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
+import { canonicalRunFormatting, withCanonicalCommand } from "../../canonicalCommands.js";
 import { clearRunColor } from "../../clearRunColor.js";
 import { createMarkExtension } from "../create.js";
 import { setMark } from "./markUtils.js";
@@ -40,10 +41,10 @@ const TextColorExtension = createMarkExtension({
 		if (!textColorType) panic("Missing mark type: textColor");
 		return { commands: {
 			setTextColor: (attrs) => {
-				if (!attrs.rgb && !attrs.themeColor) return clearRunColor();
+				if (!attrs.rgb && !attrs.themeColor) return withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }));
 				return setMark(textColorType, attrs);
 			},
-			clearTextColor: () => clearRunColor()
+			clearTextColor: () => withCanonicalCommand(clearRunColor(), (state) => canonicalRunFormatting(state, { color: null }))
 		} };
 	}
 });

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

@@ -58,6 +58,7 @@ const InsertionExtension = createMarkExtension({
 			provenance: { default: "user" },
 			suggestionId: { default: null },
 			_docxOuterWrapperCount: { default: null },
+			_docxResolutionJoins: { default: null },
 			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
@@ -120,6 +121,7 @@ const DeletionExtension = createMarkExtension({
 			suggestionId: { default: null },
 			_historicalFormatting: { default: null },
 			_docxOuterWrapperCount: { default: null },
+			_docxResolutionJoins: { default: null },
 			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,