@stll/folio-core 0.35.1 → 0.37.0

package/dist/prosemirror/extensions/StarterKit.js

@@ -30,6 +30,7 @@ import { HighlightExtension } from "./marks/HighlightExtension.js";
 import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
 import { ItalicExtension } from "./marks/ItalicExtension.js";
 import { LanguageExtension } from "./marks/LanguageExtension.js";
+import { PageBreakRunOwnerExtension } from "./marks/PageBreakRunOwnerExtension.js";
 import { RtlExtension } from "./marks/RtlExtension.js";
 import { RunFormattingOverrideExtension } from "./marks/RunFormattingOverrideExtension.js";
 import { RunShadingExtension } from "./marks/RunShadingExtension.js";
@@ -50,6 +51,7 @@ import { HorizontalRuleExtension } from "./nodes/HorizontalRuleExtension.js";
 import { ImageExtension } from "./nodes/ImageExtension.js";
 import { MathExtension } from "./nodes/MathExtension.js";
 import { PageBreakExtension } from "./nodes/PageBreakExtension.js";
+import { PageBreakRunExtension } from "./nodes/PageBreakRunExtension.js";
 import { RenderedPageBreakExtension } from "./nodes/RenderedPageBreakExtension.js";
 import { SdtExtension } from "./nodes/SdtExtension.js";
 import { ShapeExtension } from "./nodes/ShapeExtension.js";
@@ -107,6 +109,7 @@ function createStarterKit(options = {}) {
 	add("textEffect", TextEffectExtension());
 	add("runFormattingOverride", RunFormattingOverrideExtension());
 	add("characterStyle", CharacterStyleExtension());
+	add("pageBreakRunOwner", PageBreakRunOwnerExtension());
 	add("comment", CommentExtension());
 	add("insertion", InsertionExtension());
 	add("deletion", DeletionExtension());
@@ -125,6 +128,7 @@ function createStarterKit(options = {}) {
 	add("gapCursor", GapCursorExtension());
 	add("horizontalRule", HorizontalRuleExtension());
 	add("pageBreak", PageBreakExtension());
+	add("pageBreakRun", PageBreakRunExtension());
 	add("renderedPageBreak", RenderedPageBreakExtension());
 	add("field", FieldExtension());
 	add("field", StructuredFieldExtension({ getInternalClipboardToken }));

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

@@ -1,9 +1,12 @@
+import { PARAGRAPH_ALIGNMENT_VALUES } from "../../../types/documentEnumValues.js";
 import { paragraphToStyle } from "../../../utils/formatToStyle.js";
 import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
+import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
+import { withDirectParagraphSpacing } from "../../paragraphSpacing.js";
 import { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
 import { Fragment } from "prosemirror-model";
@@ -95,6 +98,7 @@ function cssTextAlignToAlignment(value) {
 		default: return;
 	}
 }
+const parseParagraphAlignment = (value) => PARAGRAPH_ALIGNMENT_VALUES.find((alignment) => alignment === value);
 /**
 * Parse CSS line-height to twips.
 * - Unitless multiplier (e.g. "1.5"): 240 twips * multiplier (single=240)
@@ -162,7 +166,7 @@ function extractParagraphAttrsFromStyle(element) {
 		if (spacing) {
 			attrs.lineSpacing = spacing.lineSpacing;
 			attrs.lineSpacingRule = spacing.lineSpacingRule;
-			attrs.lineSpacingExplicit = true;
+			attrs.lineSpacingExplicit = "both";
 		}
 	}
 	if (style.marginTop) {
@@ -180,8 +184,10 @@ const paragraphNodeSpec = {
 	group: "block",
 	attrs: {
 		paraId: { default: null },
+		idStability: { default: void 0 },
 		textId: { default: null },
 		alignment: { default: null },
+		alignmentFromStyle: { default: void 0 },
 		kinsoku: { default: null },
 		overflowPunctuation: { default: null },
 		suppressAutoHyphens: { default: null },
@@ -204,6 +210,7 @@ const paragraphNodeSpec = {
 		listIsBullet: { default: null },
 		listIsLegal: { default: null },
 		listMarker: { default: null },
+		listMarkerTemplate: { default: void 0 },
 		listMarkerHidden: { default: null },
 		listMarkerFormatting: { default: null },
 		listMarkerAlignment: { default: null },
@@ -249,23 +256,32 @@ const paragraphNodeSpec = {
 			if (!(dom instanceof HTMLElement)) return false;
 			const element = dom;
 			const paraId = element.dataset["paraId"];
-			const alignment = element.dataset["alignment"];
+			const alignment = parseParagraphAlignment(element.dataset["alignment"]);
+			const authoredAlignment = parseParagraphAlignment(element.dataset["directAlignment"]);
+			const alignmentFromStyle = parseParagraphAlignment(element.dataset["alignmentFromStyle"]);
 			const styleId = element.dataset["styleId"];
 			const tableOfContentsLevel = Number(element.dataset["tableOfContentsLevel"]);
 			const sectionBreakType = element.dataset["sectionBreak"];
 			const attrs = {
 				...paraId ? { paraId } : {},
 				...alignment ? { alignment } : {},
+				...alignmentFromStyle ? { alignmentFromStyle } : {},
 				...styleId ? { styleId } : {},
 				...Number.isSafeInteger(tableOfContentsLevel) && tableOfContentsLevel > 0 ? { _tableOfContentsLevel: tableOfContentsLevel } : {},
 				...sectionBreakType ? { sectionBreakType } : {}
 			};
 			const styleAttrs = extractParagraphAttrsFromStyle(element);
 			const mergedAlignment = attrs.alignment || styleAttrs.alignment;
+			const mergedDirectAlignment = authoredAlignment ?? (attrs.alignmentFromStyle === void 0 ? mergedAlignment : void 0);
+			const originalFormatting = {
+				...styleId ? { styleId } : {},
+				...mergedDirectAlignment ? { alignment: mergedDirectAlignment } : {}
+			};
 			return {
 				...styleAttrs,
 				...attrs,
-				...mergedAlignment !== void 0 ? { alignment: mergedAlignment } : {}
+				...mergedAlignment !== void 0 ? { alignment: mergedAlignment } : {},
+				...Object.keys(originalFormatting).length > 0 ? { _originalFormatting: originalFormatting } : {}
 			};
 		}
 	}, ...[
@@ -279,8 +295,10 @@ const paragraphNodeSpec = {
 		tag,
 		getAttrs(dom) {
 			const level = Number.parseInt(tag.charAt(1), 10);
+			const styleAttrs = extractParagraphAttrsFromStyle(dom);
 			return {
-				...extractParagraphAttrsFromStyle(dom),
+				...styleAttrs,
+				...styleAttrs.alignment ? { _originalFormatting: { alignment: styleAttrs.alignment } } : {},
 				styleId: `Heading${level}`,
 				outlineLevel: level - 1
 			};
@@ -295,6 +313,9 @@ const paragraphNodeSpec = {
 		if (listClass) domAttrs["class"] = listClass;
 		if (attrs.paraId) domAttrs["data-para-id"] = attrs.paraId;
 		if (attrs.alignment) domAttrs["data-alignment"] = attrs.alignment;
+		const directAlignment = directParagraphAlignment(attrs);
+		if (directAlignment) domAttrs["data-direct-alignment"] = directAlignment;
+		if (attrs.alignmentFromStyle) domAttrs["data-alignment-from-style"] = attrs.alignmentFromStyle;
 		if (attrs.styleId) domAttrs["data-style-id"] = attrs.styleId;
 		if (typeof attrs._tableOfContentsLevel === "number") domAttrs["data-table-of-contents-level"] = String(attrs._tableOfContentsLevel);
 		if (attrs.listMarker) domAttrs["data-list-marker"] = attrs.listMarker;
@@ -373,13 +394,33 @@ function setParagraphAttrsCmd(attrs) {
 	};
 }
 function makeSetAlignment(alignment) {
-	return (state, dispatch) => setParagraphAttr("alignment", alignment)(state, dispatch);
+	return (state, dispatch) => {
+		const { $from, $to } = state.selection;
+		if (!dispatch) return true;
+		let tr = state.tr;
+		const seen = /* @__PURE__ */ new Set();
+		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
+			if (node.type.name !== "paragraph" || seen.has(pos)) return;
+			seen.add(pos);
+			const attrs = expectParagraphAttrs(node);
+			tr = tr.setNodeMarkup(pos, void 0, {
+				...node.attrs,
+				alignment,
+				_originalFormatting: {
+					...attrs._originalFormatting,
+					alignment
+				}
+			});
+		});
+		dispatch(tr.scrollIntoView());
+		return true;
+	};
 }
 function makeSetLineSpacing(value, rule = "auto") {
 	return (state, dispatch) => setParagraphAttrsCmd({
 		lineSpacing: value,
 		lineSpacingRule: rule,
-		lineSpacingExplicit: true
+		lineSpacingExplicit: "both"
 	})(state, dispatch);
 }
 function makeIncreaseIndent(amount = 720) {
@@ -474,6 +515,13 @@ function makeApplyStyle(schema) {
 						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;
 					const listAttrs = listAttrsFromResolvedStyle(resolvedAttrs, resolvedAttrs.numbering);
 					if (listAttrs) Object.assign(newAttrs, listAttrs);
 				}

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

@@ -1,3 +1,4 @@
+import { setProseParagraphMarkupWithPropertySource } from "../../../docx/paragraphPropertySource.js";
 import { getTransactionDirtyRange } from "../../../paged-layout/transactionDirtyRange.js";
 import { detectBaseDirection } from "../../../utils/baseDirection.js";
 import { directionIsAutoManaged } from "../../paragraphDirection.js";
@@ -62,7 +63,12 @@ const collectBidiUpdatesInRange = (doc, range) => {
 };
 const applyBidiUpdates = (state, updates) => {
 	const tr = state.tr;
-	for (const update of updates) tr.setNodeMarkup(update.pos, void 0, update.attrs);
+	for (const update of updates) setProseParagraphMarkupWithPropertySource({
+		attrs: update.attrs,
+		ownership: "preserve",
+		pos: update.pos,
+		transaction: tr
+	});
 	ignoreTrackedChanges(tr);
 	tr.setMeta(autoBidiDetectionKey, "applied");
 	tr.setMeta("addToHistory", false);

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

@@ -1,10 +1,20 @@
 import { expectParagraphAttrs } from "../../attrs/index.js";
-import { PPR_CHANGE_SCOPED_ATTR_KEYS } from "../../commands/propertyChangeScope.js";
+import { PPR_CHANGE_SCOPED_ATTR_KEYS, hasSerializableParagraphPropertyChange } from "../../commands/propertyChangeScope.js";
+import { CLEARED_LIST_RENDERING_ATTRS, LIST_RENDERING_ATTR_KEYS } from "../../listMarker.js";
+import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
 import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
+import { listLevelAttrPatch } from "../../styles/resolvedStyleAttrs.js";
 import { createExtension } from "../create.js";
 import { goToNextCell, goToPrevCell } from "../nodes/TableExtension.js";
 import { Priority } from "../types.js";
+import { panic } from "better-result";
 //#region src/prosemirror/extensions/features/ListExtension.ts
+/**
+* List Extension — list commands + keymaps
+*
+* No schema contribution — lists use paragraph attrs (numPr).
+* Provides: toggle bullet/number, indent/outdent, enter/backspace handling.
+*/
 function chainCommands(...commands) {
 	return (state, dispatch, view) => {
 		for (const cmd of commands) if (cmd(state, dispatch, view)) return true;
@@ -25,65 +35,73 @@ function appendParagraphPropertyChange(attrs, existing, previousFormatting, rev)
 		}]
 	};
 }
-const LIST_FORMATTING_ATTRS = [
-	"numPr",
-	"listIsBullet",
-	"listIsLegal",
-	"listNumFmt",
-	"listMarker",
-	"listMarkerHidden",
-	"listMarkerFormatting",
-	"listMarkerAlignment",
-	"listMarkerSuffix",
-	"listLevelNumFmts",
-	"listLevelStarts",
-	"listAbstractNumId",
-	"listStartOverride"
-];
 function getPreviousListFormatting(attrs) {
 	const previousFormatting = {};
 	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) {
 		const value = attrs[key];
 		if (value != null) previousFormatting[key] = value;
 	}
-	for (const key of LIST_FORMATTING_ATTRS) previousFormatting[key] = attrs[key] ?? null;
+	previousFormatting["numPr"] = attrs["numPr"] ?? null;
+	for (const key of LIST_RENDERING_ATTR_KEYS) previousFormatting[key] = attrs[key] ?? null;
 	return previousFormatting;
 }
+function clearListAttrs(attrs) {
+	const styleNumPr = attrs.numPrFromStyle;
+	const numPr = styleNumPr?.numId !== void 0 && styleNumPr.numId !== 0 ? {
+		numId: 0,
+		ilvl: attrs.numPr?.ilvl ?? styleNumPr.ilvl ?? 0
+	} : null;
+	return {
+		...attrs,
+		numPr,
+		...CLEARED_LIST_RENDERING_ATTRS
+	};
+}
+function hasActiveListNumbering(attrs) {
+	return attrs.numPr?.numId !== void 0 && attrs.numPr.numId !== 0;
+}
 function toggleList(numId) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
 		const isInSameList = paragraph.attrs["numPr"]?.numId === numId;
+		const rev = makeRevisionInfo(state);
+		if (rev) {
+			let hasPendingChange = false;
+			state.doc.nodesBetween($from.pos, $to.pos, (node) => {
+				if (node.type.name === "paragraph" && hasSerializableParagraphPropertyChange(expectParagraphAttrs(node)._propertyChanges)) {
+					hasPendingChange = true;
+					return false;
+				}
+			});
+			if (hasPendingChange) return false;
+		}
 		if (!dispatch) return true;
 		let tr = state.tr;
 		const seen = /* @__PURE__ */ new Set();
-		const rev = makeRevisionInfo(state);
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
 			if (node.type.name === "paragraph" && !seen.has(pos)) {
 				seen.add(pos);
 				let nextAttrs;
-				if (isInSameList) nextAttrs = {
-					...node.attrs,
-					numPr: null,
-					listIsBullet: null,
-					listNumFmt: null,
-					listMarker: null
-				};
+				if (isInSameList) nextAttrs = clearListAttrs(expectParagraphAttrs(node));
 				else {
 					const isBullet = numId === 1;
 					nextAttrs = {
 						...node.attrs,
+						...CLEARED_LIST_RENDERING_ATTRS,
 						numPr: {
 							numId,
 							ilvl: node.attrs["numPr"]?.ilvl || 0
 						},
 						listIsBullet: isBullet,
-						listNumFmt: isBullet ? null : "decimal",
-						listMarker: null
+						listNumFmt: isBullet ? null : "decimal"
 					};
 				}
-				if (rev) nextAttrs = appendParagraphPropertyChange(nextAttrs, expectParagraphAttrs(node)._propertyChanges, getPreviousListFormatting(node.attrs), rev);
+				if (rev) {
+					const existing = expectParagraphAttrs(node)._propertyChanges;
+					nextAttrs = appendParagraphPropertyChange(nextAttrs, existing, getPreviousListFormatting(node.attrs), rev);
+				}
 				tr = tr.setNodeMarkup(pos, void 0, nextAttrs);
 			}
 		});
@@ -94,55 +112,45 @@ function toggleList(numId) {
 }
 const toggleBulletList = (state, dispatch) => toggleList(1)(state, dispatch);
 const toggleNumberedList = (state, dispatch) => toggleList(2)(state, dispatch);
+const attrsForListLevel = (state, attrs, level) => {
+	if (!hasActiveListNumbering(attrs)) panic("Cannot change the level of a list without a numbering id");
+	return {
+		...attrs,
+		...listLevelAttrPatch(attrs, {
+			numId: attrs.numPr.numId,
+			ilvl: level
+		}, getDocumentNumbering(state))
+	};
+};
 const increaseListLevel = (state, dispatch) => {
 	const { $from } = state.selection;
 	const paragraph = $from.parent;
 	if (paragraph.type.name !== "paragraph") return false;
-	if (!paragraph.attrs["numPr"]) return false;
-	const currentLevel = paragraph.attrs["numPr"].ilvl || 0;
+	const attrs = expectParagraphAttrs(paragraph);
+	if (!hasActiveListNumbering(attrs)) return false;
+	const currentLevel = attrs.numPr.ilvl || 0;
 	if (currentLevel >= 8) return false;
 	if (!dispatch) return true;
 	const paragraphPos = $from.before($from.depth);
-	dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, {
-		...paragraph.attrs,
-		numPr: {
-			...paragraph.attrs["numPr"],
-			ilvl: currentLevel + 1
-		},
-		indentLeft: null,
-		indentFirstLine: null,
-		hangingIndent: null
-	}).scrollIntoView());
+	dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, { ...attrsForListLevel(state, attrs, currentLevel + 1) }).scrollIntoView());
 	return true;
 };
 const decreaseListLevel = (state, dispatch) => {
 	const { $from } = state.selection;
 	const paragraph = $from.parent;
 	if (paragraph.type.name !== "paragraph") return false;
-	if (!paragraph.attrs["numPr"]) return false;
-	const currentLevel = paragraph.attrs["numPr"].ilvl || 0;
+	const attrs = expectParagraphAttrs(paragraph);
+	if (!hasActiveListNumbering(attrs)) return false;
+	const currentLevel = attrs.numPr.ilvl || 0;
 	if (!dispatch) return true;
 	const paragraphPos = $from.before($from.depth);
 	if (currentLevel <= 0) dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, {
-		...paragraph.attrs,
-		numPr: null,
-		listIsBullet: null,
-		listNumFmt: null,
-		listMarker: null,
-		indentLeft: null,
-		indentFirstLine: null,
-		hangingIndent: null
-	}).scrollIntoView());
-	else dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, {
-		...paragraph.attrs,
-		numPr: {
-			...paragraph.attrs["numPr"],
-			ilvl: currentLevel - 1
-		},
+		...clearListAttrs(attrs),
 		indentLeft: null,
 		indentFirstLine: null,
 		hangingIndent: null
 	}).scrollIntoView());
+	else dispatch(state.tr.setNodeMarkup(paragraphPos, void 0, { ...attrsForListLevel(state, attrs, currentLevel - 1) }).scrollIntoView());
 	return true;
 };
 const removeList = (state, dispatch) => {
@@ -151,15 +159,9 @@ const removeList = (state, dispatch) => {
 	let tr = state.tr;
 	const seen = /* @__PURE__ */ new Set();
 	state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
-		if (node.type.name === "paragraph" && node.attrs["numPr"] && !seen.has(pos)) {
+		if (node.type.name === "paragraph" && hasActiveListNumbering(expectParagraphAttrs(node)) && !seen.has(pos)) {
 			seen.add(pos);
-			tr = tr.setNodeMarkup(pos, void 0, {
-				...node.attrs,
-				numPr: null,
-				listIsBullet: null,
-				listNumFmt: null,
-				listMarker: null
-			});
+			tr = tr.setNodeMarkup(pos, void 0, clearListAttrs(expectParagraphAttrs(node)));
 		}
 	});
 	dispatch(tr.scrollIntoView());
@@ -169,16 +171,17 @@ function isInList(state) {
 	const { $from } = state.selection;
 	const paragraph = $from.parent;
 	if (paragraph.type.name !== "paragraph") return false;
-	return !!paragraph.attrs["numPr"]?.numId;
+	return hasActiveListNumbering(expectParagraphAttrs(paragraph));
 }
 function getListInfo(state) {
 	const { $from } = state.selection;
 	const paragraph = $from.parent;
 	if (paragraph.type.name !== "paragraph") return null;
-	if (!paragraph.attrs["numPr"]?.numId) return null;
+	const attrs = expectParagraphAttrs(paragraph);
+	if (!hasActiveListNumbering(attrs)) return null;
 	return {
-		numId: paragraph.attrs["numPr"].numId,
-		ilvl: paragraph.attrs["numPr"].ilvl || 0
+		numId: attrs.numPr.numId,
+		ilvl: attrs.numPr.ilvl || 0
 	};
 }
 function exitListOnEmptyEnter() {
@@ -187,15 +190,10 @@ function exitListOnEmptyEnter() {
 		if (!empty) return false;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
-		if (!paragraph.attrs["numPr"]) return false;
+		const attrs = expectParagraphAttrs(paragraph);
+		if (!hasActiveListNumbering(attrs)) return false;
 		if (paragraph.textContent.length > 0) return false;
-		if (dispatch) dispatch(state.tr.setNodeMarkup($from.before(), void 0, {
-			...paragraph.attrs,
-			numPr: null,
-			listIsBullet: null,
-			listNumFmt: null,
-			listMarker: null
-		}));
+		if (dispatch) dispatch(state.tr.setNodeMarkup($from.before(), void 0, clearListAttrs(attrs)));
 		return true;
 	};
 }
@@ -205,7 +203,7 @@ function splitListItem() {
 		if (!empty) return false;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
-		if (!paragraph.attrs["numPr"]) return false;
+		if (!hasActiveListNumbering(expectParagraphAttrs(paragraph))) return false;
 		if (dispatch) {
 			const { tr } = state;
 			const pos = $from.pos;
@@ -225,14 +223,9 @@ function backspaceExitList() {
 		if ($from.parentOffset !== 0) return false;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
-		if (!paragraph.attrs["numPr"]) return false;
-		if (dispatch) dispatch(state.tr.setNodeMarkup($from.before(), void 0, {
-			...paragraph.attrs,
-			numPr: null,
-			listIsBullet: null,
-			listNumFmt: null,
-			listMarker: null
-		}));
+		const attrs = expectParagraphAttrs(paragraph);
+		if (!hasActiveListNumbering(attrs)) return false;
+		if (dispatch) dispatch(state.tr.setNodeMarkup($from.before(), void 0, clearListAttrs(attrs)));
 		return true;
 	};
 }
@@ -241,29 +234,19 @@ function increaseListIndent() {
 		const { $from, $to } = state.selection;
 		const positions = [];
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
-			if (node.type.name === "paragraph" && node.attrs["numPr"]) {
-				if ((node.attrs["numPr"].ilvl ?? 0) < 8) positions.push({
+			if (node.type.name === "paragraph") {
+				const attrs = expectParagraphAttrs(node);
+				if (!hasActiveListNumbering(attrs)) return;
+				if ((attrs.numPr?.ilvl ?? 0) < 8) positions.push({
 					pos,
-					attrs: node.attrs
+					attrs
 				});
 			}
 		});
 		if (positions.length === 0) return false;
 		if (dispatch) {
 			let tr = state.tr;
-			for (const { pos, attrs } of positions) {
-				const numPr = attrs["numPr"];
-				tr = tr.setNodeMarkup(pos, void 0, {
-					...attrs,
-					numPr: {
-						...numPr,
-						ilvl: (numPr.ilvl ?? 0) + 1
-					},
-					indentLeft: null,
-					indentFirstLine: null,
-					hangingIndent: null
-				});
-			}
+			for (const { pos, attrs } of positions) tr = tr.setNodeMarkup(pos, void 0, attrsForListLevel(state, attrs, (attrs.numPr?.ilvl ?? 0) + 1));
 			dispatch(tr);
 		}
 		return true;
@@ -274,37 +257,26 @@ function decreaseListIndent() {
 		const { $from, $to } = state.selection;
 		const positions = [];
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
-			if (node.type.name === "paragraph" && node.attrs["numPr"]) positions.push({
-				pos,
-				attrs: node.attrs
-			});
+			if (node.type.name === "paragraph") {
+				const attrs = expectParagraphAttrs(node);
+				if (hasActiveListNumbering(attrs)) positions.push({
+					pos,
+					attrs
+				});
+			}
 		});
 		if (positions.length === 0) return false;
 		if (dispatch) {
 			let tr = state.tr;
 			for (const { pos, attrs } of positions) {
-				const numPr = attrs["numPr"];
-				const currentLevel = numPr.ilvl ?? 0;
+				const currentLevel = attrs.numPr?.ilvl ?? 0;
 				if (currentLevel <= 0) tr = tr.setNodeMarkup(pos, void 0, {
-					...attrs,
-					numPr: null,
-					listIsBullet: null,
-					listNumFmt: null,
-					listMarker: null,
-					indentLeft: null,
-					indentFirstLine: null,
-					hangingIndent: null
-				});
-				else tr = tr.setNodeMarkup(pos, void 0, {
-					...attrs,
-					numPr: {
-						...numPr,
-						ilvl: currentLevel - 1
-					},
+					...clearListAttrs(attrs),
 					indentLeft: null,
 					indentFirstLine: null,
 					hangingIndent: null
 				});
+				else tr = tr.setNodeMarkup(pos, void 0, { ...attrsForListLevel(state, attrs, currentLevel - 1) });
 			}
 			dispatch(tr);
 		}

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

@@ -1,3 +1,4 @@
+import { recreateProseNodeWithParagraphPropertySource, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource } from "../../../docx/paragraphPropertySource.js";
 import { deterministicHexId, generateHexId } from "../../../utils/hexId.js";
 import { createExtension } from "../create.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
@@ -169,14 +170,16 @@ const rewriteInitialParaIds = (parent, taken, seen) => {
 				while (taken.has(newId)) newId = generateHexId();
 				taken.add(newId);
 				seen.add(newId);
-				next = child.type.create({
+				next = recreateProseNodeWithParagraphPropertySource(child, { attrs: {
 					...child.attrs,
 					paraId: newId
-				}, child.content, child.marks);
+				} });
 			} else seen.add(id);
+			const paraId = next.attrs["paraId"];
+			if (typeof paraId === "string") transferProseParagraphPropertySource(next, child, paraId);
 		} else if (child.childCount > 0) {
 			const content = rewriteInitialParaIds(child, taken, seen);
-			if (content !== child.content) next = child.copy(content);
+			if (content !== child.content) next = recreateProseNodeWithParagraphPropertySource(child, { content });
 		}
 		if (next !== child) changed = true;
 		children.push(next);
@@ -193,13 +196,18 @@ const rewriteInitialParaIds = (parent, taken, seen) => {
 const ensureParaIdsInDoc = (doc) => {
 	const { needsRewrite, taken } = collectInitialParaIds(doc);
 	if (!needsRewrite) return doc;
-	return doc.copy(rewriteInitialParaIds(doc, taken, /* @__PURE__ */ new Set()));
+	return recreateProseNodeWithParagraphPropertySource(doc, { content: rewriteInitialParaIds(doc, taken, /* @__PURE__ */ new Set()) });
 };
 const ensureParaIdsInState = (state) => {
 	const updates = collectParaIdUpdates(state.doc);
 	if (updates.length === 0) return state;
 	const tr = state.tr;
-	for (const update of updates) tr.setNodeMarkup(update.pos, void 0, update.attrs);
+	for (const update of updates) setProseParagraphMarkupWithPropertySource({
+		attrs: update.attrs,
+		ownership: "transfer-allocated-id",
+		pos: update.pos,
+		transaction: tr
+	});
 	ignoreTrackedChanges(tr);
 	tr.setMeta(paraIdAllocatorKey, "allocated");
 	tr.setMeta("addToHistory", false);
@@ -214,7 +222,12 @@ const createParaIdAllocatorPlugin = () => new Plugin({
 		const updates = collectParaIdUpdates(newState.doc, keeperPositions, seed);
 		if (updates.length === 0) return null;
 		const tr = newState.tr;
-		for (const u of updates) tr.setNodeMarkup(u.pos, void 0, u.attrs);
+		for (const u of updates) setProseParagraphMarkupWithPropertySource({
+			attrs: u.attrs,
+			ownership: "transfer-allocated-id",
+			pos: u.pos,
+			transaction: tr
+		});
 		ignoreTrackedChanges(tr);
 		tr.setMeta(paraIdAllocatorKey, "allocated");
 		tr.setMeta("addToHistory", false);