@stll/folio-core 0.55.0 → 0.57.0

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,18 +37,21 @@ 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";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { HYPHEN_TEXT_CARRIERS } from "./hyphenTextCarriers.js";
 import { listRenderingDefinitionsMatch } from "./listRenderingDefinition.js";
 import { createMarkInterner } from "./markInterner.js";
 import { hasSinkChildren } from "./preservedSinkCarriers.js";
@@ -56,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) => {
@@ -105,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
@@ -231,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(),
@@ -238,6 +260,7 @@ function toProseDoc(document, options) {
 		theme,
 		nextTextBoxGroupId,
 		nextHyperlinkInstanceIndex,
+		nextNoteReferenceOccurrenceId,
 		pairedBookmarkIds,
 		pageBreakRunSourceDescendants: buildPageBreakRunSourceDescendantIndex(paragraphs),
 		storyRangedCommentIds: rangedCommentIds(paragraphs),
@@ -405,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;
@@ -475,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
@@ -642,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);
@@ -786,7 +823,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 	if (tableOfContentsLevel !== void 0) attrs._tableOfContentsLevel = tableOfContentsLevel;
 	if (formatting?.numPr) attrs.numPr = paragraphNumberingAttr(formatting.numPr);
 	if (formatting?.numPrFromStyle) attrs.numPrFromStyle = paragraphNumberingAttr(formatting.numPrFromStyle);
-	if (paragraph.listRendering && formatting?.numPr?.kind !== "none") Object.assign(attrs, listRenderingAttrPatch(paragraph.listRendering));
+	if (paragraph.listRendering && formatting?.numPr?.kind !== "none") Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS, listRenderingAttrPatch(paragraph.listRendering));
 	if (formatting) attrs._originalFormatting = formatting;
 	if (paragraph.propertyChanges && paragraph.propertyChanges.length > 0) attrs._propertyChanges = paragraph.propertyChanges.map(({ previousFormatting, ...change }) => {
 		if (previousFormatting === void 0) return change;
@@ -1289,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({
@@ -1300,6 +1338,7 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 			numbering: void 0,
 			nextTextBoxGroupId,
 			nextHyperlinkInstanceIndex,
+			nextNoteReferenceOccurrenceId,
 			pairedBookmarkIds: collectPairedBookmarkIds(cell.content),
 			pageBreakRunSourceDescendants,
 			storyRangedCommentIds: rangedCommentIds(cell.content),
@@ -1323,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) {
@@ -1354,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));
@@ -1367,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;
@@ -1563,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;
@@ -1969,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":
@@ -2012,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
@@ -2021,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
@@ -2034,8 +2127,8 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 			text: content.text,
 			level: PRESERVED_XML_LEVELS.run
 		}).mark(marks)];
-		case "noBreakHyphen": return [schema.text("‑", marks)];
-		case "softHyphen": return [schema.text("­", marks)];
+		case "noBreakHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.noBreakHyphen, marks)];
+		case "softHyphen": return [schema.text(HYPHEN_TEXT_CARRIERS.softHyphen, marks)];
 		case "symbol": return [schema.node("symbol", {
 			font: content.font,
 			char: content.char
@@ -2250,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;
@@ -2694,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(),
@@ -2701,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),
@@ -2765,4 +2867,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };
+export { collectPairedBookmarkIds, createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, toProseDoc };

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

@@ -8,18 +8,20 @@ import { collectHeadings } from "../../../utils/headingCollector.js";
 import { tableOfContentsStyleLevel } from "../../../utils/tableOfContentsStyle.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { autospacingMatchesBase } from "../../autospacingBase.js";
-import { withCanonicalParagraphFormatting } from "../../canonicalCommands.js";
+import { withCanonicalCommand, withCanonicalParagraphFormatting, withCanonicalStartParagraphFormatting } from "../../canonicalCommands.js";
 import { removeSectionBreakAtSelection, setSectionBreakType } from "../../commands/sectionBreak.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../../listMarker.js";
 import { directParagraphAlignment } from "../../paragraphAlignment.js";
 import { directionIsRtl } from "../../paragraphDirection.js";
 import { 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;
 	};
@@ -696,7 +713,7 @@ const ParagraphExtension = createNodeExtension({
 			}, { styleId: null }),
 			insertSectionBreak: (breakType) => setSectionBreakType(breakType),
 			removeSectionBreak: () => removeSectionBreakAtSelection,
-			generateTOC: ({ title }) => (state, dispatch) => {
+			generateTOC: ({ title }) => withCanonicalCommand((state, dispatch) => {
 				const builtInStyles = getDocumentBuiltInStyles(state);
 				const headings = collectHeadings(state.doc, builtInStyles);
 				if (headings.length === 0) return false;
@@ -773,44 +790,53 @@ const ParagraphExtension = createNodeExtension({
 				tr.insert(insertPos, Fragment.from(tocNodes));
 				dispatch(tr.scrollIntoView());
 				return true;
-			},
-			toggleBidi: () => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("direction", directionIsRtl(paragraph.attrs["direction"]) ? {
-					source: "manual",
-					value: "ltr"
-				} : {
+			}, (state) => [{
+				type: "generateTOC",
+				at: state.selection.from,
+				title
+			}]),
+			toggleBidi: () => {
+				const directionFor = (paragraph) => ({
 					source: "manual",
-					value: "rtl"
-				})(state, dispatch);
+					value: directionIsRtl(expectParagraphAttrs(paragraph).direction) ? "ltr" : "rtl"
+				});
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("direction", directionFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ bidi: directionIsRtl(directionFor(paragraph)) }));
 			},
-			setRtl: () => setParagraphAttr("direction", {
+			setRtl: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "rtl"
-			}),
-			setLtr: () => setParagraphAttr("direction", {
+			}), { bidi: true }),
+			setLtr: () => withCanonicalParagraphFormatting(setParagraphAttr("direction", {
 				source: "manual",
 				value: "ltr"
-			}),
-			setTabs: (tabs) => setParagraphAttr("tabs", tabs.length > 0 ? tabs : null),
-			addTabStop: (position, alignment = "left", leader = "none") => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				return setParagraphAttr("tabs", [...(paragraph.attrs["tabs"] || []).filter((t) => t.position !== position), {
+			}), { bidi: false }),
+			setTabs: (tabs) => withCanonicalParagraphFormatting(setParagraphAttr("tabs", tabs.length > 0 ? tabs : null), { tabs: tabs.length > 0 ? tabs : null }),
+			addTabStop: (position, alignment = "left", leader = "none") => {
+				const tabsFor = (paragraph) => [...(expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position), {
 					position,
 					alignment,
 					leader
-				}].toSorted((a, b) => a.position - b.position))(state, dispatch);
+				}].toSorted((a, b) => a.position - b.position);
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			},
-			removeTabStop: (position) => (state, dispatch) => {
-				const { $from } = state.selection;
-				const paragraph = $from.parent;
-				if (paragraph.type.name !== "paragraph") return false;
-				const newTabs = (paragraph.attrs["tabs"] || []).filter((t) => t.position !== position);
-				return setParagraphAttr("tabs", newTabs.length > 0 ? newTabs : null)(state, dispatch);
+			removeTabStop: (position) => {
+				const tabsFor = (paragraph) => {
+					const tabs = (expectParagraphAttrs(paragraph).tabs ?? []).filter((tab) => tab.position !== position);
+					return tabs.length > 0 ? tabs : null;
+				};
+				return withCanonicalStartParagraphFormatting((state, dispatch) => {
+					const paragraph = state.selection.$from.parent;
+					if (paragraph.type.name !== "paragraph") return false;
+					return setParagraphAttr("tabs", tabsFor(paragraph))(state, dispatch);
+				}, (paragraph) => ({ tabs: tabsFor(paragraph) }));
 			}
 		} };
 	}

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