@stll/folio-core 0.28.0 → 0.29.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -6,8 +6,10 @@ import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels } from "../../utils/units.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
+import { stampNumberedRefFieldBaselines } from "../numberedRefFields.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { schema } from "../schema/index.js";
+import { cascadeStyleTextFormatting } from "../styles/styleToggleCascade.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
 import { marksToTextFormatting } from "./fromProseDoc.js";
@@ -35,6 +37,56 @@ const createHyperlinkInstanceIndexAllocator = () => {
 	return () => 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
+* start outside a hyperlink and end inside it (or the inverse).
+*/
+const collectPairedBookmarkIds = (blocks) => {
+	const counts = /* @__PURE__ */ new Map();
+	let position = 0;
+	const countBoundary = (id, type) => {
+		const count = counts.get(id) ?? {
+			starts: 0,
+			ends: 0
+		};
+		if (type === "start") {
+			count.starts += 1;
+			count.firstStart ??= position;
+		} else {
+			count.ends += 1;
+			count.firstEnd ??= position;
+		}
+		position += 1;
+		counts.set(id, count);
+	};
+	const visitRun = (run) => {
+		for (const content of run.content) if (content.type === "shape" && content.shape.textBody) visitBlocks(content.shape.textBody.content);
+	};
+	const visitHyperlink = (hyperlink) => {
+		for (const child of hyperlink.children) if (child.type === "bookmarkStart") countBoundary(child.id, "start");
+		else if (child.type === "bookmarkEnd") countBoundary(child.id, "end");
+		else visitRun(child);
+	};
+	const visitParagraphContent = (content) => {
+		if (content.type === "bookmarkStart") countBoundary(content.id, "start");
+		else if (content.type === "bookmarkEnd") countBoundary(content.id, "end");
+		else if (content.type === "run") visitRun(content);
+		else if (content.type === "hyperlink") visitHyperlink(content);
+		else if (content.type === "simpleField") for (const child of content.content) if (child.type === "hyperlink") visitHyperlink(child);
+		else visitRun(child);
+		else if (content.type === "complexField") for (const run of [...content.fieldCode ?? [], ...content.fieldResult]) visitRun(run);
+		else if (content.type === "inlineSdt") for (const child of content.content) visitParagraphContent(child);
+		else if (content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") for (const child of content.content) visitParagraphContent(child);
+	};
+	const visitBlocks = (nestedBlocks) => {
+		for (const block of nestedBlocks) if (block.type === "paragraph") for (const content of block.content) visitParagraphContent(content);
+		else if (block.type === "table") for (const row of block.rows) for (const cell of row.cells) visitBlocks(cell.content);
+		else visitBlocks(block.content);
+	};
+	visitBlocks(blocks);
+	return new Set([...counts].flatMap(([id, count]) => count.starts === 1 && count.ends === 1 && count.firstStart !== void 0 && count.firstEnd !== void 0 && count.firstStart < count.firstEnd ? [id] : []));
+};
+/**
 * Convert a Document to a ProseMirror document
 *
 * @param document - The Document to convert
@@ -49,7 +101,8 @@ function toProseDoc(document, options) {
 	const conversionContext = {
 		theme,
 		nextTextBoxGroupId,
-		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
+		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator(),
+		pairedBookmarkIds: collectPairedBookmarkIds(paragraphs)
 	};
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
@@ -84,7 +137,7 @@ function toProseDoc(document, options) {
 	};
 	nodes.push(...convertBodyBlocks(paragraphs));
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
-	const pmDoc = schema.node("doc", null, nodes);
+	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, nodes));
 	assertValidProseMirrorDocument(pmDoc, "Document conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }
@@ -125,7 +178,7 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 * Resolves style-based text formatting and passes it to runs so that
 * paragraph styles (like Heading1) apply their font size, color, etc.
 */
-function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
+function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex, pairedBookmarkIds, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const attrs = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
 	const isTocParagraph = attrs._tableOfContentsLevel !== void 0;
 	const inlineNodes = [];
@@ -144,62 +197,120 @@ function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex,
 		emitInlineNodes([node]);
 	};
 	let styleRunFormatting;
+	let paragraphStyleRunFormatting;
 	let paragraphStyleFontFamily;
 	if (styleResolver) {
 		styleRunFormatting = styleResolver.resolveParagraphStyle(paragraph.formatting?.styleId).runFormatting;
+		const paragraphStyle = paragraph.formatting?.styleId ? styleResolver.getStyle(paragraph.formatting.styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
+		paragraphStyleRunFormatting = paragraphStyle?.type === "paragraph" ? paragraphStyle.rPr : void 0;
 		paragraphStyleFontFamily = resolveParagraphStyleFontFamily(paragraph.formatting?.styleId, styleResolver);
 	}
 	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
-	let baseRunFormatting = mergeTextFormatting(styleRunFormatting, extraRunFormatting);
+	const orderedToggleFormatting = cascadeStyleTextFormatting([
+		{
+			formatting: styleResolver?.getDocDefaults()?.rPr,
+			type: "defaults"
+		},
+		{
+			formatting: extraRunFormatting,
+			type: "style"
+		},
+		{
+			formatting: paragraphStyleRunFormatting,
+			type: "style"
+		}
+	], { ordinaryFormatting: mergeTextFormatting(styleRunFormatting, extraRunFormatting) });
+	let baseRunFormatting = orderedToggleFormatting.formatting;
 	if (paragraphStyleFontFamily) baseRunFormatting = mergeTextFormatting(baseRunFormatting, { fontFamily: paragraphStyleFontFamily });
 	const paragraphMarkPrecedesStyle = paragraph.formatting?.styleId !== void 0;
-	const defaultRunFormatting = paragraphMarkPrecedesStyle ? mergeTextFormatting(inheritableParagraphRunFormatting, baseRunFormatting) : mergeTextFormatting(baseRunFormatting, inheritableParagraphRunFormatting);
+	const ordinaryDefaultRunFormatting = paragraphMarkPrecedesStyle ? mergeTextFormatting(inheritableParagraphRunFormatting, baseRunFormatting) : mergeTextFormatting(baseRunFormatting, inheritableParagraphRunFormatting);
+	const defaultToggleCascade = paragraphMarkPrecedesStyle ? cascadeStyleTextFormatting([{
+		cascade: orderedToggleFormatting,
+		type: "carried"
+	}], { ordinaryFormatting: ordinaryDefaultRunFormatting }) : cascadeStyleTextFormatting([{
+		cascade: orderedToggleFormatting,
+		type: "carried"
+	}, {
+		formatting: inheritableParagraphRunFormatting,
+		type: "direct"
+	}], { ordinaryFormatting: ordinaryDefaultRunFormatting });
+	const defaultRunFormatting = defaultToggleCascade.formatting;
 	const getInheritedRunFormatting = (formatting, fieldType) => {
-		if (fieldType === "TOC") return hasDirectRunFormatting(formatting) ? suppressParagraphMarkFormatting(baseRunFormatting, void 0, formatting) : baseRunFormatting;
-		if (!(hasDirectRunFormatting(formatting) || formatting?.styleId !== void 0)) return defaultRunFormatting;
-		return suppressParagraphMarkFormatting(baseRunFormatting, inheritableParagraphRunFormatting, formatting, paragraphMarkPrecedesStyle);
+		if (fieldType === "TOC") return {
+			formatting: hasDirectRunFormatting(formatting) ? suppressParagraphMarkFormatting(baseRunFormatting, void 0, formatting) : baseRunFormatting,
+			toggleCascade: orderedToggleFormatting
+		};
+		if (!(hasDirectRunFormatting(formatting) || formatting?.styleId !== void 0)) return {
+			formatting: defaultRunFormatting,
+			toggleCascade: defaultToggleCascade
+		};
+		const suppressedFormatting = suppressParagraphMarkFormatting(baseRunFormatting, inheritableParagraphRunFormatting, formatting, paragraphMarkPrecedesStyle);
+		const paragraphMarkOverrides = getParagraphMarkSuppressionOverrides({
+			directFormatting: formatting,
+			paragraphMarkFormatting: inheritableParagraphRunFormatting,
+			suppressedFormatting
+		});
+		return {
+			formatting: suppressedFormatting,
+			...paragraphMarkOverrides ? { paragraphMarkOverrides } : {},
+			toggleCascade: orderedToggleFormatting
+		};
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
 		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, moveKind, textBoxAnchors));
 	};
-	for (const content of paragraph.content) {
-		if (content.type === "commentRangeStart") commentIds.add(content.id);
-		else if (content.type === "commentRangeEnd") commentIds.delete(content.id);
-		else if (content.type === "commentReference") anchorPointComment(inlineNodes, content.id);
-		else if (content.type === "run") emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors));
-		else if (content.type === "hyperlink") {
-			const linkNodes = convertHyperlink(content, {
-				getInheritedRunFormatting,
-				styleResolver,
-				hyperlinkIndex: nextHyperlinkInstanceIndex(),
-				textBoxAnchors
-			});
-			if (linkNodes.length === 0) {
-				emptyHyperlinks ??= [];
-				emptyHyperlinks.push({
-					offset: inlineOffset,
-					...content.href !== void 0 ? { href: content.href } : {},
-					...content.anchor !== void 0 ? { anchor: content.anchor } : {},
-					...content.tooltip !== void 0 ? { tooltip: content.tooltip } : {},
-					...content.rId !== void 0 ? { rId: content.rId } : {}
-				});
-				continue;
-			}
-			emitInlineNodes(linkNodes);
-		} else if (content.type === "simpleField" || content.type === "complexField") emitInlineNode(convertField(content, getInheritedRunFormatting, styleResolver));
-		else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors));
-		else if (content.type === "insertion" || content.type === "moveTo") emitTrackedChange(content, "insertion", content.type === "moveTo" ? "moveTo" : null);
-		else if (content.type === "deletion" || content.type === "moveFrom") emitTrackedChange(content, "deletion", content.type === "moveFrom" ? "moveFrom" : null);
-		else if (content.type === "mathEquation") emitInlineNode(convertMathEquation(content));
-		if (content.type === "bookmarkStart") {
-			if (!bookmarksArr) bookmarksArr = [];
-			bookmarksArr.push({
-				id: content.id,
-				name: content.name
+	for (const content of paragraph.content) if (content.type === "commentRangeStart") commentIds.add(content.id);
+	else if (content.type === "commentRangeEnd") commentIds.delete(content.id);
+	else if (content.type === "commentReference") anchorPointComment(inlineNodes, content.id);
+	else if (content.type === "run") emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors));
+	else if (content.type === "hyperlink") {
+		const linkNodes = convertHyperlink(content, {
+			getInheritedRunFormatting,
+			styleResolver,
+			hyperlinkIndex: nextHyperlinkInstanceIndex(),
+			textBoxAnchors
+		});
+		if (linkNodes.length === 0) {
+			emptyHyperlinks ??= [];
+			emptyHyperlinks.push({
+				offset: inlineOffset,
+				...content.href !== void 0 ? { href: content.href } : {},
+				...content.anchor !== void 0 ? { anchor: content.anchor } : {},
+				...content.tooltip !== void 0 ? { tooltip: content.tooltip } : {},
+				...content.rId !== void 0 ? { rId: content.rId } : {}
 			});
+			continue;
 		}
+		emitInlineNodes(linkNodes);
+	} else if (content.type === "simpleField" || content.type === "complexField") emitInlineNode(convertField(content, {
+		getInheritedRunFormatting,
+		styleResolver,
+		nextHyperlinkInstanceIndex,
+		textBoxAnchors
+	}));
+	else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors));
+	else if (content.type === "insertion" || content.type === "moveTo") emitTrackedChange(content, "insertion", content.type === "moveTo" ? "moveTo" : null);
+	else if (content.type === "deletion" || content.type === "moveFrom") emitTrackedChange(content, "deletion", content.type === "moveFrom" ? "moveFrom" : null);
+	else if (content.type === "mathEquation") emitInlineNode(convertMathEquation(content));
+	else if (content.type === "bookmarkStart" && pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
+		type: "start",
+		id: content.id,
+		name: content.name,
+		colFirst: content.colFirst,
+		colLast: content.colLast
+	}));
+	else if (content.type === "bookmarkEnd" && pairedBookmarkIds.has(content.id)) emitInlineNode(schema.node("bookmarkBoundary", {
+		type: "end",
+		id: content.id
+	}));
+	else if (content.type === "bookmarkStart") {
+		if (!bookmarksArr) bookmarksArr = [];
+		bookmarksArr.push({
+			id: content.id,
+			name: content.name
+		});
 	}
 	if (bookmarksArr) attrs.bookmarks = bookmarksArr;
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
@@ -268,7 +379,7 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getI
 	});
 }
 function canCarryTrackedRunMark(node, markType) {
-	return node.isText || node.isInline && node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "symbol" || node.type.name === "textBoxAnchor");
+	return node.isText || node.isInline && node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "symbol" || node.type.name === "bookmarkBoundary" || node.type.name === "textBoxAnchor");
 }
 /**
 * Convert ParagraphFormatting to ProseMirror paragraph attrs
@@ -499,27 +610,37 @@ function stripParagraphMarkFormattingForBodyRuns(formatting) {
 	const { fontFamily: _fontFamily, ...bodyRunFormatting } = paragraphMarkFormatting;
 	return Object.keys(bodyRunFormatting).length > 0 ? bodyRunFormatting : void 0;
 }
+const PARAGRAPH_MARK_BOOLEAN_KEYS = [
+	"bold",
+	"italic",
+	"strike",
+	"doubleStrike",
+	"allCaps",
+	"smallCaps",
+	"hidden",
+	"emboss",
+	"imprint",
+	"shadow",
+	"outline",
+	"rtl"
+];
 function suppressParagraphMarkFormatting(base, paragraphMark, direct, paragraphMarkPrecedesStyle = false) {
 	if (!paragraphMark) return base;
 	const result = (paragraphMarkPrecedesStyle ? mergeTextFormatting(paragraphMark, base) : mergeTextFormatting(base, paragraphMark)) ?? {};
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "bold");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "italic");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "strike");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "doubleStrike");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "allCaps");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "smallCaps");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "hidden");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "emboss");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "imprint");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "shadow");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "outline");
-	suppressBooleanParagraphMark(result, base, paragraphMark, direct, "rtl");
+	for (const key of PARAGRAPH_MARK_BOOLEAN_KEYS) suppressBooleanParagraphMark(result, base, paragraphMark, direct, key);
 	if (paragraphMark.fontSize !== void 0 && direct?.fontSize === void 0 && base?.fontSize !== void 0) result.fontSize = base.fontSize;
 	if (paragraphMark.fontSizeCs !== void 0 && direct?.fontSizeCs === void 0 && base?.fontSizeCs !== void 0) result.fontSizeCs = base.fontSizeCs;
 	if (paragraphMark.underline !== void 0 && direct?.underline === void 0) result.underline = { style: "none" };
 	if (paragraphMark.spacing !== void 0 && direct?.spacing === void 0) result.spacing = 0;
 	return Object.keys(result).length > 0 ? result : void 0;
 }
+function getParagraphMarkSuppressionOverrides({ directFormatting, paragraphMarkFormatting, suppressedFormatting }) {
+	if (!paragraphMarkFormatting) return;
+	const overrides = {};
+	for (const key of PARAGRAPH_MARK_BOOLEAN_KEYS) if (paragraphMarkFormatting[key] !== void 0 && directFormatting?.[key] === void 0 && suppressedFormatting?.[key] === false) overrides[key] = false;
+	if (paragraphMarkFormatting.underline !== void 0 && directFormatting?.underline === void 0 && suppressedFormatting?.underline?.style === "none") overrides.underline = { style: "none" };
+	return Object.keys(overrides).length > 0 ? overrides : void 0;
+}
 function suppressBooleanParagraphMark(result, base, paragraphMark, direct, key) {
 	if (paragraphMark[key] === void 0 || direct?.[key] !== void 0) return;
 	result[key] = base?.[key] ?? false;
@@ -536,15 +657,45 @@ function resolveTextFormatting(formatting, styleResolver) {
 */
 function resolveRunFormattingWithoutDefaults(formatting, styleResolver) {
 	if (!formatting || !styleResolver) return formatting;
-	return mergeTextFormatting(formatting.styleId ? styleResolver.getRunStyleOwnProperties(formatting.styleId) : void 0, formatting);
+	return cascadeStyleTextFormatting([{
+		formatting: formatting.styleId ? styleResolver.getRunStyleOwnProperties(formatting.styleId) : void 0,
+		type: "style"
+	}, {
+		formatting,
+		type: "direct"
+	}]).formatting;
 }
 function resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, options = {}) {
 	const style = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
 	const paragraphStyleRpr = style?.type === "paragraph" ? style.rPr : void 0;
 	const rawParagraphMarkRpr = options.includeParagraphMarkRunProperties === false ? void 0 : formatting?.runProperties;
 	const paragraphRunProperties = rawParagraphMarkRpr ? stripParagraphMarkOnlyFormatting(resolveRunFormattingWithoutDefaults(rawParagraphMarkRpr, styleResolver) ?? {}) : void 0;
-	const bodyRunDefaults = mergeTextFormatting(mergeTextFormatting(styleResolver.getDocDefaults()?.rPr, styleResolver.getDefaultCharacterStyle()?.rPr), paragraphStyleRpr);
-	return styleId === void 0 ? mergeTextFormatting(bodyRunDefaults, paragraphRunProperties) : mergeTextFormatting(paragraphRunProperties, bodyRunDefaults);
+	const orderedBodyToggleFormatting = cascadeStyleTextFormatting([
+		{
+			formatting: styleResolver.getDocDefaults()?.rPr,
+			type: "defaults"
+		},
+		{
+			formatting: paragraphStyleRpr,
+			type: "style"
+		},
+		{
+			formatting: styleResolver.getDefaultCharacterStyle()?.rPr,
+			type: "style"
+		}
+	], { ordinaryFormatting: mergeTextFormatting(mergeTextFormatting(styleResolver.getDocDefaults()?.rPr, styleResolver.getDefaultCharacterStyle()?.rPr), paragraphStyleRpr) });
+	const bodyRunDefaults = orderedBodyToggleFormatting.formatting;
+	if (styleId !== void 0) return cascadeStyleTextFormatting([{
+		cascade: orderedBodyToggleFormatting,
+		type: "carried"
+	}], { ordinaryFormatting: mergeTextFormatting(paragraphRunProperties, bodyRunDefaults) }).formatting;
+	return cascadeStyleTextFormatting([{
+		cascade: orderedBodyToggleFormatting,
+		type: "carried"
+	}, {
+		formatting: paragraphRunProperties,
+		type: "direct"
+	}], { ordinaryFormatting: mergeTextFormatting(bodyRunDefaults, paragraphRunProperties) }).formatting;
 }
 function calculateRowSpans(table) {
 	const result = /* @__PURE__ */ new Map();
@@ -926,7 +1077,8 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		context: {
 			theme: null,
 			nextTextBoxGroupId: createTextBoxGroupIdFactory(),
-			nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
+			nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator(),
+			pairedBookmarkIds: collectPairedBookmarkIds(cell.content)
 		},
 		isHeader: nodeType === "tableHeader",
 		gridWidthPercent: void 0,
@@ -939,31 +1091,47 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		defaultCellMargins: void 0
 	});
 }
-/**
-* Convert a SimpleField or ComplexField to a ProseMirror field node.
-* Preserves run formatting (bold, fontSize, color, etc.) as PM marks.
-* Accepts a run formatting resolver so fields inherit paragraph-level
-* formatting the same way regular text runs do.
-*/
-function convertField(field, getInheritedRunFormatting, styleResolver) {
+function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, textBoxAnchors }) {
 	let displayText = "";
 	let fieldFormatting;
-	const runs = field.type === "simpleField" ? field.content : field.fieldResult;
-	for (const r of runs) if (r.type === "run") {
-		for (const c of r.content) if (c.type === "text") displayText += c.text;
-		if (!fieldFormatting && r.formatting) fieldFormatting = r.formatting;
+	const inlineNodes = [];
+	const hasStructuredSourceContent = field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink");
+	const appendRun = (run) => {
+		for (const content of run.content) if (content.type === "text") displayText += content.text;
+		fieldFormatting ??= run.formatting;
+		if (!hasStructuredSourceContent) return;
+		inlineNodes.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), styleResolver, textBoxAnchors));
+	};
+	if (field.type === "simpleField") for (const content of field.content) {
+		if (content.type === "run") {
+			appendRun(content);
+			continue;
+		}
+		for (const child of content.children) if (child.type === "run") {
+			for (const runContent of child.content) if (runContent.type === "text") displayText += runContent.text;
+			fieldFormatting ??= child.formatting;
+		}
+		inlineNodes.push(...convertHyperlink(content, {
+			getInheritedRunFormatting: (formatting) => getInheritedRunFormatting(formatting, field.fieldType),
+			styleResolver,
+			hyperlinkIndex: nextHyperlinkInstanceIndex(),
+			textBoxAnchors
+		}));
 	}
+	else for (const run of field.fieldResult) appendRun(run);
 	if (!fieldFormatting && field.type === "complexField" && field.fieldResult.length === 0) fieldFormatting = field.formatting;
 	const inheritedFormatting = getInheritedRunFormatting(fieldFormatting, field.fieldType);
 	const { marks } = buildRunMarks(fieldFormatting, inheritedFormatting, styleResolver);
-	return schema.node("field", {
+	const hasConvertedHyperlinkContent = inlineNodes.some((node) => node.marks.some((mark) => mark.type.name === "hyperlink"));
+	const createStructuredField = hasStructuredSourceContent && hasConvertedHyperlinkContent;
+	return schema.node(createStructuredField ? "structuredField" : "field", {
 		fieldType: field.fieldType,
 		instruction: field.instruction,
 		displayText,
 		fieldKind: field.type === "simpleField" ? "simple" : "complex",
 		fldLock: field.fldLock ?? false,
 		dirty: field.dirty ?? false
-	}, void 0, marks);
+	}, createStructuredField ? inlineNodes : void 0, marks);
 }
 /**
 * Convert a MathEquation to a ProseMirror math node.
@@ -993,7 +1161,12 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, getInheritedRunFormat
 		});
 		inlineNodes.push(...linkNodes);
 	} else if (content.type === "simpleField" || content.type === "complexField") {
-		const fieldNode = convertField(content, getInheritedRunFormatting, styleResolver);
+		const fieldNode = convertField(content, {
+			getInheritedRunFormatting,
+			styleResolver,
+			nextHyperlinkInstanceIndex,
+			textBoxAnchors
+		});
 		if (fieldNode) inlineNodes.push(fieldNode);
 	} else if (content.type === "inlineSdt") {
 		const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors);
@@ -1012,11 +1185,11 @@ function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, getInheritedRunFormat
 * Convert a Run to ProseMirror text nodes with marks
 *
 * @param run - The run to convert
-* @param styleFormatting - Text formatting from the paragraph's style (e.g., Heading1's font size/color)
+* @param resolvedStyleFormatting - Paragraph formatting and its explicit style-toggle state
 */
-function convertRun(run, styleFormatting, styleResolver, textBoxAnchors) {
+function convertRun(run, resolvedStyleFormatting, styleResolver, textBoxAnchors) {
 	const nodes = [];
-	const { marks, mergedFormatting } = buildRunMarks(run.formatting, styleFormatting, styleResolver);
+	const { marks, mergedFormatting } = buildRunMarks(run.formatting, resolvedStyleFormatting, styleResolver);
 	if (run.propertyChanges && run.propertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...run.propertyChanges] }));
 	for (const content of run.content) {
 		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors);
@@ -1024,13 +1197,34 @@ function convertRun(run, styleFormatting, styleResolver, textBoxAnchors) {
 	}
 	return nodes;
 }
-function buildRunMarks(runFormatting, inheritedFormatting, styleResolver) {
+function buildRunMarks(runFormatting, inherited, styleResolver) {
 	const styleId = runFormatting?.styleId;
-	const runStyleFormatting = styleId ? styleResolver?.getRunStyleOwnProperties(styleId) : void 0;
-	const mergedFormatting = mergeTextFormatting(mergeTextFormatting(inheritedFormatting, runStyleFormatting), runFormatting);
-	const marks = textFormattingToMarks(mergedFormatting);
+	const characterStyleFormatting = styleId ? styleResolver?.getRunStyleOwnProperties(styleId) : styleResolver?.getDefaultCharacterStyle()?.rPr;
+	let ordinaryRunStyleFormatting = inherited.formatting ? { ...inherited.formatting } : {};
+	if (styleId) ordinaryRunStyleFormatting = mergeTextFormatting(inherited.formatting, characterStyleFormatting) ?? {};
+	const cascadedStyleFormatting = cascadeStyleTextFormatting([{
+		cascade: inherited.toggleCascade,
+		type: "carried"
+	}, {
+		formatting: characterStyleFormatting,
+		type: "style"
+	}], { ordinaryFormatting: ordinaryRunStyleFormatting });
+	const runStyleFormatting = cascadedStyleFormatting.formatting;
+	const mergedFormatting = cascadeStyleTextFormatting([{
+		cascade: cascadedStyleFormatting,
+		type: "carried"
+	}, {
+		formatting: runFormatting,
+		type: "direct"
+	}], { ordinaryFormatting: mergeTextFormatting(runStyleFormatting, runFormatting) }).formatting;
+	const marks = textFormattingToMarks(mergedFormatting, { overrideFormatting: getRunFormattingOverrides({
+		directFormatting: runFormatting,
+		effectiveStyleFormatting: runStyleFormatting,
+		hasCharacterStyle: styleId !== void 0,
+		paragraphMarkOverrides: inherited.paragraphMarkOverrides
+	}) });
 	if (styleId) {
-		const styleRPr = runStyleFormatting ? marksToTextFormatting(textFormattingToMarks(runStyleFormatting)) : void 0;
+		const styleRPr = characterStyleFormatting ? marksToTextFormatting(textFormattingToMarks(characterStyleFormatting)) : void 0;
 		marks.push(schema.mark("characterStyle", {
 			styleId,
 			_styleRPr: styleRPr && Object.keys(styleRPr).length > 0 ? styleRPr : null
@@ -1041,6 +1235,26 @@ function buildRunMarks(runFormatting, inheritedFormatting, styleResolver) {
 		mergedFormatting
 	};
 }
+const ORDINARY_STYLE_TOGGLE_KEYS = [
+	"bold",
+	"italic",
+	"strike",
+	"allCaps",
+	"smallCaps",
+	"hidden",
+	"emboss",
+	"imprint",
+	"shadow",
+	"outline"
+];
+function getRunFormattingOverrides({ directFormatting, effectiveStyleFormatting, hasCharacterStyle, paragraphMarkOverrides }) {
+	const overrides = mergeTextFormatting(paragraphMarkOverrides, directFormatting);
+	if (!overrides || !directFormatting) return overrides;
+	for (const key of ORDINARY_STYLE_TOGGLE_KEYS) if (directFormatting[key] === true && (!hasCharacterStyle || effectiveStyleFormatting?.[key] !== true)) Reflect.deleteProperty(overrides, key);
+	if (directFormatting.boldCs === true && directFormatting.boldCs === directFormatting.bold && (!hasCharacterStyle || effectiveStyleFormatting?.boldCs === void 0)) Reflect.deleteProperty(overrides, "boldCs");
+	if (directFormatting.italicCs === true && directFormatting.italicCs === directFormatting.italic && (!hasCharacterStyle || effectiveStyleFormatting?.italicCs === void 0)) Reflect.deleteProperty(overrides, "italicCs");
+	return overrides;
+}
 /**
 * Convert RunContent to ProseMirror nodes
 */
@@ -1212,21 +1426,37 @@ function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver,
 		rId: hyperlink.rId,
 		_docxHyperlinkIndex: hyperlinkIndex
 	});
-	for (const child of hyperlink.children) if (child.type === "run") {
-		const inheritedFormatting = getInheritedRunFormatting(child.formatting);
-		const { marks: runMarks, mergedFormatting } = buildRunMarks(child.formatting, inheritedFormatting, styleResolver);
-		const allMarks = [...runMarks, linkMark];
-		for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors));
+	for (const child of hyperlink.children) {
+		if (child.type === "bookmarkStart") {
+			nodes.push(schema.node("bookmarkBoundary", {
+				type: "start",
+				id: child.id,
+				name: child.name,
+				colFirst: child.colFirst,
+				colLast: child.colLast
+			}, void 0, [linkMark]));
+			continue;
+		}
+		if (child.type === "bookmarkEnd") {
+			nodes.push(schema.node("bookmarkBoundary", {
+				type: "end",
+				id: child.id
+			}, void 0, [linkMark]));
+			continue;
+		}
+		if (child.type === "run") {
+			const inheritedFormatting = getInheritedRunFormatting(child.formatting);
+			const { marks: runMarks, mergedFormatting } = buildRunMarks(child.formatting, inheritedFormatting, styleResolver);
+			const allMarks = [...runMarks, linkMark];
+			for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors));
+		}
 	}
 	return nodes;
 }
-/**
-* Convert TextFormatting to ProseMirror marks
-*/
-function textFormattingToMarks(formatting) {
+function textFormattingToMarks(formatting, options) {
 	if (!formatting) return [];
 	const marks = [];
-	const overrideAttrs = buildRunFormattingOverrideAttrs(formatting);
+	const overrideAttrs = buildRunFormattingOverrideAttrs(options ? options.overrideFormatting : formatting);
 	if (overrideAttrs) marks.push(schema.mark("runFormattingOverride", overrideAttrs));
 	if (formatting.bold) marks.push(schema.mark("bold"));
 	if (formatting.italic) marks.push(schema.mark("italic"));
@@ -1388,7 +1618,7 @@ function convertShape(shape) {
 }
 function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, tableParagraphOverlay }) {
 	const { textBoxes, textBoxAnchors } = extractTextBoxesFromParagraph(block, textBoxGroupId);
-	const pmParagraph = convertParagraph(block, styleResolver, context.nextHyperlinkInstanceIndex, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
+	const pmParagraph = convertParagraph(block, styleResolver, context.nextHyperlinkInstanceIndex, context.pairedBookmarkIds, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && !hasContentBesidesTextBoxAnchors(pmParagraph);
 	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
@@ -1650,7 +1880,8 @@ function headerFooterToProseDoc(content, options) {
 	const conversionContext = {
 		theme,
 		nextTextBoxGroupId,
-		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
+		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator(),
+		pairedBookmarkIds: collectPairedBookmarkIds(content)
 	};
 	const convertBlocks = (blocks) => {
 		const out = [];
@@ -1664,7 +1895,7 @@ function headerFooterToProseDoc(content, options) {
 	};
 	nodes.push(...convertBlocks(content));
 	if (nodes.length === 0) nodes.push(schema.node("paragraph", {}, []));
-	const pmDoc = schema.node("doc", null, nodes);
+	const pmDoc = stampNumberedRefFieldBaselines(schema.node("doc", null, nodes));
 	assertValidProseMirrorDocument(pmDoc, "Header/footer conversion produced an invalid ProseMirror document");
 	return pmDoc;
 }

package/dist/prosemirror/extensions/StarterKit.js

@@ -43,7 +43,8 @@ import { EmbossExtension, EmphasisMarkExtension, ImprintExtension, TextOutlineEx
 import { DeletionExtension, InsertionExtension, RunPropertyChangeExtension } from "./marks/TrackedChangeExtensions.js";
 import { UnderlineExtension } from "./marks/UnderlineExtension.js";
 import { BlockSdtExtension } from "./nodes/BlockSdtExtension.js";
-import { FieldExtension } from "./nodes/FieldExtension.js";
+import { BookmarkBoundaryExtension } from "./nodes/BookmarkBoundaryExtension.js";
+import { FieldExtension, StructuredFieldExtension } from "./nodes/FieldExtension.js";
 import { HardBreakExtension } from "./nodes/HardBreakExtension.js";
 import { HorizontalRuleExtension } from "./nodes/HorizontalRuleExtension.js";
 import { ImageExtension } from "./nodes/ImageExtension.js";
@@ -64,6 +65,11 @@ import { TextBoxExtension } from "./nodes/TextBoxExtension.js";
 function createStarterKit(options = {}) {
 	const disabled = options.disable ? new Set(options.disable) : /* @__PURE__ */ new Set();
 	const extensions = [];
+	let internalClipboardToken;
+	const getInternalClipboardToken = () => {
+		internalClipboardToken ??= globalThis.crypto.randomUUID();
+		return internalClipboardToken;
+	};
 	function add(name, ext) {
 		if (!disabled.has(name)) extensions.push(ext);
 	}
@@ -105,12 +111,13 @@ function createStarterKit(options = {}) {
 	add("insertion", InsertionExtension());
 	add("deletion", DeletionExtension());
 	add("runPropertyChange", RunPropertyChangeExtension());
+	add("bookmarkBoundary", BookmarkBoundaryExtension({ getInternalClipboardToken }));
 	add("hardBreak", HardBreakExtension());
 	add("tab", TabExtension());
 	add("symbol", SymbolExtension());
 	add("image", ImageExtension());
 	add("textBox", TextBoxExtension());
-	add("textBoxAnchor", TextBoxAnchorExtension());
+	add("textBoxAnchor", TextBoxAnchorExtension({ getInternalClipboardToken }));
 	add("shape", ShapeExtension());
 	add("imageDrag", ImageDragExtension());
 	add("imagePaste", ImagePasteExtension());
@@ -120,11 +127,12 @@ function createStarterKit(options = {}) {
 	add("pageBreak", PageBreakExtension());
 	add("renderedPageBreak", RenderedPageBreakExtension());
 	add("field", FieldExtension());
+	add("field", StructuredFieldExtension({ getInternalClipboardToken }));
 	add("sdt", SdtExtension());
 	add("blockSdt", BlockSdtExtension());
 	add("math", MathExtension());
 	if (!disabled.has("table")) extensions.push(...createTableExtensions());
-	add("pasteCleanup", PasteCleanupExtension());
+	add("pasteCleanup", PasteCleanupExtension({ getInternalClipboardToken }));
 	add("pasteStyleInliner", PasteStyleInlinerExtension());
 	add("list", ListExtension());
 	add("baseKeymap", BaseKeymapExtension());