@stll/folio-core 0.53.0 → 0.54.0

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

@@ -2,6 +2,26 @@ import { createExtension } from "../create.js";
 import { textFormattingToMarks } from "../marks/markUtils.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/extensions/features/EmptyParagraphFormatExtension.ts
+/**
+* EmptyParagraphFormat — re-establishes stored marks for an empty styled
+* paragraph so typed text inherits the style's run formatting (bold, color,
+* size, font).
+*
+* Why this exists:
+* An empty paragraph carries its run defaults in the `defaultTextFormatting`
+* attr (set at load by `toProseDoc`, and when a style is applied via
+* `applyStyle`). The visible painter only derives font/size from that attr,
+* so an empty heading renders a correctly sized caret — but typed text only
+* becomes bold/colored if it carries real marks. Those marks live in
+* `storedMarks`, which ProseMirror clears on the next selection change
+* (e.g. when the style picker dropdown returns focus to the editor).
+*
+* This plugin watches for the caret sitting in an empty paragraph with no
+* stored marks and re-derives them from `defaultTextFormatting`, but only
+* when the defaults carry formatting the painter can't reproduce on its own
+* (bold/italic/color/…). Plain body paragraphs (font + size only) are left
+* untouched so ordinary typed text stays mark-free and serializes cleanly.
+*/
 const emptyParagraphFormatKey = new PluginKey("emptyParagraphFormat");
 /**
 * Run-formatting properties the painter does NOT reproduce from
@@ -15,7 +35,7 @@ const FONT_ONLY_DEFAULTS = /* @__PURE__ */ new Set(["fontFamily", "fontSize"]);
 function hasNonFontDefaults(dtf) {
 	return Object.entries(dtf).some(([property, value]) => value !== void 0 && !FONT_ONLY_DEFAULTS.has(property));
 }
-function createEmptyParagraphFormatPlugin(schema) {
+function createEmptyParagraphFormatPlugin() {
 	return new Plugin({
 		key: emptyParagraphFormatKey,
 		appendTransaction(transactions, _oldState, newState) {
@@ -27,6 +47,7 @@ function createEmptyParagraphFormatPlugin(schema) {
 			if (para.type.name !== "paragraph" || para.content.size !== 0) return null;
 			const dtf = para.attrs["defaultTextFormatting"];
 			if (!dtf || !hasNonFontDefaults(dtf)) return null;
+			const { schema } = newState;
 			const marks = textFormattingToMarks(dtf, schema);
 			if (dtf.styleId) marks.push(schema.mark("characterStyle", { styleId: dtf.styleId }));
 			if (marks.length === 0) return null;
@@ -38,8 +59,8 @@ function createEmptyParagraphFormatPlugin(schema) {
 }
 const EmptyParagraphFormatExtension = createExtension({
 	name: "emptyParagraphFormat",
-	onSchemaReady(ctx) {
-		return { plugins: [createEmptyParagraphFormatPlugin(ctx.schema)] };
+	onSchemaReady() {
+		return { plugins: [createEmptyParagraphFormatPlugin()] };
 	}
 });
 //#endregion

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

@@ -0,0 +1,20 @@
+import { Extension } from "../types.js";
+//#region src/prosemirror/extensions/features/JoinedRunStyleExtension.d.ts
+/**
+ * Runs that a join moves into another paragraph take that paragraph's style.
+ *
+ * Deleting across a paragraph break (Backspace or Delete at the break, a
+ * deletion or typing over a selection that spans paragraphs) runs the later
+ * paragraph's remaining text on into the earlier one. A run's direct
+ * formatting is its own and stays; what the later paragraph's style lent it
+ * does not travel, and it reads in the style of the paragraph it now belongs
+ * to. The document styles plugin re-reads those runs after an ordinary edit.
+ *
+ * A transaction that re-reads the runs it moves itself (resolving a tracked
+ * change, an operation that merges paragraphs) says so with
+ * {@link JOINED_RUNS_RESTYLED_META}, and is left as it is.
+ */
+declare const JOINED_RUNS_RESTYLED_META = "joinedRunsRestyled";
+declare const JoinedRunStyleExtension: (options?: Partial<{}> | undefined) => Extension;
+//#endregion
+export { JOINED_RUNS_RESTYLED_META, JoinedRunStyleExtension };

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

@@ -0,0 +1,43 @@
+import { createExtension } from "../create.js";
+import { Plugin, PluginKey } from "prosemirror-state";
+//#region src/prosemirror/extensions/features/JoinedRunStyleExtension.ts
+/**
+* Runs that a join moves into another paragraph take that paragraph's style.
+*
+* Deleting across a paragraph break (Backspace or Delete at the break, a
+* deletion or typing over a selection that spans paragraphs) runs the later
+* paragraph's remaining text on into the earlier one. A run's direct
+* formatting is its own and stays; what the later paragraph's style lent it
+* does not travel, and it reads in the style of the paragraph it now belongs
+* to. The document styles plugin re-reads those runs after an ordinary edit.
+*
+* A transaction that re-reads the runs it moves itself (resolving a tracked
+* change, an operation that merges paragraphs) says so with
+* {@link JOINED_RUNS_RESTYLED_META}, and is left as it is.
+*/
+const JOINED_RUNS_RESTYLED_META = "joinedRunsRestyled";
+const pastedTableEndKey = new PluginKey("pastedTableEnd");
+/**
+* A table pasted over a story's last paragraph leaves that paragraph, emptied,
+* after it: a story ends with a paragraph, and the paste replaced the words,
+* not the break that ends the story. ProseMirror's paste replaces the whole
+* paragraph, so the empty one is put back.
+*/
+const createPastedTableEndPlugin = () => new Plugin({
+	key: pastedTableEndKey,
+	appendTransaction(transactions, oldState, newState) {
+		if (!transactions.some((transaction) => transaction.docChanged && transaction.getMeta("uiEvent") === "paste")) return null;
+		if (newState.doc.lastChild?.type.spec["tableRole"] !== "table" || oldState.doc.lastChild?.type.name !== "paragraph") return null;
+		const paragraph = newState.schema.nodes["paragraph"]?.createAndFill();
+		return paragraph ? newState.tr.insert(newState.doc.content.size, paragraph) : null;
+	}
+});
+const JoinedRunStyleExtension = createExtension({
+	name: "joinedRunStyle",
+	defaultOptions: {},
+	onSchemaReady() {
+		return { plugins: [createPastedTableEndPlugin()] };
+	}
+});
+//#endregion
+export { JOINED_RUNS_RESTYLED_META, JoinedRunStyleExtension };

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

@@ -7,7 +7,7 @@ import { resolveListState } from "../../listState.js";
 import { removedNumberingAttr } from "../../numberingAttr.js";
 import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
 import { SUGGESTION_META, makeRevisionInfo, suggestRangeDeletion } from "../../plugins/suggestionMode.js";
-import { listLevelAttrPatch } from "../../styles/resolvedStyleAttrs.js";
+import { listLevelAttrPatch, listLevelIndentRemovalPatch } from "../../styles/resolvedStyleAttrs.js";
 import { createExtension } from "../create.js";
 import { goToNextCell, goToPrevCell } from "../nodes/TableExtension.js";
 import { Priority } from "../types.js";
@@ -27,9 +27,10 @@ function chainCommands(...commands) {
 		return false;
 	};
 }
-function clearListAttrs(attrs) {
+function clearListAttrs(attrs, numbering) {
 	return {
 		...attrs,
+		...listLevelIndentRemovalPatch(attrs, numbering),
 		numPr: removedNumberingAttr(attrs.numPrFromStyle),
 		...CLEARED_LIST_RENDERING_ATTRS
 	};
@@ -69,7 +70,7 @@ const numberParagraphs = ({ state, tr, from, to, requests }) => {
 		updates: paragraphsBetween(tr.doc, from, to).map(({ pos, node }) => ({
 			pos,
 			node,
-			next: listItemAttrs(node.attrs, {
+			next: listItemAttrs(expectParagraphAttrs(node), {
 				numId: target.numId,
 				ilvl: paragraphNumberingLevel(expectParagraphAttrs(node).numPr) ?? target.ilvl
 			}, target.numbering)
@@ -92,7 +93,7 @@ function toggleList(intent) {
 			updates: paragraphsBetween(state.doc, $from.pos, $to.pos).filter(({ node }) => isItemOfKind(node)).map(({ pos, node }) => ({
 				pos,
 				node,
-				next: clearListAttrs(expectParagraphAttrs(node))
+				next: clearListAttrs(expectParagraphAttrs(node), getDocumentNumbering(state))
 			}))
 		});
 		else numberParagraphs({
@@ -141,7 +142,7 @@ const decreaseListLevel = (state, dispatch) => {
 	if (!dispatch) return true;
 	const paragraphPos = $from.before($from.depth);
 	if (currentLevel <= 0) dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, {
-		...clearListAttrs(attrs),
+		...clearListAttrs(attrs, getDocumentNumbering(state)),
 		indentLeft: null,
 		indentFirstLine: null,
 		hangingIndent: null
@@ -157,7 +158,7 @@ const removeList = (state, dispatch) => {
 	state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
 		if (node.type.name === "paragraph" && hasActiveListNumbering(expectParagraphAttrs(node)) && !seen.has(pos)) {
 			seen.add(pos);
-			tr = tr.setNodeMarkup(pos, void 0, clearListAttrs(expectParagraphAttrs(node)));
+			tr = tr.setNodeMarkup(pos, void 0, clearListAttrs(expectParagraphAttrs(node), getDocumentNumbering(state)));
 		}
 	});
 	dispatch(tr.scrollIntoView());
@@ -197,7 +198,7 @@ function exitListOnEmptyEnter() {
 				updates: [{
 					pos: $from.before(),
 					node: paragraph,
-					next: clearListAttrs(attrs)
+					next: clearListAttrs(attrs, getDocumentNumbering(state))
 				}]
 			});
 			dispatch(tr);
@@ -250,7 +251,7 @@ function backspaceExitList() {
 				updates: [{
 					pos: $from.before(),
 					node: paragraph,
-					next: clearListAttrs(attrs)
+					next: clearListAttrs(attrs, getDocumentNumbering(state))
 				}]
 			});
 			dispatch(tr);
@@ -300,7 +301,7 @@ function decreaseListIndent() {
 			for (const { pos, attrs } of positions) {
 				const currentLevel = attrs.numPr.ilvl ?? 0;
 				if (currentLevel <= 0) tr = tr.setNodeMarkup(pos, void 0, {
-					...clearListAttrs(attrs),
+					...clearListAttrs(attrs, getDocumentNumbering(state)),
 					indentLeft: null,
 					indentFirstLine: null,
 					hangingIndent: null

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

@@ -1,5 +1,5 @@
 import { readOutlineLevelAttr } from "../../outlineLevelAttr.js";
-import { getDocumentBuiltInStyles, getDocumentStyleResolver } from "../../plugins/documentStyles.js";
+import { getDocumentBuiltInStyles, getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
 import { headingLevelOf } from "@stll/docx-core/model";
 import { Fragment, Slice } from "prosemirror-model";
 //#region src/prosemirror/extensions/features/pastedHeadingStyles.ts

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

@@ -103,10 +103,8 @@ const numberPastedHtmlLists = (slice, view) => {
 					groups.set(hint.group, group);
 				}
 				if (!numbering) panic("Pasted list group has no numbering definition");
-				result = node.type.create(listItemAttrs({
-					...attrs,
-					_pastedHtmlList: void 0
-				}, {
+				const { _pastedHtmlList: _consumed, ...unhinted } = attrs;
+				result = node.type.create(listItemAttrs(unhinted, {
 					numId: group.numId,
 					ilvl: hint.level
 				}, numbering), node.content, node.marks);

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

@@ -1,7 +1,7 @@
 import { expectFootnoteRefMarkAttrs } from "../../attrs/index.js";
-import { suggestionModeKey } from "../../plugins/suggestionMode.js";
+import { suggestRangeDeletion, suggestionModeKey } from "../../plugins/suggestionMode.js";
 import { createMarkExtension } from "../create.js";
-import { expandNoteReferenceDeletionRange } from "./noteReferenceDeletion.js";
+import { expandNoteReferenceDeletionRange, noteReferenceRanges } from "./noteReferenceDeletion.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/FootnoteRefExtension.ts
 /**
@@ -59,8 +59,7 @@ const FootnoteRefExtension = createMarkExtension({
 			];
 		}
 	},
-	onSchemaReady(ctx) {
-		const { schema } = ctx;
+	onSchemaReady() {
 		const deleteWholeNoteReference = (direction) => (state, dispatch) => {
 			if (suggestionModeKey.getState(state)?.active) return false;
 			const { from, to, empty } = state.selection;
@@ -72,6 +71,7 @@ const FootnoteRefExtension = createMarkExtension({
 		function makeInsertNote(noteType) {
 			return (id) => (state, dispatch) => {
 				if (!dispatch) return true;
+				const { schema } = state;
 				const footnoteRefType = schema.marks["footnoteRef"];
 				if (!footnoteRefType) panic("Missing mark type: footnoteRef");
 				const mark = footnoteRefType.create({
@@ -84,12 +84,18 @@ const FootnoteRefExtension = createMarkExtension({
 				return true;
 			};
 		}
+		/**
+		* Delete the note references the selection touches (the one beside a
+		* caret), each whole: tracked as a deletion of the reference run when
+		* suggesting, removed outright otherwise.
+		*/
 		const deleteNoteRef = (state, dispatch) => {
-			const { $from, $to } = state.selection;
+			const { from, to, empty } = state.selection;
+			const references = noteReferenceRanges(state.doc, empty ? Math.max(0, from - 1) : from, empty ? Math.min(state.doc.content.size, to + 1) : to);
+			if (references.length === 0) return false;
 			if (!dispatch) return true;
-			let tr = state.tr;
-			const markType = schema.marks["footnoteRef"];
-			tr = tr.removeMark($from.pos, $to.pos, markType);
+			const tr = state.tr;
+			for (const reference of references.toReversed()) if (!suggestRangeDeletion(state, tr, reference.from, reference.to)) tr.delete(reference.from, reference.to);
 			dispatch(tr.scrollIntoView());
 			return true;
 		};

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

@@ -1,5 +1,6 @@
 import { anchorTargetAttrs, normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
+import { removeHyperlinkInRange } from "../../hyperlinkRemoval.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
 import { panic } from "better-result";
@@ -118,9 +119,10 @@ const HyperlinkExtension = createMarkExtension({
 		}
 	},
 	onSchemaReady(ctx) {
-		const hlType = ctx.schema.marks["hyperlink"];
-		if (!hlType) panic("Missing mark type: hyperlink");
+		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 hlType = documentHyperlinkType(state);
 			const { from, to, empty } = state.selection;
 			if (empty) return false;
 			if (dispatch) {
@@ -136,6 +138,7 @@ const HyperlinkExtension = createMarkExtension({
 			return true;
 		};
 		const removeHyperlink = (state, dispatch) => {
+			const hlType = documentHyperlinkType(state);
 			const { from, to, empty } = state.selection;
 			if (empty) {
 				const $pos = state.selection.$from;
@@ -154,13 +157,14 @@ const HyperlinkExtension = createMarkExtension({
 						}
 					}
 				});
-				if (dispatch) dispatch(state.tr.removeMark(start, end, hlType).scrollIntoView());
+				if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, start, end).scrollIntoView());
 				return true;
 			}
-			if (dispatch) dispatch(state.tr.removeMark(from, to, hlType).scrollIntoView());
+			if (dispatch) dispatch(removeHyperlinkInRange(state, state.tr, from, to).scrollIntoView());
 			return true;
 		};
 		const insertHyperlink = (text, href, tooltip) => (state, dispatch) => {
+			const hlType = documentHyperlinkType(state);
 			if (dispatch) {
 				const mark = hlType.create({
 					href: normalizeHyperlinkInput(href),

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

@@ -1,6 +1,6 @@
 import { createMarkExtension } from "../create.js";
+import { toggleDocumentMark } from "./markUtils.js";
 import { panic } from "better-result";
-import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/StrikeExtension.ts
 /**
 * Strikethrough Mark Extension
@@ -26,7 +26,7 @@ const StrikeExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const strikeType = ctx.schema.marks["strike"];
 		if (!strikeType) panic("Missing mark type: strike");
-		return { commands: { toggleStrike: () => toggleMark(strikeType) } };
+		return { commands: { toggleStrike: () => toggleDocumentMark(strikeType) } };
 	}
 });
 //#endregion

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

@@ -1,6 +1,6 @@
 import { createMarkExtension } from "../create.js";
+import { toggleDocumentMark } from "./markUtils.js";
 import { panic } from "better-result";
-import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/SubscriptExtension.ts
 /**
 * Subscript Mark Extension
@@ -18,7 +18,7 @@ const SubscriptExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const subscriptType = ctx.schema.marks["subscript"];
 		if (!subscriptType) panic("Missing mark type: subscript");
-		return { commands: { toggleSubscript: () => toggleMark(subscriptType) } };
+		return { commands: { toggleSubscript: () => toggleDocumentMark(subscriptType) } };
 	}
 });
 //#endregion

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

@@ -1,6 +1,6 @@
 import { createMarkExtension } from "../create.js";
+import { toggleDocumentMark } from "./markUtils.js";
 import { panic } from "better-result";
-import { toggleMark } from "prosemirror-commands";
 //#region src/prosemirror/extensions/marks/SuperscriptExtension.ts
 /**
 * Superscript Mark Extension
@@ -18,7 +18,7 @@ const SuperscriptExtension = createMarkExtension({
 	onSchemaReady(ctx) {
 		const superscriptType = ctx.schema.marks["superscript"];
 		if (!superscriptType) panic("Missing mark type: superscript");
-		return { commands: { toggleSuperscript: () => toggleMark(superscriptType) } };
+		return { commands: { toggleSuperscript: () => toggleDocumentMark(superscriptType) } };
 	}
 });
 //#endregion

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

@@ -1,7 +1,8 @@
 import { textToStyle } from "../../../utils/formatToStyle.js";
 import { expectTextColorMarkAttrs } from "../../attrs/index.js";
+import { clearRunColor } from "../../clearRunColor.js";
 import { createMarkExtension } from "../create.js";
-import { removeMark, setMark } from "./markUtils.js";
+import { setMark } from "./markUtils.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/TextColorExtension.ts
 /**
@@ -39,10 +40,10 @@ const TextColorExtension = createMarkExtension({
 		if (!textColorType) panic("Missing mark type: textColor");
 		return { commands: {
 			setTextColor: (attrs) => {
-				if (!attrs.rgb && !attrs.themeColor) return removeMark(textColorType);
+				if (!attrs.rgb && !attrs.themeColor) return clearRunColor();
 				return setMark(textColorType, attrs);
 			},
-			clearTextColor: () => removeMark(textColorType)
+			clearTextColor: () => clearRunColor()
 		} };
 	}
 });

package/dist/prosemirror/extensions/marks/markUtils.d.ts

@@ -4,24 +4,26 @@ import { Command, EditorState } from "prosemirror-state";
 //#region src/prosemirror/extensions/marks/markUtils.d.ts
 type MarkAttrs = Record<string, unknown>;
 declare function marksToTextFormatting(marks: readonly Mark[]): document_d_exports.TextFormatting;
-declare function setMark(markType: MarkType, attrs: MarkAttrs): Command;
+declare function setMark(type: MarkType, attrs: MarkAttrs): Command;
 type PairedToggleProperty = "bold" | "italic";
+/** `toggleMark` for the document's own counterpart of `type`. */
+declare const toggleDocumentMark: (type: MarkType) => Command;
 /** UI toggle whose direct-formatting contract explicitly targets both script families. */
-declare const toggleMarkForAllScripts: (markType: MarkType, property: PairedToggleProperty) => Command;
+declare const toggleMarkForAllScripts: (type: MarkType, property: PairedToggleProperty) => Command;
 /** UI size command whose direct-formatting contract explicitly targets both script families. */
 declare const setFontSizeForAllScripts: (markType: MarkType, size: number) => Command;
 /** Clears both ordinary and complex-script direct size through the UI command boundary. */
 declare const clearFontSizeForAllScripts: (markType: MarkType) => Command;
 declare function toggleUnderlineMark(markType: MarkType): Command;
-declare function removeMark(markType: MarkType): Command;
+declare function removeMark(type: MarkType): Command;
 /**
  * Check if a mark is active in the current selection
  */
-declare function isMarkActive(state: EditorState, markType: MarkType, attrs?: Record<string, unknown>): boolean;
+declare function isMarkActive(state: EditorState, type: MarkType, attrs?: Record<string, unknown>): boolean;
 /**
  * Get the current value of a mark attribute
  */
-declare function getMarkAttr(state: EditorState, markType: MarkType, attr: string): unknown;
+declare function getMarkAttr(state: EditorState, type: MarkType, attr: string): unknown;
 type AuthoredRunFormattingCarrier = "preserve" | "reconstruct";
 /** Builds a mark by type name; a conversion passes one that shares equal marks. */
 type MarkFactory = (type: string, attrs?: Attrs | null) => Mark;
@@ -56,4 +58,4 @@ declare function createSetMarkCommand(markType: MarkType, attrs?: Record<string,
  */
 declare function createRemoveMarkCommand(markType: MarkType): Command;
 //#endregion
-export { AuthoredRunFormattingCarrier, MarkFactory, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };
+export { AuthoredRunFormattingCarrier, MarkFactory, clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleDocumentMark, toggleMarkForAllScripts, toggleUnderlineMark };

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

@@ -3,6 +3,7 @@ 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 { runShadingAttrsToShading, shadingToRunShadingAttrs } from "../../conversion/runShadingMark.js";
+import { documentMarkType } from "../../documentSchema.js";
 import { selectRunFormattingCarrierRepresentations } from "../../runFormattingInlineCarriers.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../../runFormattingMarkNames.js";
 import { hasRunFormattingOverrideAttrs } from "../../runFormattingProvenance.js";
@@ -178,8 +179,9 @@ function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
 	if (!markRequiresAttrMerge(markType)) return markType.create(nextAttrs);
 	return markType.create(mergeMarkAttrs(markType, currentMark, nextAttrs));
 }
-function setMark(markType, attrs) {
+function setMark(type, attrs) {
 	return (state, dispatch) => {
+		const markType = documentMarkType(state, type);
 		const { from, to, empty } = state.selection;
 		if (empty) {
 			if (dispatch) {
@@ -201,7 +203,8 @@ function setMark(markType, attrs) {
 				if (!node.isText) return;
 				const start = Math.max(from, pos);
 				const end = Math.min(to, pos + node.nodeSize);
-				const mark = createMarkWithMergedAttrs(markType, markType.isInSet(node.marks), attrs);
+				const currentMark = markType.isInSet(node.marks);
+				const mark = createMarkWithMergedAttrs(markType, currentMark, attrs);
 				tr = tr.addMark(start, end, mark);
 			});
 			dispatch(tr.scrollIntoView());
@@ -283,8 +286,11 @@ const updateRunFormattingOverride = (state, tr, update) => {
 const withRunFormattingOverride = (command, update) => (state, dispatch) => command(state, dispatch ? (tr) => {
 	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);
 /** UI toggle whose direct-formatting contract explicitly targets both script families. */
-const toggleMarkForAllScripts = (markType, property) => (state, dispatch) => {
+const toggleMarkForAllScripts = (type, property) => (state, dispatch) => {
+	const markType = documentMarkType(state, type);
 	const enabled = !isMarkActive(state, markType);
 	return withRunFormattingOverride(toggleMark(markType), (attrs) => updatePairedToggleAttrs(attrs, property, enabled))(state, dispatch);
 };
@@ -311,10 +317,11 @@ function selectionHasVisibleUnderline(state, markType) {
 	return hasVisibleUnderline;
 }
 function toggleUnderlineMark(markType) {
-	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, markType) ? "none" : "single" })(state, dispatch);
+	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, documentMarkType(state, markType)) ? "none" : "single" })(state, dispatch);
 }
-function removeMark(markType) {
+function removeMark(type) {
 	return (state, dispatch) => {
+		const markType = documentMarkType(state, type);
 		const { from, to, empty } = state.selection;
 		if (empty) {
 			if (dispatch) dispatchStoredMarks(state, dispatch, (state.storedMarks ?? state.selection.$from.marks()).filter((m) => m.type !== markType));
@@ -327,7 +334,8 @@ function removeMark(markType) {
 /**
 * Check if a mark is active in the current selection
 */
-function isMarkActive(state, markType, attrs) {
+function isMarkActive(state, type, attrs) {
+	const markType = documentMarkType(state, type);
 	const { from, to, empty } = state.selection;
 	if (empty) return (state.storedMarks ?? state.selection.$from.marks()).some((mark) => {
 		if (mark.type !== markType) return false;
@@ -356,7 +364,8 @@ function isMarkActive(state, markType, attrs) {
 /**
 * Get the current value of a mark attribute
 */
-function getMarkAttr(state, markType, attr) {
+function getMarkAttr(state, type, attr) {
+	const markType = documentMarkType(state, type);
 	const { empty, $from, from, to } = state.selection;
 	if (empty) {
 		const marks = state.storedMarks ?? $from.marks();
@@ -524,4 +533,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleMarkForAllScripts, toggleUnderlineMark };
+export { clearFontSizeForAllScripts, clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, marksToTextFormatting, removeMark, setFontSizeForAllScripts, setMark, textFormattingToMarks, toggleDocumentMark, toggleMarkForAllScripts, toggleUnderlineMark };

package/dist/prosemirror/extensions/marks/noteReferenceDeletion.d.ts

@@ -6,5 +6,7 @@ type DeletionRange = {
 };
 /** Keep the text carrying one OOXML note reference together during deletion. */
 declare const expandNoteReferenceDeletionRange: (doc: Node, from: number, to: number) => DeletionRange | null;
+/** Each whole note reference [`from`, `to`) of `doc` touches, in document order. */
+declare const noteReferenceRanges: (doc: Node, from: number, to: number) => DeletionRange[];
 //#endregion
-export { expandNoteReferenceDeletionRange };
+export { expandNoteReferenceDeletionRange, noteReferenceRanges };

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

@@ -31,5 +31,16 @@ const expandNoteReferenceDeletionRange = (doc, from, to) => {
 		to: expandedTo
 	} : null;
 };
+/** Each whole note reference [`from`, `to`) of `doc` touches, in document order. */
+const noteReferenceRanges = (doc, from, to) => {
+	const ranges = [];
+	doc.nodesBetween(from, to, (node, pos) => {
+		if (!node.isText || !node.marks.some((mark) => mark.type.name === "footnoteRef")) return;
+		const whole = expandNoteReferenceDeletionRange(doc, pos, pos + node.nodeSize);
+		const last = ranges.at(-1);
+		if (whole && (!last || whole.from >= last.to)) ranges.push(whole);
+	});
+	return ranges;
+};
 //#endregion
-export { expandNoteReferenceDeletionRange };
+export { expandNoteReferenceDeletionRange, noteReferenceRanges };

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

@@ -80,9 +80,9 @@ const CommentReferenceExtension = createNodeExtension({
 			}];
 		}
 	}),
-	onSchemaReady: ({ schema }) => ({ plugins: [new Plugin({ appendTransaction(transactions, _oldState, newState) {
+	onSchemaReady: () => ({ plugins: [new Plugin({ appendTransaction(transactions, _oldState, newState) {
 		if (!transactions.some(({ docChanged }) => docChanged)) return null;
-		const referenceType = schema.nodes[COMMENT_REFERENCE_NODE_NAME];
+		const referenceType = newState.schema.nodes[COMMENT_REFERENCE_NODE_NAME];
 		if (!referenceType) return null;
 		const repairs = planCommentReferenceRepairs(surveyCommentReferences(newState.doc));
 		if (repairs.length === 0) return null;

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

@@ -41,10 +41,12 @@ const HardBreakExtension = createNodeExtension({
 		}
 	},
 	onSchemaReady(ctx) {
-		const hardBreakType = ctx.schema.nodes["hardBreak"];
-		if (!hardBreakType) panic("Missing node type: hardBreak");
+		if (!ctx.schema.nodes["hardBreak"]) panic("Missing node type: hardBreak");
 		return { keyboardShortcuts: { "Shift-Enter": (state, dispatch) => {
-			if (dispatch) dispatch(state.tr.replaceSelectionWith(hardBreakType.create()).scrollIntoView());
+			if (dispatch) {
+				const hardBreakType = state.schema.nodes["hardBreak"] ?? panic("Missing node type: hardBreak");
+				dispatch(state.tr.replaceSelectionWith(hardBreakType.create()).scrollIntoView());
+			}
 			return true;
 		} } };
 	}