@stll/folio-core 0.56.0 → 0.58.0

package/dist/prosemirror/commands/propertyChangeScope.js

@@ -4,6 +4,7 @@ import { readParagraphNumberingAttr } from "../numberingAttr.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { PARAGRAPH_FORMATTING_WRITE_BACK, STYLE_RESOLVED_PARAGRAPH_FIELDS } from "../paragraphFormattingProvenance.js";
+import { directParagraphIndentation } from "../paragraphIndentation.js";
 import { directParagraphSpacing, paragraphSpacingAttrPatch, paragraphSpacingFromFormatting } from "../paragraphSpacing.js";
 import { sameFormattingValue } from "../runFormattingFromMarks.js";
 //#region src/prosemirror/commands/propertyChangeScope.ts
@@ -127,18 +128,14 @@ const paragraphPropertiesSnapshot = (node) => {
 	const attrs = expectParagraphAttrs(node);
 	const snapshot = {};
 	for (const key of PPR_CHANGE_SCOPED_ATTR_KEYS) {
-		if (key === "alignment" || PPR_SPACING_ATTR_KEYS.has(key) || key === "numPr" && isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) continue;
+		if (key === "alignment" || key === "indentLeft" || key === "indentRight" || key === "indentFirstLine" || key === "hangingIndent" || PPR_SPACING_ATTR_KEYS.has(key) || key === "numPr" && isStyleSourcedParagraphNumbering(attrs.numPr, attrs.numPrFromStyle)) continue;
 		if (styleSuppliedParagraphValue(attrs, key)) continue;
-		if (key === "hangingIndent" && styleSuppliedParagraphValue(attrs, "indentFirstLine")) continue;
-		if (styleSuppliedParagraphValue(attrs, key)) continue;
-		if (key === "hangingIndent" && styleSuppliedParagraphValue(attrs, "indentFirstLine")) continue;
 		const value = attrs[key];
-		if (key === "hangingIndent" && value === false && attrs._originalFormatting?.hangingIndent === void 0) continue;
 		if (value !== null && value !== void 0) snapshot[key] = value;
 	}
 	const directAlignment = directParagraphAlignment(attrs);
 	if (directAlignment !== void 0) snapshot["alignment"] = directAlignment;
-	Object.assign(snapshot, directParagraphSpacing(attrs));
+	Object.assign(snapshot, directParagraphSpacing(attrs), directParagraphIndentation(attrs));
 	return snapshot;
 };
 /**

package/dist/prosemirror/commands/resolveParagraphProperties.js

@@ -2,8 +2,9 @@ import { resolveParagraphNumbering } from "../../docx/numberingReference.js";
 import { expectParagraphAttrs } from "../attrs/index.js";
 import { rejectedListRenderingPatch } from "../listRendering.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
-import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
+import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { resolveParagraphDefaultTextFormatting } from "../styles/paragraphStyleCascade.js";
+import { listIndentationProvenancePatch } from "../styles/resolvedStyleAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges, sectionRejectProperties } from "./propertyChangeScope.js";
 //#region src/prosemirror/commands/resolveParagraphProperties.ts
 /** Resolve paragraph and section property records before resolving their inline content. */
@@ -27,24 +28,32 @@ const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet,
 				const inheritedAlignment = currentAttrs.alignmentFromStyle;
 				const restoredStyleId = rejection.previousFormatting?.styleId ?? void 0;
 				const sameStyle = restoredStyleId === (currentAttrs.styleId ?? void 0);
-				let previousFormattingFromStyle;
-				let resolvedFromStyle = sameStyle ? currentAttrs._resolvedFormatting : void 0;
-				if (styleResolver) {
-					previousFormattingFromStyle = styleResolver.resolveParagraphStyle(restoredStyleId).paragraphFormatting;
-					if (!sameStyle) {
-						resolvedFromStyle = styleResolvedParagraphFormatting(previousFormattingFromStyle);
-						nextAttrs["_resolvedFormatting"] = resolvedFromStyle;
-					}
-				} else if (inheritedAlignment !== void 0) previousFormattingFromStyle = { alignment: inheritedAlignment };
-				const inheritedFormatting = previousFormattingFromStyle === void 0 && resolvedFromStyle === void 0 ? void 0 : {
+				let previousFormattingFromStyle = sameStyle ? currentAttrs._styleResolvedFormatting : void 0;
+				if (styleResolver) previousFormattingFromStyle = styleResolver.resolveParagraphStyle(restoredStyleId).paragraphFormatting;
+				else if (inheritedAlignment !== void 0) previousFormattingFromStyle = {
 					...previousFormattingFromStyle,
-					...resolvedFromStyle
+					alignment: inheritedAlignment
 				};
 				let styleNumbering = previousFormattingFromStyle?.numPr;
 				if (!styleResolver && sameStyle) styleNumbering = currentAttrs.numPrFromStyle ?? void 0;
 				const inheritedNumbering = styleNumbering == null ? null : paragraphNumberingAttr(resolveParagraphNumbering(styleNumbering));
 				const recordedNumbering = rejection.previousFormatting?.numPr;
 				const restoredNumbering = recordedNumbering ?? inheritedNumbering;
+				const restoredFormatting = paragraphRejectOriginalFormatting(rejection.previousFormatting, node.attrs["_originalFormatting"]);
+				const indentation = listIndentationProvenancePatch({
+					direct: paragraphIndentationFromFormatting(restoredFormatting ?? void 0),
+					styleFormatting: previousFormattingFromStyle,
+					numberingSource: recordedNumbering == null ? "style" : "paragraph",
+					numPr: restoredNumbering?.kind === "reference" ? {
+						numId: restoredNumbering.numId,
+						ilvl: restoredNumbering.ilvl ?? 0
+					} : void 0,
+					numbering
+				});
+				const inheritedFormatting = {
+					...previousFormattingFromStyle,
+					...indentation._resolvedFormatting
+				};
 				Object.assign(nextAttrs, paragraphRejectAttrPatch(rejection.previousFormatting, inheritedFormatting), rejectedListRenderingPatch({
 					current: expectParagraphAttrs(node),
 					previousFormatting: rejection.previousFormatting,
@@ -54,7 +63,7 @@ const resolveParagraphChangeAttrs = ({ node, boundaryCovered, mode, revisionSet,
 					numPr: restoredNumbering,
 					numPrFromStyle: recordedNumbering == null ? inheritedNumbering : null
 				});
-				const restoredFormatting = paragraphRejectOriginalFormatting(rejection.previousFormatting, node.attrs["_originalFormatting"]);
+				Object.assign(nextAttrs, indentation);
 				nextAttrs["_originalFormatting"] = restoredFormatting;
 				if (styleResolver) nextAttrs["defaultTextFormatting"] = resolveParagraphDefaultTextFormatting(rejection.previousFormatting?.styleId, restoredFormatting ?? void 0, styleResolver) ?? null;
 			}

package/dist/prosemirror/commentOps.js

@@ -1,6 +1,14 @@
+import { addTrackedDeletionMark } from "./addTrackedDeletionMark.js";
 import { findTextInPmParagraph } from "./paraText.js";
 import { findParagraphByParaId } from "./utils/findParagraphByParaId.js";
 //#region src/prosemirror/commentOps.ts
+/**
+* Comment + tracked-change (proposeChange) PM transaction builders shared by
+* the React and Vue adapters. They locate the target range, apply the mark(s),
+* dispatch, and return a result. ID allocation lives in `commentIdAllocator.ts`
+* and is injected. Adapter-specific state mutation, event emission, and sidebar
+* UI stay in each adapter.
+*/
 /** Build a Comment object with a freshly-allocated ID. */
 function createComment(allocator, text, authorName, parentId) {
 	return {
@@ -95,7 +103,13 @@ function applyProposedChange(view, options, allocator) {
 		date
 	});
 	let tr = view.state.tr;
-	if (!isInsertion) tr = tr.addMark(textFrom, textTo, deletionMark);
+	if (!isInsertion) addTrackedDeletionMark({
+		insertionPolicy: "preserve-pending",
+		tr,
+		from: textFrom,
+		to: textTo,
+		mark: deletionMark
+	});
 	if (!isDeletion) tr = tr.insert(textTo, schema.text(options.replaceWith, [insertionMark]));
 	view.dispatch(tr);
 	return true;

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -16,11 +16,18 @@ import { Node } from "prosemirror-model";
 type ProjectionReuse = "none" | "matched";
 /** How the conversion treats records the editor did not change. */
 type FromProseDocOptions = {
+  /** The stylesheet authority used to construct the projection. */
+  stylesheetSource: {
+    type: "package";
+  } | {
+    type: "supplied";
+    styles: document_d_exports.StyleDefinitions;
+  };
   /** Defaults to `"none"`, the only value implemented. */
   reuse?: ProjectionReuse;
 };
 /** Convert a ProseMirror document to the document model. */
-declare function fromProseDoc(pmDoc: Node, baseDocument?: document_d_exports.Document, { reuse }?: FromProseDocOptions): document_d_exports.Document;
+declare function fromProseDoc(pmDoc: Node, baseDocument: document_d_exports.Document | undefined, { stylesheetSource, reuse }: FromProseDocOptions): document_d_exports.Document;
 declare function tableAttrsToFormatting(attrs: TableAttrs): document_d_exports.TableFormatting | undefined;
 /**
  * Convert ProseMirror table row attrs to TableRowFormatting

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,10 +1,11 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
+import { getDocumentSourceBaseline } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
 import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
 import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
-import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
+import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, assignParagraphIndentationProjection, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphFormattingWithAuthoredIndentation, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
 import { BLOCK_TREE_DESCENT, visitBlockTreeRecords, visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
 import { refingerprintShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { DATE_UTC_ATTRIBUTE } from "../../docx/trackedChangeInfo.js";
@@ -33,15 +34,17 @@ import { inlineWrapperMember, inlineWrapperStackKey } from "../inlineWrapperStac
 import { completeNumberingForDoc } from "../listInstanceReferences.js";
 import { hasListRendering, listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRenderingAttrs.js";
 import { expectMoveRangeBoundaryAttrs } from "../moveRangeBoundaryAttrs.js";
+import { assertNoteReferenceOccurrences, coalesceNoteReferenceOccurrences } from "../noteReferenceOccurrences.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
 import { directionToAuthoredBidi } from "../paragraphDirection.js";
+import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { directParagraphSpacing } from "../paragraphSpacing.js";
 import { expectRangeAnchorAttrs } from "../rangeAnchorAttrs.js";
 import { marksToTextFormatting, sameFormattingValue } from "../runFormattingFromMarks.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
 import { RUN_IDENTITY_MARK_NAME } from "../runIdentity.js";
-import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting } from "../runStyleFormatting.js";
+import { paragraphFormattingForRun, paragraphRunStyleContext, resolveEffectiveRunStyleFormatting, resolveParagraphInheritedRunFormatting } from "../runStyleFormatting.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
 import { parseShapeGeometryAdjustments } from "../shapeGeometryAdjustments.js";
 import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
@@ -50,7 +53,7 @@ import { enclosingInsertionAncestors, inlineWrapperStackOf } from "../trackedRev
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
 import { decodeSdtListItems, sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
-import { panic } from "better-result";
+import { TaggedError, panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, relationshipIdOf } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.ts
@@ -161,6 +164,13 @@ const restoreParagraphPropertySource = (paragraph, baseParagraph) => {
 	copyParagraphPropertySource(paragraph, baseParagraph);
 	const baseFormatting = baseParagraph.formatting;
 	if (!baseFormatting) return;
+	if (baseFormatting.indentLeft !== void 0 || baseFormatting.indentRight !== void 0 || baseFormatting.indentFirstLine !== void 0 || baseFormatting.hangingIndent !== void 0) {
+		const authored = paragraphFormattingWithAuthoredIndentation(baseParagraph);
+		if ((authored?.indentLeft !== baseFormatting.indentLeft || authored?.indentRight !== baseFormatting.indentRight || authored?.indentFirstLine !== baseFormatting.indentFirstLine || authored?.hangingIndent !== baseFormatting.hangingIndent) && canonicalJson(modelParagraphFormattingEmission(paragraph.formatting)) === canonicalJson(modelParagraphFormattingEmission(authored))) {
+			paragraph.formatting = { ...baseFormatting };
+			return;
+		}
+	}
 	const { numPr, numPrFromStyle } = baseFormatting;
 	if (!numPr || !numPrFromStyle || !isStyleSourcedParagraphNumbering(numPr, numPrFromStyle)) return;
 	if (canonicalJson(modelParagraphFormattingEmission(paragraph.formatting)) !== canonicalJson(modelParagraphFormattingEmission(baseFormatting))) return;
@@ -261,8 +271,90 @@ const restoreLinkedParagraphPropertySources = (content) => {
 		sources: new Set(targetsBySource.keys())
 	};
 };
+var SaveStylesheetSourceMismatch = class extends TaggedError("SaveStylesheetSourceMismatch") {};
+const assertSuppliedStylesMatchSource = (styles, baseDocument) => {
+	if (!baseDocument?.originalBuffer) return;
+	const source = getDocumentSourceBaseline(baseDocument);
+	switch (source.type) {
+		case "missing":
+		case "mismatch": throw new SaveStylesheetSourceMismatch({
+			message: "The parsed package stylesheet source is unavailable.",
+			divergences: [{ type: "sourceUnavailable" }]
+		});
+		case "captured": {
+			const sourceStyles = source.resourceStyles;
+			if (!sourceStyles) return;
+			const suppliedById = new Map(styles.styles.map((style) => [style.styleId, style]));
+			const sourceById = new Map(sourceStyles.styles.map((style) => [style.styleId, style]));
+			const divergentIds = /* @__PURE__ */ new Set();
+			for (const style of sourceStyles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+			for (const style of styles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+			const persistedStyles = {
+				...sourceStyles,
+				styles: [...sourceStyles.styles, ...styles.styles.filter(({ styleId }) => !sourceById.has(styleId))]
+			};
+			const suppliedResolver = createStyleEngine(styles);
+			const persistedResolver = createStyleEngine(persistedStyles);
+			for (const [supplied, persisted] of [
+				[suppliedResolver.getDefaultParagraphStyle(), persistedResolver.getDefaultParagraphStyle()],
+				[suppliedResolver.getDefaultCharacterStyle(), persistedResolver.getDefaultCharacterStyle()],
+				[suppliedResolver.getDefaultTableStyle(), persistedResolver.getDefaultTableStyle()]
+			]) {
+				if (supplied?.styleId === persisted?.styleId) continue;
+				if (supplied) divergentIds.add(supplied.styleId);
+				if (persisted) divergentIds.add(persisted.styleId);
+			}
+			const divergences = [];
+			for (const styleId of divergentIds) divergences.push({
+				type: "style",
+				styleId
+			});
+			if (canonicalJson(styles.docDefaults) !== canonicalJson(sourceStyles.docDefaults)) divergences.push({ type: "docDefaults" });
+			if (divergences.length === 0) return;
+			throw new SaveStylesheetSourceMismatch({
+				message: `Supplied stylesheet differs from the parsed package: ${[...divergentIds, ...divergences.some(({ type }) => type === "docDefaults") ? ["docDefaults"] : []].join(", ")}.`,
+				divergences
+			});
+		}
+		default: return panic(`Unexpected stylesheet source baseline: ${JSON.stringify(source)}`);
+	}
+};
+const saveStylesheet = (source, baseDocument) => {
+	switch (source.type) {
+		case "package": return baseDocument?.package.styles;
+		case "supplied":
+			assertSuppliedStylesMatchSource(source.styles, baseDocument);
+			return source.styles;
+		default: return panic(`Unexpected stylesheet source: ${JSON.stringify(source)}`);
+	}
+};
+var MissingSaveStylesheet = class extends TaggedError("MissingSaveStylesheet") {};
+const assertSaveStylesheetAvailable = ({ pmDoc, styles, baseDocument, stylesheetSource }) => {
+	if (styles !== void 0) return;
+	if (stylesheetSource.type === "package" && baseDocument !== void 0) return;
+	pmDoc.descendants((node) => {
+		if ((() => {
+			switch (node.type.name) {
+				case "paragraph": {
+					const attrs = expectParagraphAttrs(node);
+					return attrs.styleId ?? attrs._originalFormatting?.runProperties?.styleId;
+				}
+				case "table": return expectTableAttrs(node).styleId;
+				default: return;
+			}
+		})() != null || node.marks.some(({ type }) => type.name === "characterStyle")) throw new MissingSaveStylesheet({ message: "Saving style-dependent content requires its authoritative stylesheet." });
+	});
+};
 /** Convert a ProseMirror document to the document model. */
-function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
+function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" }) {
+	const styles = saveStylesheet(stylesheetSource, baseDocument);
+	assertSaveStylesheetAvailable({
+		pmDoc,
+		styles,
+		baseDocument,
+		stylesheetSource
+	});
+	assertNoteReferenceOccurrences(pmDoc);
 	switch (reuse) {
 		case "none": break;
 		case "matched": panic("fromProseDoc: reuse \"matched\" is not implemented");
@@ -274,7 +366,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	const proseContract = getProseDocumentParagraphPropertySourceContract(pmDoc);
 	if (proseContractAttribute !== null && proseContractAttribute !== void 0 && proseContract === null || (baseContract ?? null) !== proseContract) throw sourceValidationError("contract_mismatch", "The ProseMirror document does not match its paragraph-property source document.");
 	const tokenSources = baseContract && proseContract && baseDocument ? validateParagraphPropertySourceTokens(pmDoc, baseDocument, baseContract) : null;
-	const blocks = extractBlocks(pmDoc, "resolve", baseDocument?.package.styles ? createStyleEngine(baseDocument.package.styles) : null);
+	const blocks = extractBlocks(pmDoc, "resolve", createStyleEngine(styles));
 	joinCommentRangesAcrossParagraphs(blocks);
 	completeCommentReferences(blocks);
 	const linkedSources = restoreLinkedParagraphPropertySources(blocks);
@@ -292,6 +384,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 			package: {
 				...baseDocument.package,
 				document: documentBody,
+				...styles ? { styles } : {},
 				...numbering ? { numbering } : {}
 			}
 		};
@@ -300,6 +393,7 @@ function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
 	}
 	return { package: {
 		document: documentBody,
+		...styles ? { styles } : {},
 		...numbering ? { numbering } : {}
 	} };
 }
@@ -314,12 +408,13 @@ const hasSuggestedInsertion = (marks) => marks.some((mark) => mark.type.name ===
 * Returns the input array unchanged when there is nothing to strip so callers
 * can skip rebuilding the node.
 */
-function stripSuggestedInlineMarks(marks, { baseParagraphFormatting, inheritedFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver }) {
+function stripSuggestedInlineMarks(marks, readFormattingContext) {
 	const hasSuggestedDeletion = marks.some((mark) => mark.type.name === "deletion" && isSuggestedMark(mark));
 	const suggestedRunPropertyChange = marks.find((mark) => mark.type.name === "runPropertyChange" && isSuggestedMark(mark));
 	if (!hasSuggestedDeletion && !suggestedRunPropertyChange) return marks;
 	let next = marks.filter((mark) => !((mark.type.name === "deletion" || mark.type.name === "runPropertyChange") && isSuggestedMark(mark)));
 	if (suggestedRunPropertyChange) {
+		const { baseParagraphFormatting, inheritedFormatting, paragraphMarkFormatting, paragraphMarkPrecedesStyle, styleResolver } = readFormattingContext();
 		const previousFormatting = expectRunPropertyChangeMarkAttrs(suggestedRunPropertyChange).changes.at(0)?.previousFormatting;
 		const characterStyleMark = marks.find(({ type }) => type.name === "characterStyle");
 		const characterStyleAttrs = characterStyleMark ? expectCharacterStyleMarkAttrs(characterStyleMark) : void 0;
@@ -425,6 +520,21 @@ function isSuggestedInsertedNode(node) {
 	}
 	return false;
 }
+const savedParagraphRunStyleContext = (paragraph, styleResolver) => {
+	const context = paragraphRunStyleContext(paragraph, styleResolver);
+	if (paragraph.content.size === 0) return context;
+	const attrs = expectParagraphAttrs(paragraph);
+	const source = resolveParagraphInheritedRunFormatting({
+		styleId: attrs.styleId,
+		styleResolver,
+		tableRunFormatting: attrs._tableRunFormatting,
+		paragraphMarkFormatting: attrs.styleId === void 0 ? context.paragraphMarkFormatting : void 0
+	});
+	return {
+		...context,
+		paragraphFormatting: source.inheritedFormatting
+	};
+};
 /**
 * Recursively rewrite a ProseMirror node tree, removing every suggested
 * tracked change. Returns `null` when the node itself must be dropped: a
@@ -432,32 +542,32 @@ function isSuggestedInsertedNode(node) {
 * Surviving block nodes are rebuilt with their suggested delete/merge markers
 * cleared and their children stripped.
 */
-function mapSuggestionStrippedNode(node, formattingContext = {
-	baseParagraphFormatting: void 0,
-	inheritedFormatting: void 0,
-	paragraphMarkFormatting: void 0,
-	paragraphMarkPrecedesStyle: false,
-	styleResolver: null
-}) {
+function mapSuggestionStrippedNode(node, readFormattingContext) {
 	if (node.isInline) {
 		if (hasSuggestedInsertion(node.marks)) return null;
-		const marks = stripSuggestedInlineMarks(node.marks, formattingContext);
+		const marks = stripSuggestedInlineMarks(node.marks, readFormattingContext);
 		return marks === node.marks ? node : node.mark(marks);
 	}
 	if (isSuggestedInsertedNode(node)) return null;
 	const nextAttrs = stripSuggestedNodeAttrs(node);
 	const children = [];
 	let changed = nextAttrs !== null;
-	const paragraphStyleContext = node.type.name === "paragraph" ? paragraphRunStyleContext(node, formattingContext.styleResolver) : void 0;
-	const childFormattingContext = paragraphStyleContext ? {
-		baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
-		inheritedFormatting: paragraphStyleContext.paragraphFormatting,
-		paragraphMarkFormatting: paragraphStyleContext.paragraphMarkFormatting,
-		paragraphMarkPrecedesStyle: paragraphStyleContext.paragraphMarkPrecedesStyle,
-		styleResolver: formattingContext.styleResolver
-	} : formattingContext;
+	let resolvedChildContext;
+	const readChildFormattingContext = node.type.name === "paragraph" ? () => {
+		if (resolvedChildContext) return resolvedChildContext;
+		const { styleResolver } = readFormattingContext();
+		const paragraphStyleContext = savedParagraphRunStyleContext(node, styleResolver);
+		resolvedChildContext = {
+			baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
+			inheritedFormatting: paragraphStyleContext.paragraphFormatting,
+			paragraphMarkFormatting: paragraphStyleContext.paragraphMarkFormatting,
+			paragraphMarkPrecedesStyle: paragraphStyleContext.paragraphMarkPrecedesStyle,
+			styleResolver
+		};
+		return resolvedChildContext;
+	} : readFormattingContext;
 	node.forEach((child) => {
-		const mapped = mapSuggestionStrippedNode(child, childFormattingContext);
+		const mapped = mapSuggestionStrippedNode(child, readChildFormattingContext);
 		if (mapped === null) {
 			changed = true;
 			return;
@@ -478,13 +588,13 @@ function mapSuggestionStrippedNode(node, formattingContext = {
 * {@link extractBlocks} for why this is the sole serialization boundary.
 */
 function stripSuggestedProvenance(doc, styleResolver) {
-	return mapSuggestionStrippedNode(doc, {
+	return mapSuggestionStrippedNode(doc, () => ({
 		baseParagraphFormatting: void 0,
 		inheritedFormatting: void 0,
 		paragraphMarkFormatting: void 0,
 		paragraphMarkPrecedesStyle: false,
 		styleResolver
-	}) ?? doc;
+	})) ?? doc;
 }
 function materializeNumberedRefValues(doc) {
 	const results = resolveNumberedRefFields(doc);
@@ -936,7 +1046,7 @@ function appendPageBreaks(paragraph, count) {
 */
 function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleResolver = null) {
 	const attrs = expectParagraphAttrs(node);
-	const paragraphStyleContext = paragraphRunStyleContext(node, styleResolver);
+	const paragraphStyleContext = savedParagraphRunStyleContext(node, styleResolver);
 	let content = extractParagraphContent(node, documentCounts, attrs._emptyHyperlinks ?? void 0, textBoxAnchorMarkers, attrs.renderedPageBreakBefore === true, {
 		baseParagraphFormatting: paragraphStyleContext.baseParagraphFormatting,
 		inheritedFormatting: paragraphStyleContext.paragraphFormatting,
@@ -970,6 +1080,14 @@ function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers, styleRes
 	if (attrs.reviewCarrier) paragraph.reviewCarrier = attrs.reviewCarrier;
 	const pFormatting = paragraphAttrsToFormatting(attrs);
 	if (pFormatting) paragraph.formatting = pFormatting;
+	if (attrs.numPr?.kind === "reference") {
+		const inheritedIndentation = paragraphIndentationFromFormatting(attrs._resolvedFormatting);
+		if (inheritedIndentation) assignParagraphIndentationProjection({
+			paragraph,
+			authored: pFormatting,
+			inherited: inheritedIndentation
+		});
+	}
 	const listRendering = listRenderingFromAttrs(attrs);
 	if (listRendering) paragraph.listRendering = listRendering;
 	normalizeFoldedListNumbers(paragraph);
@@ -1373,9 +1491,10 @@ const nestInlineWrapperGroups = (items, groups, hyperlinkIndices, revisionOuterW
 	}
 	return coalesced;
 };
-function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
+function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false, inheritedFormattingOverride) {
+	const paragraph = coalesceNoteReferenceOccurrences(originalParagraph);
 	const content = [];
-	const paragraphStyleContext = paragraph.type.name === "paragraph" ? paragraphRunStyleContext(paragraph) : void 0;
+	const paragraphStyleContext = inheritedFormattingOverride === void 0 && paragraph.type.name === "paragraph" ? savedParagraphRunStyleContext(paragraph) : void 0;
 	const formattingContext = inheritedFormattingOverride ?? {
 		baseParagraphFormatting: paragraphStyleContext?.baseParagraphFormatting,
 		inheritedFormatting: paragraphStyleContext?.paragraphFormatting,
@@ -2463,7 +2582,7 @@ const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
 				visit(child);
 				continue;
 			}
-			if (child.type === "hyperlink" || child.type === "inlineWrapper") visitRunsIn(child.type === "hyperlink" ? child.children : child.content, visit);
+			if (child.type === "hyperlink" || child.type === "inlineWrapper" || child.type === "insertion" || child.type === "deletion" || child.type === "moveFrom" || child.type === "moveTo") visitRunsIn(child.type === "hyperlink" ? child.children : child.content, visit);
 		}
 	};
 	const visitRuns = (visit) => {
@@ -2578,6 +2697,7 @@ function createImageRun(node) {
 		},
 		wrap
 	};
+	if (attrs.pictureNames != null) image.pictureNames = { ...attrs.pictureNames };
 	if (attrs.docPrName != null) image.docPrName = attrs.docPrName;
 	if (attrs.alt != null) image.alt = attrs.alt;
 	if (attrs.title != null) image.title = attrs.title;
@@ -3308,7 +3428,7 @@ function convertPMTextBox(node, styleResolver = null) {
 * Preserves all non-content parts of the original document
 */
 function updateDocumentContent(originalDocument, pmDoc) {
-	return fromProseDoc(pmDoc, originalDocument);
+	return fromProseDoc(pmDoc, originalDocument, { stylesheetSource: { type: "package" } });
 }
 /**
 * Convert a ProseMirror document back to an array of `BlockContent` blocks