@stll/folio-core 0.56.0 → 0.57.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -4,7 +4,7 @@ import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.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,9 +33,11 @@ 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";
@@ -161,6 +163,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;
@@ -263,6 +272,7 @@ const restoreLinkedParagraphPropertySources = (content) => {
 };
 /** Convert a ProseMirror document to the document model. */
 function fromProseDoc(pmDoc, baseDocument, { reuse = "none" } = {}) {
+	assertNoteReferenceOccurrences(pmDoc);
 	switch (reuse) {
 		case "none": break;
 		case "matched": panic("fromProseDoc: reuse \"matched\" is not implemented");
@@ -970,6 +980,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,7 +1391,8 @@ 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 formattingContext = inheritedFormattingOverride ?? {
@@ -2463,7 +2482,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) => {

package/dist/prosemirror/conversion/toProseDoc.js

@@ -2,7 +2,7 @@ import { rangedCommentIds } from "../../docx/commentAnchorIndex.js";
 import { resolveColorValueToHex } from "../../docx/drawingUtils.js";
 import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inlineWrapperContent.js";
 import { computeListRendering, getCachedNumberingMap } from "../../docx/numberingParser.js";
-import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
+import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, paragraphFormattingWithAuthoredIndentation, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
 import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { resolveTableLook } from "../../docx/tableLook.js";
@@ -25,11 +25,11 @@ 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";
 import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/MoveRangeBoundaryExtension.js";
 import { RANGE_ANCHOR_NODE_NAME } from "../extensions/nodes/RangeAnchorExtension.js";
 import "../extensions/nodes/SdtExtension.js";
+import { fieldRequiresStructuredContent } from "../fieldRepresentation.js";
 import { inlineWrapperLayer } from "../inlineWrapperStack.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
@@ -37,13 +37,15 @@ import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { pageBreakRunParagraphProjectionDispositionForFeatures } from "../pageBreakRunProjection.js";
 import { directionFromBidi } from "../paragraphDirection.js";
+import { paragraphIndentationFromFormatting } from "../paragraphIndentation.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
 import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
-import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
+import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, isParagraphMarkSuppressionEligible, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
 import { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveRunFormattingWithoutDefaults } from "../styles/paragraphStyleCascade.js";
+import { listIndentationProvenancePatch } from "../styles/resolvedStyleAttrs.js";
 import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { tableCellStyleRegions, tableRowBand } from "../styles/tableStyleRegions.js";
 import { canCarryTrackedRunMark, trackedRunInlineAtomDisposition } from "../trackedRunInlineAtoms.js";
@@ -57,6 +59,19 @@ import { sdtAttrsFromProperties } from "./sdtAttrs.js";
 import { panic } from "better-result";
 import { DRAWING_RAW_XML_MODES, PARSE_WARNING_CODES, mergeParagraphNumbering } from "@stll/docx-core/model";
 //#region src/prosemirror/conversion/toProseDoc.ts
+/**
+* Document to ProseMirror Conversion
+*
+* Converts our Document type (from DOCX parsing) to a ProseMirror document.
+* Preserves all formatting attributes for round-trip fidelity.
+*
+* Style Resolution:
+* When styles are provided, paragraph properties are resolved from the style chain:
+* - Document defaults (docDefaults)
+* - Normal style (if no explicit styleId)
+* - Style chain (basedOn inheritance)
+* - Inline properties (highest priority)
+*/
 const DETACHED_WATERMARK_HOST = Symbol.for("stll.detachedWatermarkHost");
 const noPageBreakProjectionWarning = () => {};
 const pageBreakProjectionWarn = (warn) => warn === void 0 ? noPageBreakProjectionWarning : (detail) => {
@@ -106,6 +121,11 @@ const createHyperlinkInstanceIndexAllocator = () => {
 	let index = 0;
 	return () => index++;
 };
+/** Imported occurrences belong to the projection walk, not to the referenced note. */
+const createNoteReferenceOccurrenceAllocator = () => {
+	let index = 0;
+	return () => `source-note:${index++}`;
+};
 /**
 * Find bookmark pairs across every editable inline wrapper in a document story.
 * Each endpoint is converted at its own structural position, so a range may
@@ -232,6 +252,7 @@ function toProseDoc(document, options) {
 	const theme = options?.theme ?? document.package.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
 	const nextHyperlinkInstanceIndex = createHyperlinkInstanceIndexAllocator();
+	const nextNoteReferenceOccurrenceId = createNoteReferenceOccurrenceAllocator();
 	const pairedBookmarkIds = collectPairedBookmarkIds(paragraphs);
 	const conversionContext = {
 		listRenderings: /* @__PURE__ */ new Map(),
@@ -239,6 +260,7 @@ function toProseDoc(document, options) {
 		theme,
 		nextTextBoxGroupId,
 		nextHyperlinkInstanceIndex,
+		nextNoteReferenceOccurrenceId,
 		pairedBookmarkIds,
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(paragraphs),
 		storyRangedCommentIds: rangedCommentIds(paragraphs),
@@ -406,12 +428,26 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	let runIdentityId = 0;
 	const runScope = {
 		nextRunIdentityId: () => runIdentityId++,
+		nextNoteReferenceOccurrenceId: context.nextNoteReferenceOccurrenceId,
 		createMark: context.createMark
 	};
+	const directFormatting = paragraphFormattingWithAuthoredIndentation(paragraph);
 	const { attrs, effectiveFrame } = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
+	if (directFormatting === void 0) Reflect.deleteProperty(attrs, "_originalFormatting");
+	else attrs._originalFormatting = directFormatting;
 	const numPr = mergeParagraphNumbering(attrs.numPrFromStyle ?? void 0, attrs.numPr ?? void 0);
 	if (numPr?.kind === "none") Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 	else if (context.numbering !== void 0 && numPr?.kind === "reference") {
+		Object.assign(attrs, listIndentationProvenancePatch({
+			direct: paragraphIndentationFromFormatting(directFormatting),
+			styleFormatting: attrs._styleResolvedFormatting,
+			numberingSource: attrs.numPrFromStyle == null ? "paragraph" : "style",
+			numPr: {
+				numId: numPr.numId,
+				ilvl: numPr.ilvl ?? 0
+			},
+			numbering: context.numbering
+		}));
 		const { rendering, nextSlotOffset } = resolveListRendering(numPr, context);
 		if (rendering !== null) {
 			const cached = paragraph.listRendering;
@@ -476,7 +512,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 			...!hasCharacterStyle ? { implicitCharacterStyleApplied: true } : {},
 			toggleCascade: inheritedToggleCascade
 		};
-		if (!(hasDirectRunFormatting(formatting) || formatting?.styleId !== void 0)) return {
+		if (!isParagraphMarkSuppressionEligible(formatting)) return {
 			formatting: defaultRunFormatting,
 			implicitCharacterStyleApplied: true,
 			toggleCascade: defaultToggleCascade
@@ -643,7 +679,7 @@ function applyCommentMarks(nodes, commentIds) {
 	if (!commentMarkType) return nodes;
 	const commentMarks = [...commentIds].toSorted((left, right) => left - right).map((commentId) => commentMarkType.create({ commentId }));
 	return nodes.map((node) => {
-		if (!node.isText && (!node.isInline || !node.type.allowsMarkType(commentMarkType))) return node;
+		if (!node.isInline) return node;
 		let marks = node.marks;
 		for (const commentMark of commentMarks) marks = commentMark.addToSet(marks);
 		return node.mark(marks);
@@ -1290,6 +1326,7 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 function standaloneTableCellToProseMirror(cell, nodeType) {
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
 	const nextHyperlinkInstanceIndex = createHyperlinkInstanceIndexAllocator();
+	const nextNoteReferenceOccurrenceId = createNoteReferenceOccurrenceAllocator();
 	const pageBreakRunSourceDescendants = buildPageBreakRunSourceDescendantIndex(cell.content);
 	reportSourceContainerPageBreakRun(cell.content, "table-cell", pageBreakRunSourceDescendants, noPageBreakProjectionWarning);
 	return convertTableCell({
@@ -1301,6 +1338,7 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 			numbering: void 0,
 			nextTextBoxGroupId,
 			nextHyperlinkInstanceIndex,
+			nextNoteReferenceOccurrenceId,
 			pairedBookmarkIds: collectPairedBookmarkIds(cell.content),
 			pageBreakRunSourceDescendants,
 			storyRangedCommentIds: rangedCommentIds(cell.content),
@@ -1324,14 +1362,56 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 	let fieldFormatting;
 	let fieldPropertyChanges;
 	const inlineNodes = [];
-	const hasStructuredSourceContent = fieldResultHasPageBreakContent(field) || field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink" || content.type === "preservedInline" || content.type === "inlineWrapper");
+	const hasStructuredSourceContent = fieldResultHasPageBreakContent(field) || field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink" || content.type === "preservedInline" || content.type === "inlineWrapper" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo");
 	const appendRun = (run, into) => {
 		for (const content of run.content) if (content.type === "text") displayText += content.text;
 		fieldFormatting ??= run.formatting;
 		fieldPropertyChanges ??= run.propertyChanges;
-		if (!hasStructuredSourceContent) return;
+		if (field.type !== "simpleField" && !hasStructuredSourceContent) return;
 		into.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), runScope, styleResolver, textBoxAnchors));
 	};
+	const collectDisplay = (items) => {
+		for (const item of items) switch (item.type) {
+			case "run":
+				for (const child of item.content) if (child.type === "text") displayText += child.text;
+				fieldFormatting ??= item.formatting;
+				fieldPropertyChanges ??= item.propertyChanges;
+				break;
+			case "hyperlink":
+				collectDisplay(item.children);
+				break;
+			case "inlineWrapper":
+			case "inlineSdt":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo":
+				collectDisplay(item.content);
+				break;
+			case "simpleField":
+				collectDisplay(item.content);
+				break;
+			case "complexField":
+				collectDisplay(item.fieldResult);
+				break;
+			case "preservedInline":
+				displayText += item.text;
+				break;
+			case "mathEquation":
+				displayText += item.plainText ?? "";
+				break;
+			case "bookmarkStart":
+			case "bookmarkEnd":
+			case "commentRangeStart":
+			case "commentRangeEnd":
+			case "commentReference":
+			case "moveFromRangeStart":
+			case "moveFromRangeEnd":
+			case "moveToRangeStart":
+			case "moveToRangeEnd": break;
+			default: panic(`Unsupported field display content: ${JSON.stringify(item)}`);
+		}
+	};
 	if (field.type === "simpleField") for (const { content, stack } of withInlineWrapperStacks(field.content)) {
 		const itemNodes = [];
 		switch (content.type) {
@@ -1355,6 +1435,16 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 					runScope
 				}));
 				break;
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo":
+				collectDisplay(content.content);
+				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, {
+					current: getInheritedRunFormatting,
+					historical: getInheritedRunFormatting
+				}, styleResolver, content.type === "moveFrom" || content.type === "moveTo" ? content.type : null, textBoxAnchors));
+				break;
 			default: break;
 		}
 		inlineNodes.push(...withInlineWrapperMark(itemNodes, stack));
@@ -1368,11 +1458,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		styleResolver,
 		createMark: runScope.createMark
 	});
-	const hasConvertedHyperlinkContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === "hyperlink"));
-	const hasConvertedPageBreakContent = inlineNodes.some((node) => node.type.name === "pageBreakRun");
-	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);
+	const createStructuredField = fieldRequiresStructuredContent(inlineNodes);
 	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;
@@ -1564,7 +1650,14 @@ function convertRun(run, resolvedStyleFormatting, runScope, styleResolver, textB
 	const identity = runIdentityMark(run, runScope.nextRunIdentityId);
 	if (identity) marks.push(identity);
 	for (const content of run.content) {
-		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors, run.formatting);
+		const contentNodes = convertRunContent({
+			content,
+			marks,
+			formatting: mergedFormatting,
+			textBoxAnchors,
+			authoredFormatting: run.formatting,
+			nextNoteReferenceOccurrenceId: runScope.nextNoteReferenceOccurrenceId
+		});
 		nodes.push(...contentNodes);
 	}
 	return nodes;
@@ -1970,10 +2063,7 @@ const noteReferenceVertAlign = (vertAlign) => {
 * run was authored with.
 */
 const carriedRunFormatting = (formatting) => formatting && Object.keys(formatting).length > 0 ? formatting : void 0;
-/**
-* Convert RunContent to ProseMirror nodes
-*/
-function convertRunContent(content, marks, formatting, textBoxAnchors, authoredFormatting) {
+function convertRunContent({ content, marks, formatting, textBoxAnchors, authoredFormatting, nextNoteReferenceOccurrenceId }) {
 	switch (content.type) {
 		case "noteMarker": return [schema.node("noteMarker", { kind: content.kind }).mark(marks)];
 		case "text":
@@ -2013,6 +2103,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 		case "footnoteRef": {
 			const footnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
+				occurrenceId: nextNoteReferenceOccurrenceId(),
 				noteType: "footnote",
 				vertAlign: noteReferenceVertAlign(formatting?.vertAlign),
 				customMarkFollows: content.customMarkFollows
@@ -2022,6 +2113,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 		case "endnoteRef": {
 			const endnoteMark = schema.mark("footnoteRef", {
 				id: content.id.toString(),
+				occurrenceId: nextNoteReferenceOccurrenceId(),
 				noteType: "endnote",
 				vertAlign: noteReferenceVertAlign(formatting?.vertAlign),
 				customMarkFollows: content.customMarkFollows
@@ -2251,7 +2343,14 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 				const identity = runIdentityMark(child, runScope.nextRunIdentityId);
 				if (identity) runMarks.push(identity);
 				const allMarks = [...runMarks, linkMark];
-				for (const content of child.content) childNodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors, child.formatting));
+				for (const content of child.content) childNodes.push(...convertRunContent({
+					content,
+					marks: allMarks,
+					formatting: mergedFormatting,
+					textBoxAnchors,
+					authoredFormatting: child.formatting,
+					nextNoteReferenceOccurrenceId: runScope.nextNoteReferenceOccurrenceId
+				}));
 				break;
 			}
 			default: break;
@@ -2695,6 +2794,7 @@ function headerFooterToProseDoc(content, options) {
 	const theme = options?.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
 	const nextHyperlinkInstanceIndex = createHyperlinkInstanceIndexAllocator();
+	const nextNoteReferenceOccurrenceId = createNoteReferenceOccurrenceAllocator();
 	const pairedBookmarkIds = collectPairedBookmarkIds(content);
 	const conversionContext = {
 		listRenderings: /* @__PURE__ */ new Map(),
@@ -2702,6 +2802,7 @@ function headerFooterToProseDoc(content, options) {
 		numbering: options?.numbering === void 0 ? void 0 : getCachedNumberingMap(options.numbering),
 		nextTextBoxGroupId,
 		nextHyperlinkInstanceIndex,
+		nextNoteReferenceOccurrenceId,
 		pairedBookmarkIds,
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(content),
 		storyRangedCommentIds: rangedCommentIds(content),

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

@@ -14,12 +14,14 @@ import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { directParagraphIndentation } from "../../paragraphIndentation.js";
+import { recordReplacedParagraphProperties } from "../../paragraphPropertyCarry.js";
 import { directParagraphSpacing, withDirectParagraphSpacing } from "../../paragraphSpacing.js";
 import { getDocumentNumbering } from "../../plugins/documentNumbering.js";
 import { getDocumentBuiltInStyles, getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
+import { SUGGESTION_META, makeRevisionInfo } from "../../plugins/suggestionMode.js";
 import { rebaseParagraphRuns } from "../../rebaseParagraphRuns.js";
 import { mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf } from "../../sectionCarrier.js";
-import { listAttrsFromResolvedStyle, listLevelIndentAttrPatch, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
+import { listAttrsFromResolvedStyle, listIndentationProvenancePatch, paragraphAttrsFromResolvedStyle } from "../../styles/resolvedStyleAttrs.js";
 import { createNodeExtension } from "../create.js";
 import { headingOutlineLevel, paragraphNumberingLevel, paragraphNumberingReferenceId } from "@stll/docx-core/model";
 import { Fragment } from "prosemirror-model";
@@ -263,6 +265,7 @@ const paragraphNodeSpec = {
 		_emptyHyperlinks: { default: null },
 		_originalFormatting: { default: null },
 		_resolvedFormatting: { default: void 0 },
+		_styleResolvedFormatting: { default: void 0 },
 		_autospacingBase: { default: null },
 		_sectionProperties: { default: null },
 		_propertyChanges: { default: null },
@@ -548,6 +551,7 @@ function makeApplyStyle() {
 		const { $from, $to } = state.selection;
 		if (!dispatch) return true;
 		let tr = state.tr;
+		const revision = makeRevisionInfo(state);
 		const seen = /* @__PURE__ */ new Set();
 		state.doc.nodesBetween($from.pos, $to.pos, (node, pos) => {
 			if (node.type.name === "paragraph" && !seen.has(pos)) {
@@ -583,12 +587,24 @@ function makeApplyStyle() {
 						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)));
+					else if (directNumId !== void 0) Object.assign(newAttrs, listIndentationProvenancePatch({
+						direct: restyledIndentation(styleAttrs, restyledOriginal),
+						styleFormatting: resolvedAttrs.paragraphFormatting,
+						numberingSource: "paragraph",
+						numPr: {
+							numId: directNumId,
+							ilvl: paragraphNumberingLevel(current.numPr ?? void 0) ?? 0
+						},
+						numbering: resolvedAttrs.numbering ?? getDocumentNumbering(state)
+					}));
 				}
 				tr = tr.setNodeMarkup(pos, void 0, newAttrs);
+				if (revision) recordReplacedParagraphProperties({
+					tr,
+					position: pos,
+					replaced: node,
+					revision
+				});
 				rebaseParagraphRuns({
 					tr,
 					position: pos,
@@ -598,6 +614,7 @@ function makeApplyStyle() {
 				});
 			}
 		});
+		if (revision) tr.setMeta(SUGGESTION_META, true);
 		dispatch(tr.scrollIntoView());
 		return true;
 	};

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

@@ -1,5 +1,5 @@
 import { mergeTextFormatting } from "../../../utils/textFormattingMerge.js";
-import { expectCharacterStyleMarkAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
+import { expectCharacterStyleMarkAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs } from "../../attrs/index.js";
 import { clearIndentOnBackspace } from "../../commands/clearParagraphIndent.js";
 import { keepSectionBreaksOnSurvivingMarks } from "../../commands/sectionBreak.js";
 import { getDocumentStyleResolver } from "../../plugins/documentStyleState.js";
@@ -23,27 +23,55 @@ function chainCommands(...commands) {
 		return false;
 	};
 }
-/**
-* Custom Enter handler: splits the block, inherits style-related attrs,
-* clears paragraph borders, and preserves run formatting on the new paragraph.
-*
-* splitBlock creates a new paragraph with default attrs (all null),
-* so we must manually copy style-related attrs from the source paragraph.
-* Word does NOT propagate paragraph borders (w:pBdr) on Enter.
-*/
 const INHERITED_PARA_ATTRS = [
-	"defaultTextFormatting",
-	"styleId",
-	"_tableOfContentsLevel",
-	"lineSpacing",
-	"lineSpacingRule",
-	"snapToGrid",
-	"spaceAfter",
-	"spaceBefore",
-	"spacingExplicit",
-	"spacingFromDocDefaults",
-	"spacingFromImplicitDefaultStyle",
-	"contextualSpacing"
+	{
+		attr: "defaultTextFormatting",
+		formattingFields: ["runProperties"]
+	},
+	{
+		attr: "styleId",
+		formattingFields: ["styleId"]
+	},
+	{
+		attr: "_tableOfContentsLevel",
+		formattingFields: []
+	},
+	{
+		attr: "lineSpacing",
+		formattingFields: ["lineSpacing", "spacingPreservedAttributes"]
+	},
+	{
+		attr: "lineSpacingRule",
+		formattingFields: ["lineSpacingRule", "spacingPreservedAttributes"]
+	},
+	{
+		attr: "snapToGrid",
+		formattingFields: ["snapToGrid"]
+	},
+	{
+		attr: "spaceAfter",
+		formattingFields: ["spaceAfter", "spacingPreservedAttributes"]
+	},
+	{
+		attr: "spaceBefore",
+		formattingFields: ["spaceBefore", "spacingPreservedAttributes"]
+	},
+	{
+		attr: "spacingExplicit",
+		formattingFields: ["spacingExplicit"]
+	},
+	{
+		attr: "spacingFromDocDefaults",
+		formattingFields: []
+	},
+	{
+		attr: "spacingFromImplicitDefaultStyle",
+		formattingFields: []
+	},
+	{
+		attr: "contextualSpacing",
+		formattingFields: ["contextualSpacing"]
+	}
 ];
 /** Style formatting needed when the caret has no marks of its own. */
 const STYLE_MARK_NAMES = /* @__PURE__ */ new Set([
@@ -142,10 +170,31 @@ const splitBlockClearBorders = (state, dispatch, view) => {
 			}
 			const newAttrs = { ...newPara.attrs };
 			let attrsChanged = false;
-			if (sourcePara) for (const key of INHERITED_PARA_ATTRS) {
-				const srcVal = sourcePara.attrs[key];
-				if (srcVal !== null && newAttrs[key] === null) {
-					newAttrs[key] = srcVal;
+			if (sourcePara) {
+				const sourceAttrs = expectParagraphAttrs(sourcePara);
+				const addedAttrs = expectParagraphAttrs(newPara);
+				const originalFormatting = { ...addedAttrs._originalFormatting };
+				const resolvedFormatting = { ...addedAttrs._resolvedFormatting };
+				for (const { attr, formattingFields } of INHERITED_PARA_ATTRS) {
+					const srcVal = sourceAttrs[attr];
+					if (srcVal !== null && newAttrs[attr] === null) {
+						newAttrs[attr] = srcVal;
+						attrsChanged = true;
+					}
+					if (newAttrs[attr] !== srcVal) continue;
+					for (const field of formattingFields) {
+						const original = sourceAttrs._originalFormatting?.[field];
+						if (original !== void 0) Reflect.set(originalFormatting, field, original);
+						const resolved = sourceAttrs._resolvedFormatting?.[field];
+						if (resolved !== void 0) Reflect.set(resolvedFormatting, field, resolved);
+					}
+				}
+				if (Object.keys(originalFormatting).length > 0) {
+					newAttrs["_originalFormatting"] = originalFormatting;
+					attrsChanged = true;
+				}
+				if (Object.keys(resolvedFormatting).length > 0) {
+					newAttrs["_resolvedFormatting"] = resolvedFormatting;
 					attrsChanged = true;
 				}
 			}

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

@@ -1,4 +1,5 @@
 import { expectFootnoteRefMarkAttrs } from "../../attrs/index.js";
+import { mintNoteReferenceOccurrenceId, noteReferenceOccurrencePlugin } from "../../noteReferenceOccurrences.js";
 import { suggestRangeDeletion, suggestionModeKey } from "../../plugins/suggestionMode.js";
 import { createMarkExtension } from "../create.js";
 import { expandNoteReferenceDeletionRange, noteReferenceRanges } from "./noteReferenceDeletion.js";
@@ -9,7 +10,9 @@ import { panic } from "better-result";
 *
 * Provides footnoteRef mark + insert/delete commands for footnotes and endnotes.
 */
+const NOTE_REFERENCE_PARSE_PRIORITY = 60;
 const noteRefAttrsFromDom = (dom, noteType, vertAlign) => ({
+	occurrenceId: dom.dataset["noteOccurrence"] ?? mintNoteReferenceOccurrenceId(),
 	id: dom.dataset["id"] ?? "",
 	noteType: dom.dataset["noteType"] ?? noteType,
 	...vertAlign ? { vertAlign } : {}
@@ -21,6 +24,7 @@ const FootnoteRefExtension = createMarkExtension({
 		inclusive: false,
 		attrs: {
 			id: {},
+			occurrenceId: {},
 			noteType: { default: "footnote" },
 			vertAlign: { default: null },
 			customMarkFollows: { default: null }
@@ -28,18 +32,22 @@ const FootnoteRefExtension = createMarkExtension({
 		parseDOM: [
 			{
 				tag: "sup.docx-footnote-ref",
+				priority: NOTE_REFERENCE_PARSE_PRIORITY,
 				getAttrs: (dom) => noteRefAttrsFromDom(dom, "footnote", "superscript")
 			},
 			{
 				tag: "sup.docx-endnote-ref",
+				priority: NOTE_REFERENCE_PARSE_PRIORITY,
 				getAttrs: (dom) => noteRefAttrsFromDom(dom, "endnote", "superscript")
 			},
 			{
 				tag: "span.docx-footnote-ref",
+				priority: NOTE_REFERENCE_PARSE_PRIORITY,
 				getAttrs: (dom) => noteRefAttrsFromDom(dom, "footnote", "baseline")
 			},
 			{
 				tag: "span.docx-endnote-ref",
+				priority: NOTE_REFERENCE_PARSE_PRIORITY,
 				getAttrs: (dom) => noteRefAttrsFromDom(dom, "endnote", "baseline")
 			}
 		],
@@ -53,6 +61,7 @@ const FootnoteRefExtension = createMarkExtension({
 				{
 					class: `docx-${noteType}-ref ${isSuperscript ? "docx-note-ref-superscript" : "docx-note-ref-baseline"}`,
 					"data-id": id,
+					"data-note-occurrence": attrs.occurrenceId,
 					"data-note-type": noteType
 				},
 				0
@@ -76,6 +85,7 @@ const FootnoteRefExtension = createMarkExtension({
 				if (!footnoteRefType) panic("Missing mark type: footnoteRef");
 				const mark = footnoteRefType.create({
 					id: String(id),
+					occurrenceId: mintNoteReferenceOccurrenceId(),
 					noteType,
 					vertAlign: "superscript"
 				});
@@ -100,6 +110,7 @@ const FootnoteRefExtension = createMarkExtension({
 			return true;
 		};
 		return {
+			plugins: [noteReferenceOccurrencePlugin()],
 			keyboardShortcuts: {
 				Backspace: deleteWholeNoteReference("backward"),
 				Delete: deleteWholeNoteReference("forward")