@stll/folio-core 0.52.0 → 0.53.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -22,6 +22,7 @@ import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../a
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { withEnclosingRevision } from "../contentControlRevisions.js";
+import { emptyFieldRunPropertyChanges } from "../emptyFieldResultRuns.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
@@ -197,6 +198,7 @@ const collectPairedBookmarkIds = (blocks) => {
 				}
 				break;
 			case "blockSdt":
+			case "blockCustomXml":
 				visitBlocks(block.content);
 				break;
 			case "preservedBlock": break;
@@ -250,6 +252,9 @@ function toProseDoc(document, options) {
 			case "blockSdt":
 				out.push(convertBlockSdt(block, convertBodyBlocks));
 				break;
+			case "blockCustomXml":
+				out.push(convertBlockCustomXml(block, convertBodyBlocks));
+				break;
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;
@@ -282,7 +287,10 @@ function toProseDoc(document, options) {
 * no index and nothing has to keep one honest as the blocks around it change.
 */
 function convertPreservedBlock(block) {
-	return schema.node("preservedBlock", { xml: block.xml });
+	return schema.node("preservedBlock", {
+		xml: block.xml,
+		readerText: block.readerText ?? null
+	});
 }
 /**
 * Carry a bookmark marker that stands between two blocks into the editor.
@@ -354,6 +362,15 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 	if (children.length === 0) children.push(schema.node("paragraph", {}, []));
 	return schema.node("blockSdt", attrs, children);
 }
+function convertBlockCustomXml(block, convertBlocks) {
+	const children = convertBlocks(block.content);
+	if (children.length === 0) children.push(schema.node("paragraph", {}, []));
+	return schema.node("blockCustomXml", {
+		openingXml: block.openingXml,
+		closingXml: block.closingXml,
+		_originallyEmpty: block.content.length === 0
+	}, children);
+}
 /**
 * Convert a Paragraph to a ProseMirror paragraph node
 *
@@ -1072,7 +1089,7 @@ function blockHasMeaningfulContent(block) {
 	if (block.type === "preservedBlock") return true;
 	if (block.type === "bookmarkStart" || block.type === "bookmarkEnd") return true;
 	if (block.type === "table") return block.rows.some((row) => row.cells.some((cell) => tableCellHasMeaningfulContent(cell)));
-	if (block.type === "blockSdt") return true;
+	if (block.type === "blockSdt" || block.type === "blockCustomXml") return true;
 	return block.content.some(paragraphContentHasMeaningfulContent);
 }
 function paragraphContentHasMeaningfulContent(content) {
@@ -1132,6 +1149,7 @@ function convertTable(table, styleResolver, context) {
 	if (table.propertyChanges && table.propertyChanges.length > 0) attrs.tblPrChange = [...table.propertyChanges];
 	if (table.bookmarks && table.bookmarks.length > 0) attrs._bookmarks = table.bookmarks;
 	if (hasSinkChildren(table.preserved)) attrs._preserved = table.preserved;
+	if (table.carrierStack?.length) attrs.carrierStack = table.carrierStack;
 	const conditionalStyles = {};
 	const setCS = (key, type) => {
 		const val = resolveTableStyleConditional(styleResolver, conditionalTableStyleId, type);
@@ -1212,6 +1230,7 @@ function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths,
 	if (row.preservedAttributes && row.preservedAttributes.length > 0) attrsWithoutStructuralChange._preservedAttributes = row.preservedAttributes;
 	if (row.bookmarks && row.bookmarks.length > 0) attrsWithoutStructuralChange._bookmarks = row.bookmarks;
 	if (row.contentControls && row.contentControls.length > 0) attrsWithoutStructuralChange.contentControls = row.contentControls;
+	if (row.carrierStack?.length) attrsWithoutStructuralChange.carrierStack = row.carrierStack;
 	if (hasSinkChildren(row.preserved)) attrsWithoutStructuralChange._preserved = row.preserved;
 	let attrs = attrsWithoutStructuralChange;
 	const rowStructuralChange = row.structuralChange;
@@ -1394,6 +1413,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
 	if (cell.contentControls && cell.contentControls.length > 0) attrs.contentControls = cell.contentControls;
+	if (cell.carrierStack?.length) attrs.carrierStack = cell.carrierStack;
 	const cellStructuralChange = cell.structuralChange;
 	if (cellStructuralChange) {
 		const info = {
@@ -1448,6 +1468,9 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 			case "blockSdt":
 				nodes.push(convertBlockSdt(block, convertCellBlocks));
 				break;
+			case "blockCustomXml":
+				nodes.push(convertBlockCustomXml(block, convertCellBlocks));
+				break;
 			case "preservedBlock":
 				nodes.push(convertPreservedBlock(block));
 				break;
@@ -1548,7 +1571,10 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 	const hasConvertedPreservedContent = inlineNodes.some((node) => node.type.name === "preservedXml");
 	const hasConvertedWrapperContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === INLINE_WRAPPER_MARK_NAME));
 	const createStructuredField = hasConvertedPageBreakContent || hasConvertedPreservedContent || hasStructuredSourceContent && (hasConvertedHyperlinkContent || hasConvertedWrapperContent);
-	if (!createStructuredField && fieldPropertyChanges && fieldPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...fieldPropertyChanges] }));
+	const resultRuns = field.type === "simpleField" ? field.content.flatMap((content) => content.type === "run" ? [content] : []) : field.fieldResult;
+	const emptyResultRuns = displayText === "" && resultRuns.length > 0 && (field.type === "complexField" || field.content.length === resultRuns.length) && resultRuns.every((run) => run.content.every((item) => item.type === "text" && item.text === "")) ? resultRuns : void 0;
+	const resultPropertyChanges = emptyResultRuns ? emptyFieldRunPropertyChanges(emptyResultRuns) : fieldPropertyChanges;
+	if (!createStructuredField && resultPropertyChanges && resultPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...resultPropertyChanges] }));
 	return schema.node(createStructuredField ? "structuredField" : "field", {
 		fieldType: field.fieldType,
 		instruction: field.instruction,
@@ -1556,7 +1582,13 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		fieldKind: field.type === "simpleField" ? "simple" : "complex",
 		fldLock: field.fldLock ?? null,
 		dirty: field.dirty ?? null,
-		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null
+		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null,
+		formFieldDataXml: field.type === "complexField" ? field.formFieldDataXml ?? null : null,
+		_docxEmptyResultRuns: emptyResultRuns ?? null,
+		_docxFieldCode: field.type === "complexField" && field.fieldCode.length > 0 ? {
+			instruction: field.instruction,
+			runs: field.fieldCode
+		} : null
 	}, createStructuredField ? inlineNodes : void 0, marks);
 }
 /**
@@ -2897,6 +2929,9 @@ function headerFooterToProseDoc(content, options) {
 			case "blockSdt":
 				out.push(convertBlockSdt(block, convertBlocks));
 				break;
+			case "blockCustomXml":
+				out.push(convertBlockCustomXml(block, convertBlocks));
+				break;
 			case "preservedBlock":
 				out.push(convertPreservedBlock(block));
 				break;

package/dist/prosemirror/emptyFieldResultRuns.d.ts

@@ -0,0 +1,18 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/prosemirror/emptyFieldResultRuns.d.ts
+/** The single field mark lists every revision held by its invisible result runs. */
+declare const emptyFieldRunPropertyChanges: (runs: readonly document_d_exports.Run[]) => document_d_exports.RunPropertyChange[];
+type ResolveEmptyFieldResultRunsOptions = {
+  runs: readonly document_d_exports.Run[];
+  mode: "accept" | "reject";
+  revisionIds: ReadonlySet<number> | null;
+};
+type ResolvedEmptyFieldResultRuns = {
+  runs: document_d_exports.Run[];
+  visibleFormatting: document_d_exports.TextFormatting | undefined;
+  visibleFormattingChanged: boolean;
+};
+/** Resolve each authored run separately; a field mark carries their combined revisions. */
+declare const resolveEmptyFieldResultRuns: ({ runs, mode, revisionIds }: ResolveEmptyFieldResultRunsOptions) => ResolvedEmptyFieldResultRuns | null;
+//#endregion
+export { emptyFieldRunPropertyChanges, resolveEmptyFieldResultRuns };

package/dist/prosemirror/emptyFieldResultRuns.js

@@ -0,0 +1,33 @@
+import { canonicalJson } from "../utils/canonicalJson.js";
+//#region src/prosemirror/emptyFieldResultRuns.ts
+/** The single field mark lists every revision held by its invisible result runs. */
+const emptyFieldRunPropertyChanges = (runs) => runs.flatMap((run) => run.propertyChanges ?? []);
+const visibleFormatting = (runs) => runs.find((run) => run.formatting !== void 0)?.formatting;
+/** Resolve each authored run separately; a field mark carries their combined revisions. */
+const resolveEmptyFieldResultRuns = ({ runs, mode, revisionIds }) => {
+	let changed = false;
+	const resolved = runs.map((run) => {
+		const matches = run.propertyChanges?.filter((change) => revisionIds === null || revisionIds.has(change.info.id));
+		if (!matches?.length) return run;
+		changed = true;
+		const remaining = run.propertyChanges?.filter((change) => revisionIds !== null && !revisionIds.has(change.info.id));
+		const formatting = mode === "reject" ? matches.at(0)?.previousFormatting : run.formatting;
+		return {
+			type: "run",
+			content: run.content,
+			...formatting !== void 0 ? { formatting } : {},
+			...remaining?.length ? { propertyChanges: remaining } : {},
+			...run.preservedAttributes ? { preservedAttributes: run.preservedAttributes } : {}
+		};
+	});
+	if (!changed) return null;
+	const before = visibleFormatting(runs);
+	const after = visibleFormatting(resolved);
+	return {
+		runs: resolved,
+		visibleFormatting: after,
+		visibleFormattingChanged: canonicalJson(before) !== canonicalJson(after)
+	};
+};
+//#endregion
+export { emptyFieldRunPropertyChanges, resolveEmptyFieldResultRuns };

package/dist/prosemirror/extensions/ExtensionManager.d.ts

@@ -1,6 +1,6 @@
 import { AnyExtension, CommandFactory, CommandMap, FolioCommandArguments, FolioCommandName } from "./types.js";
-import { Plugin } from "prosemirror-state";
 import { Schema } from "prosemirror-model";
+import { Plugin } from "prosemirror-state";
 //#region src/prosemirror/extensions/ExtensionManager.d.ts
 declare class ExtensionManager {
   private readonly extensions;

package/dist/prosemirror/extensions/ExtensionManager.js

@@ -1,3 +1,4 @@
+import { areTransactionInvariantsEnabled, createTransactionInvariantPlugin } from "../plugins/transactionInvariants.js";
 import { createTextInputPlugin } from "../textInput.js";
 import { panic } from "better-result";
 import { Schema } from "prosemirror-model";
@@ -50,7 +51,8 @@ var ExtensionManager = class {
 		this.plugins = [
 			createTextInputPlugin(),
 			...allPlugins,
-			...allKeyboardShortcuts.map((shortcuts) => keymap(shortcuts))
+			...allKeyboardShortcuts.map((shortcuts) => keymap(shortcuts)),
+			...areTransactionInvariantsEnabled() ? [createTransactionInvariantPlugin()] : []
 		];
 		this.commands = allCommands;
 	}

package/dist/prosemirror/extensions/StarterKit.js

@@ -19,6 +19,7 @@ import { PasteStyleInlinerExtension } from "./features/PasteStyleInlinerExtensio
 import { SelectionTrackerExtension } from "./features/SelectionTrackerExtension.js";
 import { MARK_EXTENSIONS, MARK_NESTING_ORDER } from "./markRegistry.js";
 import { BlockBookmarkBoundaryExtension } from "./nodes/BlockBookmarkBoundaryExtension.js";
+import { BlockCustomXmlExtension } from "./nodes/BlockCustomXmlExtension.js";
 import { BlockSdtExtension } from "./nodes/BlockSdtExtension.js";
 import { BookmarkBoundaryExtension } from "./nodes/BookmarkBoundaryExtension.js";
 import { CommentReferenceExtension } from "./nodes/CommentReferenceExtension.js";
@@ -86,10 +87,11 @@ function createStarterKit(options = {}) {
 	add("pageBreak", PageBreakExtension());
 	add("pageBreakRun", PageBreakRunExtension());
 	add("renderedPageBreak", RenderedPageBreakExtension());
-	add("field", FieldExtension());
+	add("field", FieldExtension({ getInternalClipboardToken }));
 	add("field", StructuredFieldExtension({ getInternalClipboardToken }));
 	add("sdt", SdtExtension());
 	add("blockSdt", BlockSdtExtension());
+	add("blockCustomXml", BlockCustomXmlExtension());
 	add("preservedBlock", PreservedBlockExtension());
 	add("math", MathExtension());
 	if (!disabled.has("table")) extensions.push(...createTableExtensions());

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

@@ -14,7 +14,7 @@ const DocExtension = createNodeExtension({
 			_adjustLineHeightInTable: { default: false },
 			_doNotUseIndentAsNumberingTabStop: { default: false }
 		},
-		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+"
+		content: "(paragraph | horizontalRule | pageBreak | table | textBox | blockSdt | blockCustomXml | preservedBlock | blockBookmarkBoundary)+"
 	}
 });
 //#endregion

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

@@ -213,6 +213,7 @@ const paragraphNodeSpec = {
 		indentFirstLine: { default: null },
 		hangingIndent: { default: false },
 		numPr: { default: null },
+		_pastedHtmlList: { default: void 0 },
 		numPrFromStyle: { default: null },
 		listNumFmt: { default: null },
 		listIsBullet: { default: null },
@@ -273,11 +274,22 @@ const paragraphNodeSpec = {
 			const styleId = element.dataset["styleId"];
 			const tableOfContentsLevel = Number(element.dataset["tableOfContentsLevel"]);
 			const sectionBreakType = parseSectionBreakType(element.dataset["sectionBreak"]);
+			const pastedListGroup = Number(element.dataset["folioListGroup"]);
+			const pastedListLevel = Number(element.dataset["folioListLevel"]);
+			const pastedListKind = element.dataset["folioListKind"];
+			const pastedListStart = Number(element.dataset["folioListStart"]);
+			const pastedHtmlList = Number.isSafeInteger(pastedListGroup) && pastedListGroup > 0 && Number.isSafeInteger(pastedListLevel) && pastedListLevel >= 0 && pastedListLevel <= 8 && (pastedListKind === "bullet" || pastedListKind === "numbered") ? {
+				group: pastedListGroup,
+				level: pastedListLevel,
+				kind: pastedListKind,
+				...Number.isSafeInteger(pastedListStart) && pastedListStart > 0 ? { start: pastedListStart } : {}
+			} : void 0;
 			const attrs = {
 				...paraId ? { paraId } : {},
 				...alignment ? { alignment } : {},
 				...alignmentFromStyle ? { alignmentFromStyle } : {},
 				...styleId ? { styleId } : {},
+				...pastedHtmlList ? { _pastedHtmlList: pastedHtmlList } : {},
 				...Number.isSafeInteger(tableOfContentsLevel) && tableOfContentsLevel > 0 ? { _tableOfContentsLevel: tableOfContentsLevel } : {},
 				...sectionBreakType ? { _sectionProperties: mintSectionProperties(sectionBreakType) } : {}
 			};

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

@@ -63,6 +63,9 @@ const INHERITED_PARA_ATTRS = [
 	"snapToGrid",
 	"spaceAfter",
 	"spaceBefore",
+	"spacingExplicit",
+	"spacingFromDocDefaults",
+	"spacingFromImplicitDefaultStyle",
 	"contextualSpacing"
 ];
 /** Style formatting needed when the caret has no marks of its own. */

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

@@ -1,18 +1,18 @@
-import { isBulletLevel } from "../../../docx/numberingParser.js";
-import { NO_PARAGRAPH_NUMBERING, paragraphNumberingLevel, paragraphNumberingReference, paragraphNumberingReferenceId } from "../../../docx/numberingReference.js";
+import { paragraphNumberingLevel, paragraphNumberingReferenceId } from "../../../docx/numberingReference.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
-import { PPR_CHANGE_SCOPED_ATTR_KEYS, hasSerializableParagraphPropertyChange } from "../../commands/propertyChangeScope.js";
+import { LIST_MARKER_PATTERN, listRequestsForMarker } from "../../listAutoformatMarkers.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
-import { LIST_RENDERING_ATTR_KEYS } from "../../listRenderingAttrs.js";
+import { applyParagraphUpdates, continueNumbering, listItemAttrs, resolveListTarget, restartNumbering, setNumberingValue } from "../../listNumbering.js";
 import { resolveListState } from "../../listState.js";
-import { paragraphNumberingAttr } from "../../numberingAttr.js";
+import { removedNumberingAttr } from "../../numberingAttr.js";
 import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
-import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
+import { SUGGESTION_META, makeRevisionInfo, suggestRangeDeletion } 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";
+import { Plugin } from "prosemirror-state";
 import { InputRule, inputRules, undoInputRule } from "prosemirror-inputrules";
 //#region src/prosemirror/extensions/features/ListExtension.ts
 /**
@@ -27,113 +27,87 @@ function chainCommands(...commands) {
 		return false;
 	};
 }
-function appendParagraphPropertyChange(attrs, existing, previousFormatting, rev) {
-	return {
-		...attrs,
-		_propertyChanges: [...existing ?? [], {
-			type: "paragraphPropertyChange",
-			info: {
-				id: rev.id,
-				author: rev.author,
-				date: rev.date
-			},
-			previousFormatting
-		}]
-	};
-}
-function getPreviousListFormatting(attrs) {
-	const previousFormatting = {};
-	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) {
-		const value = attrs[key];
-		if (value != null) previousFormatting[key] = value;
-	}
-	previousFormatting["numPr"] = attrs["numPr"] ?? null;
-	for (const key of LIST_RENDERING_ATTR_KEYS) previousFormatting[key] = attrs[key] ?? null;
-	return previousFormatting;
-}
 function clearListAttrs(attrs) {
-	const numPr = paragraphNumberingReferenceId(attrs.numPrFromStyle) === void 0 ? null : paragraphNumberingAttr(NO_PARAGRAPH_NUMBERING);
 	return {
 		...attrs,
-		numPr,
+		numPr: removedNumberingAttr(attrs.numPrFromStyle),
 		...CLEARED_LIST_RENDERING_ATTRS
 	};
 }
 function hasActiveListNumbering(attrs) {
 	return attrs.numPr?.kind === "reference";
 }
+const paragraphsBetween = (doc, from, to) => {
+	const paragraphs = [];
+	doc.nodesBetween(from, to, (node, pos) => {
+		if (node.type.name !== "paragraph") return true;
+		paragraphs.push({
+			pos,
+			node
+		});
+		return false;
+	});
+	return paragraphs;
+};
 /**
-* The numbering instances Folio mints for its own toolbar lists. They are the
-* ids the autoformat rules and the list buttons create; a document Folio did
-* not create numbers its lists however its author did, which is why nothing
-* reads a list's kind off its id any more.
+* Make every paragraph from `from` to `to` an item of one list: the list next
+* to them when it matches, else a new one (see `listNumbering.ts`). One
+* target for the whole range, so a selection of plain paragraphs becomes one
+* list rather than one list apiece.
 */
-const FOLIO_BULLET_NUM_ID = 1;
-const FOLIO_NUMBERED_NUM_ID = 2;
-const targetNumIdForIntent = (numbering, preferredNumId, ilvl, intent) => {
-	const matchesIntent = (numId) => {
-		const level = numbering?.getLevel(numId, ilvl) ?? null;
-		return level !== null && (isBulletLevel(level) ? "bullet" : "numbered") === intent;
-	};
-	if (matchesIntent(preferredNumId)) return preferredNumId;
-	return numbering?.definitions.nums.find(({ numId }) => matchesIntent(numId))?.numId ?? preferredNumId;
+const numberParagraphs = ({ state, tr, from, to, requests }) => {
+	const target = resolveListTarget({
+		numbering: getDocumentNumbering(state),
+		$from: tr.doc.resolve(from),
+		$to: tr.doc.resolve(to),
+		requests
+	});
+	if (!target) return false;
+	applyParagraphUpdates({
+		tr,
+		state,
+		updates: paragraphsBetween(tr.doc, from, to).map(({ pos, node }) => ({
+			pos,
+			node,
+			next: listItemAttrs(node.attrs, {
+				numId: target.numId,
+				ilvl: paragraphNumberingLevel(expectParagraphAttrs(node).numPr) ?? target.ilvl
+			}, target.numbering)
+		}))
+	});
+	return true;
 };
-function toggleList(numId, intent) {
+function toggleList(intent) {
 	return (state, dispatch) => {
 		const { $from, $to } = state.selection;
 		const paragraph = $from.parent;
 		if (paragraph.type.name !== "paragraph") return false;
-		const numbering = getDocumentNumbering(state);
-		const isInSameList = resolveListState(numbering, expectParagraphAttrs(paragraph).numPr).type === intent;
-		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();
-		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 = clearListAttrs(expectParagraphAttrs(node));
-				else {
-					const ilvl = paragraphNumberingLevel(expectParagraphAttrs(node).numPr) ?? 0;
-					const targetNumId = targetNumIdForIntent(numbering, numId, ilvl, intent);
-					const definition = numbering?.getLevel(targetNumId, ilvl) ?? null;
-					const isBullet = definition === null ? intent === "bullet" : isBulletLevel(definition);
-					nextAttrs = {
-						...node.attrs,
-						...CLEARED_LIST_RENDERING_ATTRS,
-						numPr: paragraphNumberingAttr(paragraphNumberingReference({
-							numId: targetNumId,
-							ilvl
-						})),
-						listIsBullet: isBullet,
-						listNumFmt: isBullet ? null : definition?.numFmt ?? "decimal"
-					};
-				}
-				if (rev) {
-					const existing = expectParagraphAttrs(node)._propertyChanges;
-					nextAttrs = appendParagraphPropertyChange(nextAttrs, existing, getPreviousListFormatting(node.attrs), rev);
-				}
-				tr = tr.setNodeMarkup(pos, void 0, nextAttrs);
-			}
+		const numbering = getDocumentNumbering(state);
+		const isItemOfKind = (node) => resolveListState(numbering, expectParagraphAttrs(node).numPr).type === intent;
+		const tr = state.tr;
+		if (isItemOfKind(paragraph)) applyParagraphUpdates({
+			tr,
+			state,
+			updates: paragraphsBetween(state.doc, $from.pos, $to.pos).filter(({ node }) => isItemOfKind(node)).map(({ pos, node }) => ({
+				pos,
+				node,
+				next: clearListAttrs(expectParagraphAttrs(node))
+			}))
+		});
+		else numberParagraphs({
+			state,
+			tr,
+			from: $from.pos,
+			to: $to.pos,
+			requests: [{ kind: intent }]
 		});
-		if (rev) tr.setMeta(SUGGESTION_META, true);
 		dispatch(tr.scrollIntoView());
 		return true;
 	};
 }
-const toggleBulletList = (state, dispatch) => toggleList(FOLIO_BULLET_NUM_ID, "bullet")(state, dispatch);
-const toggleNumberedList = (state, dispatch) => toggleList(FOLIO_NUMBERED_NUM_ID, "numbered")(state, dispatch);
+const toggleBulletList = (state, dispatch) => toggleList("bullet")(state, dispatch);
+const toggleNumberedList = (state, dispatch) => toggleList("numbered")(state, dispatch);
 const attrsForListLevel = (state, attrs, level) => {
 	if (!hasActiveListNumbering(attrs)) panic("Cannot change the level of a list without a numbering id");
 	return {
@@ -215,7 +189,19 @@ function exitListOnEmptyEnter() {
 		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, clearListAttrs(attrs)));
+		if (dispatch) {
+			const tr = state.tr;
+			applyParagraphUpdates({
+				tr,
+				state,
+				updates: [{
+					pos: $from.before(),
+					node: paragraph,
+					next: clearListAttrs(attrs)
+				}]
+			});
+			dispatch(tr);
+		}
 		return true;
 	};
 }
@@ -229,10 +215,19 @@ function splitListItem() {
 		if (dispatch) {
 			const { tr } = state;
 			const pos = $from.pos;
+			const paragraphPos = $from.before();
+			const revision = makeRevisionInfo(state);
 			tr.split(pos, 1, [{
 				type: state.schema.nodes["paragraph"],
 				attrs: { ...paragraph.attrs }
 			}]);
+			if (revision && paragraph.attrs["pPrMark"] == null) {
+				tr.setNodeAttribute(paragraphPos, "pPrMark", {
+					kind: "ins",
+					info: revision
+				});
+				tr.setMeta(SUGGESTION_META, true);
+			}
 			dispatch(tr.scrollIntoView());
 		}
 		return true;
@@ -247,7 +242,19 @@ function backspaceExitList() {
 		if (paragraph.type.name !== "paragraph") return false;
 		const attrs = expectParagraphAttrs(paragraph);
 		if (!hasActiveListNumbering(attrs)) return false;
-		if (dispatch) dispatch(state.tr.setNodeMarkup($from.before(), void 0, clearListAttrs(attrs)));
+		if (dispatch) {
+			const tr = state.tr;
+			applyParagraphUpdates({
+				tr,
+				state,
+				updates: [{
+					pos: $from.before(),
+					node: paragraph,
+					next: clearListAttrs(attrs)
+				}]
+			});
+			dispatch(tr);
+		}
 		return true;
 	};
 }
@@ -314,53 +321,84 @@ function insertTab() {
 		return true;
 	};
 }
+/** Whether a typed marker may become a list here at all. */
+const acceptsListMarker = (paragraph) => paragraph.type.name === "paragraph" && paragraphNumberingReferenceId(expectParagraphAttrs(paragraph).numPr) === void 0;
 /**
-* Word's as-you-type markers. Each ends in the space that triggers the rule.
-* `1.` starts a numbered list at one, like the toolbar button; another typed
-* number stays text rather than being silently renumbered.
+* Replace a typed marker with the list the toolbar button produces: the same
+* target resolution and the same attrs, so an autoformatted list saves exactly
+* like a clicked one. The marker's format and value choose the list (see
+* `listAutoformatMarkers.ts`).
 */
-const BULLET_AUTOFORMAT = /^[-*] $/u;
-const NUMBERED_AUTOFORMAT = /^1\. $/u;
-const captureTransaction = (command, state) => {
-	const captured = { transaction: null };
-	command(state, (transaction) => {
-		captured.transaction = transaction;
-	});
-	return captured.transaction;
-};
-/**
-* Replace a typed marker with the list the toolbar button produces. Running the
-* command itself (rather than writing `numPr` here) keeps an autoformatted list
-* identical to a clicked one, down to what the document saves.
-*/
-const listAutoformat = (marker, toggleCommand) => new InputRule(marker, (state, _match, start, end) => {
+const listAutoformatRule = () => new InputRule(LIST_MARKER_PATTERN, (state, match, start, end) => {
 	const { $from } = state.selection;
-	if ($from.parent.type.name !== "paragraph") return null;
+	if (!acceptsListMarker($from.parent)) return null;
 	if (start !== $from.start()) return null;
-	if (paragraphNumberingReferenceId(expectParagraphAttrs($from.parent).numPr) !== void 0) return null;
 	if (makeRevisionInfo(state)) return null;
-	const toggled = captureTransaction(toggleCommand, state);
-	if (!toggled) return null;
+	const requests = listRequestsForMarker(match[0]);
+	if (!requests) return null;
 	const tr = state.tr.delete(start, end);
-	for (const step of toggled.steps) {
-		const mapped = step.map(tr.mapping);
-		if (mapped) tr.step(mapped);
-	}
-	return tr;
+	return numberParagraphs({
+		state,
+		tr,
+		from: start,
+		to: start,
+		requests
+	}) ? tr : null;
 });
-const listAutoformatRules = () => inputRules({ rules: [listAutoformat(BULLET_AUTOFORMAT, toggleBulletList), listAutoformat(NUMBERED_AUTOFORMAT, toggleNumberedList)] });
+/**
+* List autoformat while suggesting. The suggestion plugin has already
+* recorded the typed space as a tracked insertion; this follows it with the
+* marker's removal (a retraction of the author's own typing, or a tracked
+* deletion of text that was there before) and the list as a tracked
+* paragraph-property change. The follow-up is appended to the typing
+* transaction, so one undo reverts both, and it is stored as the input rule's
+* last conversion, so Backspace puts the marker back as it does while editing.
+*/
+const suggestedListAutoformat = (autoformat) => new Plugin({ appendTransaction(transactions, _oldState, state) {
+	if (!transactions.some((tr) => tr.getMeta("suggestionModeTextInput") === " ")) return null;
+	const { $head, empty } = state.selection;
+	if (!empty || !makeRevisionInfo(state) || !acceptsListMarker($head.parent)) return null;
+	const requests = listRequestsForMarker($head.parent.textBetween(0, $head.parentOffset, null, ""));
+	if (!requests) return null;
+	const start = $head.start();
+	const tr = state.tr;
+	if (!suggestRangeDeletion(state, tr, start, $head.pos)) return null;
+	const from = tr.mapping.map(start);
+	if (!numberParagraphs({
+		state,
+		tr,
+		from,
+		to: from,
+		requests
+	})) return null;
+	const caret = tr.mapping.map($head.pos);
+	tr.setMeta(autoformat, {
+		transform: tr,
+		from: caret,
+		to: caret,
+		text: ""
+	});
+	return tr;
+} });
+const listAutoformatPlugins = () => {
+	const autoformat = inputRules({ rules: [listAutoformatRule()] });
+	return [autoformat, suggestedListAutoformat(autoformat)];
+};
 const ListExtension = createExtension({
 	name: "list",
 	priority: Priority.High,
 	onSchemaReady() {
 		return {
-			plugins: [listAutoformatRules()],
+			plugins: listAutoformatPlugins(),
 			commands: {
 				toggleBulletList: () => toggleBulletList,
 				toggleNumberedList: () => toggleNumberedList,
 				increaseListLevel: () => increaseListLevel,
 				decreaseListLevel: () => decreaseListLevel,
-				removeList: () => removeList
+				removeList: () => removeList,
+				restartNumbering: () => restartNumbering,
+				continueNumbering: () => continueNumbering,
+				setNumberingValue: (value) => setNumberingValue(value)
 			},
 			keyboardShortcuts: {
 				Tab: chainCommands(goToNextCell(), increaseListIndent(), insertTab()),