@stll/folio-core 0.53.0 → 0.54.1

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

@@ -1,5 +1,6 @@
 import { BUILT_IN_STYLE_NAME } from "../../../docx/builtInStyles.js";
 import { PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR } from "../../../docx/paragraphPropertySource.js";
+import { isStyleSourcedParagraphNumbering } from "../../../internal/paragraphFormattingSerialization.js";
 import { PARAGRAPH_ALIGNMENT_VALUES } from "../../../types/documentEnumValues.js";
 import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
@@ -7,12 +8,16 @@ import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.j
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
+import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
-import { withDirectParagraphSpacing } from "../../paragraphSpacing.js";
-import { getDocumentBuiltInStyles } from "../../plugins/documentStyles.js";
+import { directParagraphIndentation } from "../../paragraphIndentation.js";
+import { directParagraphSpacing, withDirectParagraphSpacing } from "../../paragraphSpacing.js";
+import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
+import { getDocumentBuiltInStyles, getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
+import { rebaseParagraphRuns } from "../../rebaseParagraphRuns.js";
 import { mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf } from "../../sectionCarrier.js";
-import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
+import { listAttrsFromResolvedStyle, listLevelIndentAttrPatch, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
 import { headingOutlineLevel, paragraphNumberingLevel, paragraphNumberingReferenceId } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
@@ -399,6 +404,51 @@ function setParagraphSpacingAttr(side, twips) {
 		return true;
 	};
 }
+const DIRECT_PARAGRAPH_TOGGLES = [
+	"outlineLevel",
+	"borders",
+	"shading",
+	"tabs",
+	"keepNext",
+	"keepLines",
+	"widowControl",
+	"pageBreakBefore",
+	"contextualSpacing"
+];
+/** The attrs a paragraph states itself, over whatever style it reads. */
+function directParagraphAttrs(attrs) {
+	const direct = {};
+	const alignment = directParagraphAlignment(attrs);
+	if (alignment !== void 0) direct["alignment"] = alignment;
+	const spacing = directParagraphSpacing(attrs);
+	for (const key of [
+		"spaceBefore",
+		"spaceAfter",
+		"lineSpacing",
+		"lineSpacingRule"
+	]) if (spacing?.[key] !== void 0) direct[key] = spacing[key];
+	const indentation = directParagraphIndentation(attrs);
+	if (indentation?.indentLeft !== void 0) direct["indentLeft"] = indentation.indentLeft;
+	if (indentation?.indentRight !== void 0) direct["indentRight"] = indentation.indentRight;
+	if (indentation?.indentFirstLine !== void 0) {
+		direct["indentFirstLine"] = Math.abs(indentation.indentFirstLine);
+		direct["hangingIndent"] = indentation.hangingIndent === true;
+	}
+	const original = attrs._originalFormatting;
+	for (const key of DIRECT_PARAGRAPH_TOGGLES) if (original?.[key] !== void 0) direct[key] = attrs[key];
+	return direct;
+}
+/**
+* The indentation a restyled paragraph still states itself: a field its
+* source stated that the new style's attrs keep a value for. Every other
+* field now reads the style's value, which a save leaves to the style.
+*/
+function restyledIndentation(styleAttrs, originalFormatting) {
+	const stated = {};
+	if (originalFormatting?.indentLeft !== void 0 && typeof styleAttrs.indentLeft === "number") stated.indentLeft = styleAttrs.indentLeft;
+	if (originalFormatting?.indentFirstLine !== void 0 && typeof styleAttrs.indentFirstLine === "number") stated.indentFirstLine = styleAttrs.indentFirstLine;
+	return stated;
+}
 function setParagraphAttrsCmd(attrs) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
@@ -479,9 +529,10 @@ function makeDecreaseIndent(amount = 720) {
 				seen.add(pos);
 				const currentIndent = node.attrs["indentLeft"] || 0;
 				const newIndent = Math.max(0, currentIndent - amount);
+				const numbered = paragraphNumberingReferenceId(expectParagraphAttrs(node).numPr ?? void 0) !== void 0;
 				tr = tr.setNodeMarkup(pos, void 0, {
 					...node.attrs,
-					indentLeft: newIndent > 0 ? newIndent : null
+					indentLeft: newIndent > 0 || numbered ? newIndent : null
 				});
 			}
 		});
@@ -489,79 +540,61 @@ function makeDecreaseIndent(amount = 720) {
 		return true;
 	};
 }
-function makeApplyStyle(schema) {
+function makeApplyStyle() {
 	return (styleId, resolvedAttrs) => (state, dispatch) => {
 		const { $from, $to } = state.selection;
 		if (!dispatch) return true;
 		let tr = state.tr;
 		const seen = /* @__PURE__ */ new Set();
-		const styleMarks = [];
-		if (resolvedAttrs?.runFormatting) {
-			const rpr = resolvedAttrs.runFormatting;
-			if (rpr.bold && schema.marks["bold"]) styleMarks.push(schema.marks["bold"].create());
-			if (rpr.italic && schema.marks["italic"]) styleMarks.push(schema.marks["italic"].create());
-			if (rpr.fontSize && schema.marks["fontSize"]) styleMarks.push(schema.marks["fontSize"].create({ size: rpr.fontSize }));
-			if (rpr.fontFamily && schema.marks["fontFamily"]) styleMarks.push(schema.marks["fontFamily"].create({
-				ascii: rpr.fontFamily.ascii,
-				hAnsi: rpr.fontFamily.hAnsi,
-				asciiTheme: rpr.fontFamily.asciiTheme
-			}));
-			if (rpr.color && !rpr.color.auto && schema.marks["textColor"]) styleMarks.push(schema.marks["textColor"].create({
-				rgb: rpr.color.rgb,
-				themeColor: rpr.color.themeColor,
-				themeTint: rpr.color.themeTint,
-				themeShade: rpr.color.themeShade
-			}));
-			if (rpr.underline && rpr.underline.style !== "none" && schema.marks["underline"]) styleMarks.push(schema.marks["underline"].create({
-				style: rpr.underline.style,
-				color: rpr.underline.color
-			}));
-			if ((rpr.strike || rpr.doubleStrike) && schema.marks["strike"]) styleMarks.push(schema.marks["strike"].create({ double: rpr.doubleStrike || false }));
-		}
-		const styleControlledMarks = [
-			schema.marks["bold"],
-			schema.marks["italic"],
-			schema.marks["fontSize"],
-			schema.marks["fontFamily"],
-			schema.marks["textColor"],
-			schema.marks["underline"],
-			schema.marks["strike"]
-		].filter(Boolean);
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
 			if (node.type.name === "paragraph" && !seen.has(pos)) {
 				seen.add(pos);
 				const newAttrs = {
 					...node.attrs,
 					styleId,
-					_tableOfContentsLevel: tableOfContentsStyleLevel({ styleId }) ?? null
+					_tableOfContentsLevel: styleId ? tableOfContentsStyleLevel({ styleId }) ?? null : null
 				};
 				if (resolvedAttrs) {
-					Object.assign(newAttrs, paragraphAttrsFromResolvedStyle(resolvedAttrs, {
-						styleId,
+					const current = expectParagraphAttrs(node);
+					const styleAttrs = paragraphAttrsFromResolvedStyle(resolvedAttrs, {
+						styleId: styleId ?? "",
 						...resolvedAttrs.styleName ? { styleName: resolvedAttrs.styleName } : {}
-					}));
-					const originalFormatting = {
-						...expectParagraphAttrs(node)._originalFormatting,
-						styleId
-					};
-					Reflect.deleteProperty(originalFormatting, "alignment");
-					newAttrs["_originalFormatting"] = withDirectParagraphSpacing(originalFormatting, void 0);
-					newAttrs["spacingExplicit"] = null;
+					});
+					Object.assign(newAttrs, styleAttrs);
+					if (!styleId) newAttrs["_tableOfContentsLevel"] = null;
+					const originalFormatting = { ...current._originalFormatting };
+					if (styleId) originalFormatting.styleId = styleId;
+					else Reflect.deleteProperty(originalFormatting, "styleId");
+					let restyledOriginal = originalFormatting;
+					if (styleId) {
+						Reflect.deleteProperty(originalFormatting, "alignment");
+						Reflect.deleteProperty(originalFormatting, "outlineLevel");
+						restyledOriginal = withDirectParagraphSpacing(originalFormatting, void 0);
+						newAttrs["spacingExplicit"] = null;
+					} else Object.assign(newAttrs, directParagraphAttrs(current));
+					newAttrs["_originalFormatting"] = restyledOriginal ?? null;
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
+					const directNumId = current.numPrFromStyle == null ? paragraphNumberingReferenceId(current.numPr ?? void 0) : void 0;
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
+					else if (isStyleSourcedParagraphNumbering(current.numPr, current.numPrFromStyle)) Object.assign(newAttrs, CLEARED_LIST_RENDERING_ATTRS, {
+						numPr: null,
+						numPrFromStyle: null
+					});
+					else if (directNumId !== void 0) Object.assign(newAttrs, listLevelIndentAttrPatch(restyledIndentation(styleAttrs, restyledOriginal), {
+						numId: directNumId,
+						ilvl: paragraphNumberingLevel(current.numPr ?? void 0) ?? 0
+					}, resolvedAttrs.numbering ?? getDocumentNumbering(state)));
 				}
 				tr = tr.setNodeMarkup(pos, void 0, newAttrs);
-				if (resolvedAttrs) {
-					const paragraphStart = pos + 1;
-					const paragraphEnd = pos + node.nodeSize - 1;
-					if (paragraphEnd > paragraphStart) {
-						for (const markType of styleControlledMarks) tr = tr.removeMark(paragraphStart, paragraphEnd, markType);
-						for (const mark of styleMarks) tr = tr.addMark(paragraphStart, paragraphEnd, mark);
-					}
-				}
+				rebaseParagraphRuns({
+					tr,
+					position: pos,
+					previous: node,
+					styleResolver: getDocumentStyleResolver(state),
+					storedMarks: state.storedMarks ?? state.selection.$from.marks()
+				});
 			}
 		});
-		if (styleMarks.length > 0) tr = tr.setStoredMarks(styleMarks);
 		dispatch(tr.scrollIntoView());
 		return true;
 	};
@@ -594,8 +627,8 @@ const ParagraphExtension = createNodeExtension({
 	name: "paragraph",
 	schemaNodeName: "paragraph",
 	nodeSpec: paragraphNodeSpec,
-	onSchemaReady(ctx) {
-		const applyStyleFn = makeApplyStyle(ctx.schema);
+	onSchemaReady() {
+		const applyStyleFn = makeApplyStyle();
 		return { commands: {
 			setAlignment: (alignment) => makeSetAlignment(alignment),
 			alignLeft: () => makeSetAlignment("left"),
@@ -617,10 +650,18 @@ const ParagraphExtension = createNodeExtension({
 				hangingIndent: hanging ?? false
 			}),
 			applyStyle: (styleId, resolvedAttrs) => applyStyleFn(styleId, resolvedAttrs),
-			clearStyle: () => setParagraphAttrsCmd({
-				styleId: null,
-				_tableOfContentsLevel: null
-			}),
+			clearStyle: () => (state, dispatch) => {
+				const resolver = getDocumentStyleResolver(state);
+				if (!resolver) return applyStyleFn(null)(state, dispatch);
+				const resolved = resolver.resolveParagraphStyle(null);
+				const styleName = resolver.getDefaultParagraphStyle()?.name;
+				return applyStyleFn(null, {
+					...resolved.paragraphFormatting && { paragraphFormatting: resolved.paragraphFormatting },
+					...resolved.runFormatting && { runFormatting: resolved.runFormatting },
+					...styleName && { styleName },
+					numbering: getDocumentNumbering(state)
+				})(state, dispatch);
+			},
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
 			generateTOC: ({ title }) => (state, dispatch) => {

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

@@ -1,7 +1,7 @@
 import { mergeTextFormatting } from "../../../utils/textFormattingMerge.js";
 import { expectCharacterStyleMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
 import { keepSectionBreaksOnSurvivingMarks } from "../../commands/sectionBreak.js";
-import { getDocumentStyleResolver } from "../../plugins/documentStyles.js";
+import { getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../../runFormattingMarkNames.js";
 import { authoredRunFormattingFromAttrs } from "../../runFormattingProvenance.js";
 import { paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";

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()
 		} };
 	}
 });