@stll/folio-core 0.11.0 → 0.13.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -1,17 +1,34 @@
+import { directionFromBidi } from "../paragraphDirection.js";
 import { emuToPixels } from "../../utils/units.js";
-import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
-import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
-import { directionFromBidi } from "../paragraphDirection.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { shadingToRunShadingAttrs } from "./runShadingMark.js";
-import { marksToTextFormatting } from "./fromProseDoc.js";
+import { sdtAttrsFromProperties } from "./sdtAttrs.js";
+import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
+import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { schema } from "../schema/index.js";
 import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatting.js";
+import { marksToTextFormatting } from "./fromProseDoc.js";
 //#region src/prosemirror/conversion/toProseDoc.ts
 const TOC_STYLE_ID = /^TOC\d*$/iu;
+const isTocStyleId = (styleId) => styleId !== void 0 && TOC_STYLE_ID.test(styleId);
+/**
+* Build a `nextTextBoxGroupId()` generator salted with a random per-load
+* nonce, so minted text-box anchor ids (`<salt>:<group>:<index>`) are unique
+* across separate conversions instead of purely sequential ("0:0", "0:1",
+* ...) starting fresh every load. `TextBoxAnchorExtension` parses
+* `data-docx-textbox-anchor` straight off pasted DOM and `fromProseDoc`
+* registers anchors first-seen-wins — without the salt, a pasted external
+* span carrying a guessed/copied id could collide with and hijack a real
+* text box anchored in a completely different document.
+*/
+const createTextBoxGroupIdFactory = () => {
+	const salt = Math.random().toString(36).slice(2, 10);
+	let index = 0;
+	return () => `${salt}:${index++}`;
+};
 /**
 * Convert a Document to a ProseMirror document
 *
@@ -23,14 +40,19 @@ function toProseDoc(document, options) {
 	const nodes = [];
 	const styleResolver = createStyleEngine(options?.styles ?? document.package.styles);
 	const theme = options?.theme ?? document.package.theme ?? null;
-	let textBoxGroupIndex = 0;
-	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
+	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
 		for (const block of blocks) if (block.type === "paragraph") {
 			const pbPos = paragraphPageBreakPosition(block);
 			if (pbPos === "before") out.push(schema.node("pageBreak"));
-			const converted = convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() });
+			const converted = convertParagraphWithTextBoxes(block, styleResolver, {
+				textBoxGroupId: nextTextBoxGroupId(),
+				context: {
+					theme,
+					nextTextBoxGroupId
+				}
+			});
 			const firstConverted = converted.at(0);
 			if (pbPos === "before" && converted.length === 1 && firstConverted?.type.name === "paragraph" && firstConverted.content.size === 0 && document.package.settings?.splitPageBreakAndParagraphMark !== true) {
 				const paragraph = firstConverted;
@@ -39,6 +61,14 @@ function toProseDoc(document, options) {
 					_pageBreakCarrier: true
 				}, paragraph.content, paragraph.marks);
 			}
+			if (pbPos === "after") {
+				const paragraphIndex = converted.findIndex((node) => node.type.name === "paragraph");
+				const trailingParagraph = paragraphIndex >= 0 ? converted.at(paragraphIndex) : void 0;
+				if (trailingParagraph) converted[paragraphIndex] = trailingParagraph.type.create({
+					...trailingParagraph.attrs,
+					_trailingPageBreak: true
+				}, trailingParagraph.content, trailingParagraph.marks);
+			}
 			out.push(...converted);
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
 		} else if (block.type === "table") out.push(convertTable(block, styleResolver, {
@@ -91,9 +121,9 @@ 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, activeCommentIds, extraRunFormatting, tableParagraphOverlay) {
+function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const attrs = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
-	const isTocParagraph = TOC_STYLE_ID.test(paragraph.formatting?.styleId ?? "");
+	const isTocParagraph = isTocStyleId(paragraph.formatting?.styleId);
 	const inlineNodes = [];
 	let inlineOffset = 0;
 	let bookmarksArr;
@@ -111,11 +141,16 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 		emitInlineNodes([node]);
 	};
 	let styleRunFormatting;
-	if (styleResolver) styleRunFormatting = styleResolver.resolveParagraphStyle(paragraph.formatting?.styleId).runFormatting;
-	const paragraphRunFormatting = resolveParagraphMarkRunFormatting(paragraph.formatting?.runProperties, styleResolver);
+	let paragraphStyleFontFamily;
+	if (styleResolver) {
+		styleRunFormatting = styleResolver.resolveParagraphStyle(paragraph.formatting?.styleId).runFormatting;
+		paragraphStyleFontFamily = resolveParagraphStyleFontFamily(paragraph.formatting?.styleId, styleResolver);
+	}
+	const paragraphRunFormatting = resolveRunFormattingWithoutDefaults(paragraph.formatting?.runProperties, styleResolver);
 	let inheritableParagraphRunFormatting;
 	if (paragraphRunFormatting && !isTocParagraph) inheritableParagraphRunFormatting = stripParagraphMarkFormattingForBodyRuns(paragraphRunFormatting);
-	const baseRunFormatting = mergeTextFormatting(styleRunFormatting, extraRunFormatting);
+	let baseRunFormatting = mergeTextFormatting(styleRunFormatting, extraRunFormatting);
+	if (paragraphStyleFontFamily) baseRunFormatting = mergeTextFormatting(baseRunFormatting, { fontFamily: paragraphStyleFontFamily });
 	const paragraphMarkPrecedesStyle = paragraph.formatting?.styleId !== void 0;
 	const defaultRunFormatting = paragraphMarkPrecedesStyle ? mergeTextFormatting(inheritableParagraphRunFormatting, baseRunFormatting) : mergeTextFormatting(baseRunFormatting, inheritableParagraphRunFormatting);
 	const getInheritedRunFormatting = (formatting, fieldType) => {
@@ -124,17 +159,22 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 		return suppressParagraphMarkFormatting(baseRunFormatting, inheritableParagraphRunFormatting, formatting, paragraphMarkPrecedesStyle);
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
-		emitInlineNodes(convertTrackedChange(change, markType, getInheritedRunFormatting, styleResolver, moveKind));
+		emitInlineNodes(convertTrackedChange(change, markType, 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));
+		else if (content.type === "run") emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors));
 		else if (content.type === "hyperlink") {
 			const currentHyperlinkIndex = hyperlinkIndex;
 			hyperlinkIndex += 1;
-			const linkNodes = convertHyperlink(content, getInheritedRunFormatting, styleResolver, currentHyperlinkIndex);
+			const linkNodes = convertHyperlink(content, {
+				getInheritedRunFormatting,
+				styleResolver,
+				hyperlinkIndex: currentHyperlinkIndex,
+				textBoxAnchors
+			});
 			if (linkNodes.length === 0) {
 				emptyHyperlinks ??= [];
 				emptyHyperlinks.push({
@@ -148,7 +188,7 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 			}
 			emitInlineNodes(linkNodes);
 		} else if (content.type === "simpleField" || content.type === "complexField") emitInlineNode(convertField(content, getInheritedRunFormatting, styleResolver));
-		else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, getInheritedRunFormatting, styleResolver));
+		else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, 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));
@@ -164,6 +204,15 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
 	return schema.node("paragraph", attrs, inlineNodes);
 }
+const resolveParagraphStyleFontFamily = (styleId, styleResolver) => {
+	let style = styleId ? styleResolver.getStyle(styleId) : styleResolver.getDefaultParagraphStyle();
+	const visited = /* @__PURE__ */ new Set();
+	while (style?.type === "paragraph" && !visited.has(style.styleId)) {
+		visited.add(style.styleId);
+		if (style.rPr?.fontFamily) return style.rPr.fontFamily;
+		style = style.basedOn ? styleResolver.getStyle(style.basedOn) : void 0;
+	}
+};
 /**
 * Apply comment marks to PM nodes within a comment range.
 * Only the first active comment ID is used (comments don't overlap visually).
@@ -191,19 +240,25 @@ function anchorPointComment(nodes, commentId) {
 * Convert tracked change (insertion or deletion) content to PM nodes with
 * an insertion/deletion mark applied.
 */
-function convertTrackedChange(change, markType, getInheritedRunFormatting, styleResolver, moveKind = null) {
+function convertTrackedChange(change, markType, getInheritedRunFormatting, styleResolver, moveKind = null, textBoxAnchors) {
 	const nodes = [];
 	let hyperlinkIndex = 0;
-	for (const item of change.content) if (item.type === "run") nodes.push(...convertRun(item, getInheritedRunFormatting(item.formatting), styleResolver));
+	for (const item of change.content) if (item.type === "run") nodes.push(...convertRun(item, getInheritedRunFormatting(item.formatting), styleResolver, textBoxAnchors));
 	else {
 		const currentHyperlinkIndex = hyperlinkIndex;
 		hyperlinkIndex += 1;
-		nodes.push(...convertHyperlink(item, getInheritedRunFormatting, styleResolver, currentHyperlinkIndex));
+		nodes.push(...convertHyperlink(item, {
+			getInheritedRunFormatting,
+			styleResolver,
+			hyperlinkIndex: currentHyperlinkIndex,
+			textBoxAnchors
+		}));
 	}
 	const mark = schema.marks[markType].create({
 		revisionId: change.info.id,
 		author: change.info.author,
 		date: change.info.date ?? null,
+		initials: change.info.initials ?? null,
 		moveKind
 	});
 	return nodes.map((node) => {
@@ -212,7 +267,7 @@ function convertTrackedChange(change, markType, getInheritedRunFormatting, style
 	});
 }
 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");
+	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 === "textBoxAnchor");
 }
 /**
 * Convert ParagraphFormatting to ProseMirror paragraph attrs
@@ -263,9 +318,14 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("spaceAfter", formatting?.spaceAfter ?? stylePpr?.spaceAfter);
 		set("lineSpacing", formatting?.lineSpacing ?? stylePpr?.lineSpacing);
 		set("lineSpacingRule", formatting?.lineSpacingRule ?? stylePpr?.lineSpacingRule);
+		set("snapToGrid", formatting?.snapToGrid ?? stylePpr?.snapToGrid);
 		set("spacingExplicit", formatting?.spacingExplicit);
 		const paragraphStyle = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
 		const docDefaultSpacing = styleResolver.getDocDefaults()?.pPr;
+		const spacingFromImplicitDefaultStyle = {};
+		if (!styleId && formatting?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore !== void 0) spacingFromImplicitDefaultStyle.before = true;
+		if (!styleId && formatting?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter !== void 0) spacingFromImplicitDefaultStyle.after = true;
+		if (spacingFromImplicitDefaultStyle.before || spacingFromImplicitDefaultStyle.after) attrs.spacingFromImplicitDefaultStyle = spacingFromImplicitDefaultStyle;
 		const spacingFromDocDefaults = {};
 		if (formatting?.spaceBefore === void 0 && tableParagraphOverlay?.spaceBefore === void 0 && paragraphStyle?.pPr?.spaceBefore === void 0 && docDefaultSpacing?.spaceBefore !== void 0) spacingFromDocDefaults.before = true;
 		if (formatting?.spaceAfter === void 0 && tableParagraphOverlay?.spaceAfter === void 0 && paragraphStyle?.pPr?.spaceAfter === void 0 && docDefaultSpacing?.spaceAfter !== void 0) spacingFromDocDefaults.after = true;
@@ -289,7 +349,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("runInWithNext", formatting?.runInWithNext ?? stylePpr?.runInWithNext);
 		set("outlineLevel", formatting?.outlineLevel ?? stylePpr?.outlineLevel);
 		set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
-		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: !TOC_STYLE_ID.test(styleId ?? "") }));
+		set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties: !isTocStyleId(styleId) }));
 		if (!formatting?.numPr && stylePpr?.numPr && stylePpr.numPr.numId !== 0) {
 			attrs.numPr = stylePpr.numPr;
 			attrs.numPrFromStyle = stylePpr.numPr;
@@ -300,6 +360,7 @@ function paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOver
 		set("spaceAfter", formatting?.spaceAfter);
 		set("lineSpacing", formatting?.lineSpacing);
 		set("lineSpacingRule", formatting?.lineSpacingRule);
+		set("snapToGrid", formatting?.snapToGrid);
 		set("spacingExplicit", formatting?.spacingExplicit);
 		set("indentLeft", formatting?.indentLeft);
 		set("indentRight", formatting?.indentRight);
@@ -361,7 +422,7 @@ function resolveTableStyleConditional(styleResolver, tableStyleId, conditionType
 	if (!style?.tblStylePr) return;
 	const conditional = style.tblStylePr.find((p) => p.type === conditionType);
 	if (!conditional) return;
-	const mergedRunProps = mergeTextFormatting(conditional.pPr?.runProperties ? resolveTextFormatting(conditional.pPr.runProperties, styleResolver) : void 0, conditional.rPr ? resolveTextFormatting(conditional.rPr, styleResolver) : void 0);
+	const mergedRunProps = mergeTextFormatting(conditional.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(conditional.pPr.runProperties, styleResolver) : void 0, conditional.rPr ? resolveRunFormattingWithoutDefaults(conditional.rPr, styleResolver) : void 0);
 	const paragraphSpacingOverlay = extractTableParagraphSpacingOverlay(conditional.pPr);
 	const result = {};
 	if (conditional.tcPr) result.tcPr = conditional.tcPr;
@@ -373,7 +434,7 @@ function resolveTableBaseStyle(styleResolver, tableStyleId) {
 	if (!styleResolver || !tableStyleId) return;
 	const style = styleResolver.getStyle(tableStyleId);
 	if (!style) return;
-	const mergedRunProps = mergeTextFormatting(style.pPr?.runProperties ? resolveTextFormatting(style.pPr.runProperties, styleResolver) : void 0, style.rPr ? resolveTextFormatting(style.rPr, styleResolver) : void 0);
+	const mergedRunProps = mergeTextFormatting(style.pPr?.runProperties ? resolveRunFormattingWithoutDefaults(style.pPr.runProperties, styleResolver) : void 0, style.rPr ? resolveRunFormattingWithoutDefaults(style.rPr, styleResolver) : void 0);
 	const paragraphSpacingOverlay = extractTableParagraphSpacingOverlay(style.pPr);
 	const result = {};
 	if (style.tcPr) result.tcPr = style.tcPr;
@@ -415,7 +476,12 @@ function mergeConditionalStyles(base, override) {
 }
 function hasDirectRunFormatting(formatting) {
 	if (!formatting) return false;
-	return Object.entries(formatting).some(([key, value]) => key !== "styleId" && value !== void 0);
+	for (const key in formatting) {
+		if (!Object.hasOwn(formatting, key)) continue;
+		const value = Reflect.get(formatting, key);
+		if (key !== "styleId" && value !== void 0) return true;
+	}
+	return false;
 }
 function stripParagraphMarkOnlyFormatting(formatting) {
 	const { allCaps: _ac, highlight: _h, shading: _s, smallCaps: _sc, vertAlign: _va, ...rest } = formatting;
@@ -457,7 +523,12 @@ function resolveTextFormatting(formatting, styleResolver) {
 	if (!styleResolver) return formatting;
 	return mergeTextFormatting(styleResolver.resolveRunStyle(formatting.styleId), formatting);
 }
-function resolveParagraphMarkRunFormatting(formatting, styleResolver) {
+/**
+* Resolve an embedded character-style reference without importing
+* `docDefaults`. The caller already has the paragraph cascade, including
+* document defaults, and will layer these own properties over it.
+*/
+function resolveRunFormattingWithoutDefaults(formatting, styleResolver) {
 	if (!formatting || !styleResolver) return formatting;
 	return mergeTextFormatting(formatting.styleId ? styleResolver.getRunStyleOwnProperties(formatting.styleId) : void 0, formatting);
 }
@@ -465,7 +536,7 @@ function resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolve
 	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(resolveParagraphMarkRunFormatting(rawParagraphMarkRpr, styleResolver) ?? {}) : void 0;
+	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);
 }
@@ -650,12 +721,29 @@ function countTableColumns(rows) {
 * Convert a TableRow to a ProseMirror table row node
 */
 function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins) {
-	const attrs = { isHeader: !!row.formatting?.header };
-	if (row.formatting?.height?.value !== void 0) attrs.height = row.formatting.height.value;
-	if (row.formatting?.heightRule) attrs.heightRule = row.formatting.heightRule;
-	if (row.formatting?.hidden) attrs.hidden = true;
-	if (row.formatting) attrs._originalFormatting = row.formatting;
-	if (row.propertyChanges && row.propertyChanges.length > 0) attrs.trPrChange = [...row.propertyChanges];
+	const attrsWithoutStructuralChange = { isHeader: !!row.formatting?.header };
+	if (row.formatting?.height?.value !== void 0) attrsWithoutStructuralChange.height = row.formatting.height.value;
+	if (row.formatting?.heightRule) attrsWithoutStructuralChange.heightRule = row.formatting.heightRule;
+	if (row.formatting?.hidden) attrsWithoutStructuralChange.hidden = true;
+	if (row.formatting) attrsWithoutStructuralChange._originalFormatting = row.formatting;
+	if (row.propertyChanges && row.propertyChanges.length > 0) attrsWithoutStructuralChange.trPrChange = [...row.propertyChanges];
+	let attrs = attrsWithoutStructuralChange;
+	if (row.structuralChange?.type === "tableRowInsertion") attrs = {
+		...attrsWithoutStructuralChange,
+		trIns: {
+			revisionId: row.structuralChange.info.id,
+			author: row.structuralChange.info.author,
+			date: row.structuralChange.info.date ?? null
+		}
+	};
+	else if (row.structuralChange?.type === "tableRowDeletion") attrs = {
+		...attrsWithoutStructuralChange,
+		trDel: {
+			revisionId: row.structuralChange.info.id,
+			author: row.structuralChange.info.author,
+			date: row.structuralChange.info.date ?? null
+		}
+	};
 	const numCells = row.cells.length;
 	const isFirstRow = rowIndex === 0;
 	const isLastRow = rowIndex === (totalRows ?? 1) - 1;
@@ -776,15 +864,44 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	}
 	if (formatting?.textDirection) attrs.textDirection = formatting.textDirection;
 	if (formatting?.noWrap !== void 0) attrs.noWrap = formatting.noWrap;
+	const hideMark = formatting?.hideMark ?? conditionalStyle?.tcPr?.hideMark;
+	if (hideMark !== void 0) attrs.hideMark = hideMark;
 	if (effectiveFormatting.borders) attrs.borders = effectiveFormatting.borders;
 	if (effectiveFormatting.margins) attrs.margins = effectiveFormatting.margins;
 	if (formatting) attrs._originalFormatting = formatting;
 	if (cell.propertyChanges && cell.propertyChanges.length > 0) attrs.tcPrChange = [...cell.propertyChanges];
+	if (cell.structuralChange?.type === "tableCellInsertion") attrs.cellMarker = {
+		kind: "ins",
+		info: {
+			revisionId: cell.structuralChange.info.id,
+			author: cell.structuralChange.info.author,
+			date: cell.structuralChange.info.date ?? null
+		}
+	};
+	else if (cell.structuralChange?.type === "tableCellDeletion") attrs.cellMarker = {
+		kind: "del",
+		info: {
+			revisionId: cell.structuralChange.info.id,
+			author: cell.structuralChange.info.author,
+			date: cell.structuralChange.info.date ?? null
+		}
+	};
+	else if (cell.structuralChange?.type === "tableCellMerge") attrs.cellMarker = {
+		kind: "merge",
+		info: {
+			revisionId: cell.structuralChange.info.id,
+			author: cell.structuralChange.info.author,
+			date: cell.structuralChange.info.date ?? null
+		},
+		...cell.structuralChange.verticalMerge !== void 0 ? { verticalMerge: cell.structuralChange.verticalMerge } : {},
+		...cell.structuralChange.verticalMergeOriginal !== void 0 ? { verticalMergeOriginal: cell.structuralChange.verticalMergeOriginal } : {}
+	};
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = vMergeContinuationCells;
 	const contentNodes = [];
 	for (const content of cell.content) if (content.type === "paragraph") contentNodes.push(...convertParagraphWithTextBoxes(content, styleResolver, {
 		textBoxGroupId: context.nextTextBoxGroupId(),
+		context,
 		...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
 		...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
 	}));
@@ -793,6 +910,25 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	const nodeType = isHeader ? "tableHeader" : "tableCell";
 	return schema.node(nodeType, attrs, contentNodes);
 }
+function standaloneTableCellToProseMirror(cell, nodeType) {
+	return convertTableCell({
+		cell,
+		styleResolver: null,
+		context: {
+			theme: null,
+			nextTextBoxGroupId: createTextBoxGroupIdFactory()
+		},
+		isHeader: nodeType === "tableHeader",
+		gridWidthPercent: void 0,
+		conditionalStyle: void 0,
+		tableBorders: void 0,
+		position: {},
+		calculatedRowSpan: 1,
+		preserveVMergeRestart: void 0,
+		vMergeContinuationCells: void 0,
+		defaultCellMargins: void 0
+	});
+}
 /**
 * Convert a SimpleField or ComplexField to a ProseMirror field node.
 * Preserves run formatting (bold, fontSize, color, etc.) as PM marks.
@@ -832,46 +968,38 @@ function convertMathEquation(math) {
 /**
 * Convert an InlineSdt to a ProseMirror sdt node with inline content.
 */
-function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver) {
+function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver, textBoxAnchors) {
 	const props = sdt.properties;
 	const inlineNodes = [];
 	let hyperlinkIndex = 0;
 	for (const content of sdt.content) if (content.type === "run") {
-		const runNodes = convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver);
+		const runNodes = convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors);
 		inlineNodes.push(...runNodes);
 	} else if (content.type === "hyperlink") {
 		const currentHyperlinkIndex = hyperlinkIndex;
 		hyperlinkIndex += 1;
-		const linkNodes = convertHyperlink(content, getInheritedRunFormatting, styleResolver, currentHyperlinkIndex);
+		const linkNodes = convertHyperlink(content, {
+			getInheritedRunFormatting,
+			styleResolver,
+			hyperlinkIndex: currentHyperlinkIndex,
+			textBoxAnchors
+		});
 		inlineNodes.push(...linkNodes);
 	} else if (content.type === "simpleField" || content.type === "complexField") {
 		const fieldNode = convertField(content, getInheritedRunFormatting, styleResolver);
 		if (fieldNode) inlineNodes.push(fieldNode);
 	} else if (content.type === "inlineSdt") {
-		const nestedSdt = convertInlineSdt(content, getInheritedRunFormatting, styleResolver);
+		const nestedSdt = convertInlineSdt(content, getInheritedRunFormatting, styleResolver, textBoxAnchors);
 		if (nestedSdt) inlineNodes.push(nestedSdt);
-	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver));
-	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver));
+	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
+	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
+	else if (content.type === "moveTo") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver, "moveTo", textBoxAnchors));
+	else if (content.type === "moveFrom") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver, "moveFrom", textBoxAnchors));
 	else {
 		const mathNode = convertMathEquation(content);
 		if (mathNode) inlineNodes.push(mathNode);
 	}
-	return schema.node("sdt", {
-		sdtType: props.sdtType,
-		alias: props.alias ?? null,
-		tag: props.tag ?? null,
-		id: props.id ?? null,
-		lock: props.lock ?? null,
-		placeholder: props.placeholder ?? null,
-		showingPlaceholder: props.showingPlaceholder ?? false,
-		dateFormat: props.dateFormat ?? null,
-		dateValueISO: props.dateValueISO ?? null,
-		listItems: props.listItems ? JSON.stringify(props.listItems) : null,
-		dropdownLastValue: props.dropdownLastValue ?? null,
-		checked: props.checked ?? null,
-		rawPropertiesXml: props.rawPropertiesXml ?? null,
-		rawEndPropertiesXml: props.rawEndPropertiesXml ?? null
-	}, inlineNodes.length > 0 ? inlineNodes : void 0);
+	return schema.node("sdt", sdtAttrsFromProperties(props), inlineNodes.length > 0 ? inlineNodes : void 0);
 }
 /**
 * Convert a Run to ProseMirror text nodes with marks
@@ -879,11 +1007,12 @@ function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver) {
 * @param run - The run to convert
 * @param styleFormatting - Text formatting from the paragraph's style (e.g., Heading1's font size/color)
 */
-function convertRun(run, styleFormatting, styleResolver) {
+function convertRun(run, styleFormatting, styleResolver, textBoxAnchors) {
 	const nodes = [];
 	const { marks, mergedFormatting } = buildRunMarks(run.formatting, styleFormatting, 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);
+		const contentNodes = convertRunContent(content, marks, mergedFormatting, textBoxAnchors);
 		nodes.push(...contentNodes);
 	}
 	return nodes;
@@ -908,7 +1037,7 @@ function buildRunMarks(runFormatting, inheritedFormatting, styleResolver) {
 /**
 * Convert RunContent to ProseMirror nodes
 */
-function convertRunContent(content, marks, formatting) {
+function convertRunContent(content, marks, formatting, textBoxAnchors) {
 	switch (content.type) {
 		case "text":
 			if (content.text) return [schema.text(content.text, marks)];
@@ -917,11 +1046,15 @@ function convertRunContent(content, marks, formatting) {
 			if (content.breakType === "textWrapping" || !content.breakType) return [withHyperlinkBoundaryMarks(schema.node("hardBreak"), marks)];
 			if (content.breakType === "column") return [withHyperlinkBoundaryMarks(schema.node("hardBreak", { breakType: "column" }), marks)];
 			return [];
+		case "renderedPageBreak": return [schema.node("renderedPageBreak").mark(marks)];
 		case "tab": return [schema.node("tab").mark(marks)];
 		case "drawing": return [withHyperlinkBoundaryMarks(convertImage(content.image, content.rawXml), marks)];
 		case "shape": {
 			const shp = content.shape;
-			if (shp.textBody) return [];
+			if (shp.textBody) {
+				const anchorId = textBoxAnchors?.get(shp);
+				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
+			}
 			return [withHyperlinkBoundaryMarks(convertShape(shp), marks)];
 		}
 		case "footnoteRef": {
@@ -1053,13 +1186,7 @@ function convertImage(image, rawXml) {
 		_docxObjectPreview: rawXml !== void 0 && /<(?:[A-Za-z_][\w.-]*:)?object(?:\s|>)/u.test(rawXml)
 	});
 }
-/**
-* Convert a Hyperlink to ProseMirror nodes with link mark
-*
-* @param hyperlink - The hyperlink to convert
-* @param getInheritedRunFormatting - Formatting inherited by each child run
-*/
-function convertHyperlink(hyperlink, getInheritedRunFormatting, styleResolver, hyperlinkIndex) {
+function convertHyperlink(hyperlink, { getInheritedRunFormatting, styleResolver, hyperlinkIndex, textBoxAnchors }) {
 	const nodes = [];
 	const href = hyperlink.href || (hyperlink.anchor ? `#${hyperlink.anchor}` : "");
 	const linkMark = schema.mark("hyperlink", {
@@ -1072,7 +1199,7 @@ function convertHyperlink(hyperlink, getInheritedRunFormatting, styleResolver, h
 		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));
+		for (const content of child.content) nodes.push(...convertRunContent(content, allMarks, mergedFormatting, textBoxAnchors));
 	}
 	return nodes;
 }
@@ -1230,57 +1357,159 @@ function convertShape(shape) {
 		position
 	});
 }
-function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, extraRunFormatting, tableParagraphOverlay }) {
-	const textBoxes = extractTextBoxesFromParagraph(block);
-	const pmParagraph = convertParagraph(block, styleResolver, void 0, extraRunFormatting, tableParagraphOverlay);
+function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, tableParagraphOverlay }) {
+	const { textBoxes, textBoxAnchors } = extractTextBoxesFromParagraph(block, textBoxGroupId);
+	const pmParagraph = convertParagraph(block, styleResolver, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
 	const nodes = [];
-	const isEmptyAfterExtraction = textBoxes.length > 0 && pmParagraph.content.size === 0;
+	const isEmptyAfterExtraction = textBoxes.length > 0 && !hasContentBesidesTextBoxAnchors(pmParagraph);
 	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
-	for (const tb of textBoxes) nodes.push(convertTextBox(tb, styleResolver, {
+	for (const { textBox, anchorId, trackedChange, inlineSdts } of textBoxes) nodes.push(convertTextBox(textBox, styleResolver, {
 		placement: isEmptyAfterExtraction && !keepWrapperParagraph ? "standalone" : "inlineWithPrevious",
-		groupId: textBoxGroupId
+		groupId: textBoxGroupId,
+		anchorId,
+		context,
+		trackedChange,
+		inlineSdts
 	}));
 	return nodes;
 }
+function hasContentBesidesTextBoxAnchors(paragraph) {
+	let hasContent = false;
+	paragraph.descendants((node) => {
+		if (node.type.name === "textBoxAnchor") return false;
+		if (node.type.name === "sdt") {
+			if (node.childCount === 0) hasContent = true;
+			return !hasContent;
+		}
+		hasContent = true;
+		return false;
+	});
+	return hasContent;
+}
 function hasParagraphBoundaryPayload(block, pmParagraph) {
 	const bookmarks = pmParagraph.attrs["bookmarks"];
 	const emptyHyperlinks = pmParagraph.attrs["_emptyHyperlinks"];
 	return Boolean(block.sectionProperties || block.propertyChanges?.length || Array.isArray(bookmarks) && bookmarks.length > 0 || Array.isArray(emptyHyperlinks) && emptyHyperlinks.length > 0);
 }
-/**
-* Extract text boxes from paragraph runs.
-* Text boxes appear as ShapeContent where the shape has textBody,
-* or as DrawingContent that contains a text box instead of an image.
-*/
-function extractTextBoxesFromParagraph(paragraph) {
+const NO_EXTRACTED_TEXT_BOXES = {
+	textBoxes: [],
+	textBoxAnchors: /* @__PURE__ */ new Map()
+};
+function extractTextBoxesFromParagraph(paragraph, textBoxGroupId) {
+	if (!mayContainTextBox(paragraph)) return NO_EXTRACTED_TEXT_BOXES;
+	return extractTextBoxes(paragraph, textBoxGroupId);
+}
+function mayContainTextBox(paragraph) {
+	for (const item of paragraph.content) {
+		if (item.type !== "run") {
+			if (item.type === "inlineSdt" || item.type === "hyperlink" || item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") return true;
+			continue;
+		}
+		for (const content of item.content) if (content.type === "shape" && content.shape.textBody) return true;
+	}
+	return false;
+}
+function extractTextBoxes(paragraph, textBoxGroupId) {
 	const textBoxes = [];
-	for (const content of paragraph.content) if (content.type === "run") {
-		for (const rc of content.content) if (rc.type === "shape") {
-			const shape = rc.shape;
-			if (shape.textBody) {
-				const textBox = {
-					type: "textBox",
-					size: shape.size,
-					content: shape.textBody.content
-				};
-				if (shape.id) textBox.id = shape.id;
-				if (shape.position) textBox.position = shape.position;
-				if (shape.wrap) textBox.wrap = shape.wrap;
-				if (shape.fill) textBox.fill = shape.fill;
-				if (shape.outline) textBox.outline = shape.outline;
-				if (shape.textBody.margins) textBox.margins = shape.textBody.margins;
-				if (shape.textBody.autoFit) textBox.autoFit = shape.textBody.autoFit;
-				textBoxes.push(textBox);
+	const textBoxAnchors = /* @__PURE__ */ new Map();
+	const visitRun = (run, context) => {
+		for (const runContent of run.content) {
+			if (runContent.type !== "shape" || !runContent.shape.textBody) continue;
+			const anchorId = `${textBoxGroupId}:${textBoxes.length}`;
+			textBoxAnchors.set(runContent.shape, anchorId);
+			textBoxes.push({
+				textBox: textBoxFromShape(runContent.shape, runContent.shape.textBody),
+				anchorId,
+				trackedChange: context.trackedChange,
+				inlineSdts: context.inlineSdts
+			});
+		}
+	};
+	const visitHyperlink = (hyperlink, context) => {
+		for (const child of hyperlink.children) if (child.type === "run") visitRun(child, context);
+	};
+	const visitTrackedChange = (change, context) => {
+		const trackedChange = {
+			type: change.type,
+			info: change.info
+		};
+		for (const item of change.content) {
+			if (item.type === "run") {
+				visitRun(item, {
+					...context,
+					trackedChange
+				});
+				continue;
+			}
+			visitHyperlink(item, {
+				...context,
+				trackedChange
+			});
+		}
+	};
+	const visitInlineSdt = (sdt, context) => {
+		const inlineSdts = [...context.inlineSdts, sdtAttrsFromProperties(sdt.properties)];
+		const nestedContext = {
+			...context,
+			inlineSdts
+		};
+		for (const item of sdt.content) {
+			if (item.type === "run") {
+				visitRun(item, nestedContext);
+				continue;
 			}
+			if (item.type === "inlineSdt") {
+				visitInlineSdt(item, nestedContext);
+				continue;
+			}
+			if (item.type === "hyperlink") {
+				visitHyperlink(item, nestedContext);
+				continue;
+			}
+			if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") visitTrackedChange(item, nestedContext);
+		}
+	};
+	const rootContext = { inlineSdts: [] };
+	for (const item of paragraph.content) {
+		if (item.type === "run") {
+			visitRun(item, rootContext);
+			continue;
 		}
+		if (item.type === "inlineSdt") {
+			visitInlineSdt(item, rootContext);
+			continue;
+		}
+		if (item.type === "hyperlink") {
+			visitHyperlink(item, rootContext);
+			continue;
+		}
+		if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") visitTrackedChange(item, rootContext);
 	}
-	return textBoxes;
+	return {
+		textBoxes,
+		textBoxAnchors
+	};
+}
+function textBoxFromShape(shape, textBody) {
+	const textBox = {
+		type: "textBox",
+		size: shape.size,
+		content: textBody.content
+	};
+	if (shape.id) textBox.id = shape.id;
+	if (shape.position) textBox.position = shape.position;
+	if (shape.wrap) textBox.wrap = shape.wrap;
+	if (shape.fill) textBox.fill = shape.fill;
+	if (shape.outline) textBox.outline = shape.outline;
+	if (textBody.margins) textBox.margins = textBody.margins;
+	if (textBody.autoFit) textBox.autoFit = textBody.autoFit;
+	return textBox;
 }
 /**
 * Convert a TextBox to a ProseMirror textBox node
 */
-function convertTextBox(textBox, styleResolver, options = {}) {
+function convertTextBox(textBox, styleResolver, options) {
 	const textBoxSize = textBox.size;
 	const widthPx = textBoxSize?.width ? emuToPixels(textBoxSize.width) : 200;
 	const heightPx = textBoxSize?.height ? emuToPixels(textBoxSize.height) : void 0;
@@ -1299,7 +1528,16 @@ function convertTextBox(textBox, styleResolver, options = {}) {
 	const marginLeft = textBox.margins?.left !== void 0 ? emuToPixels(textBox.margins.left) : 7;
 	const marginRight = textBox.margins?.right !== void 0 ? emuToPixels(textBox.margins.right) : 7;
 	const contentNodes = [];
-	for (const para of textBox.content) contentNodes.push(convertParagraph(para, styleResolver));
+	for (const block of textBox.content) {
+		if (block.type === "paragraph") {
+			contentNodes.push(...convertParagraphWithTextBoxes(block, styleResolver, {
+				textBoxGroupId: options.context.nextTextBoxGroupId(),
+				context: options.context
+			}));
+			continue;
+		}
+		contentNodes.push(convertTable(block, styleResolver, options.context));
+	}
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
 	const wrapType = textBox.wrap?.type;
 	const wrapText = textBox.wrap?.wrapText;
@@ -1359,7 +1597,10 @@ function convertTextBox(textBox, styleResolver, options = {}) {
 		distRight,
 		position,
 		_docxPlacement: options.placement,
-		_docxGroupId: options.groupId
+		_docxGroupId: options.groupId,
+		_docxAnchorId: options.anchorId,
+		_docxTrackedChange: options.trackedChange,
+		_docxInlineSdts: options.inlineSdts.length > 0 ? options.inlineSdts : void 0
 	}, contentNodes);
 }
 /**
@@ -1374,11 +1615,16 @@ function headerFooterToProseDoc(content, options) {
 	const nodes = [];
 	const styleResolver = options?.styles ? createStyleEngine(options.styles) : null;
 	const theme = options?.theme ?? null;
-	let textBoxGroupIndex = 0;
-	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
+	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
+		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
+			textBoxGroupId: nextTextBoxGroupId(),
+			context: {
+				theme,
+				nextTextBoxGroupId
+			}
+		}));
 		else if (block.type === "table") out.push(convertTable(block, styleResolver, {
 			theme,
 			nextTextBoxGroupId
@@ -1414,6 +1660,21 @@ function footnoteToProseDoc(content, options) {
 *   null     — no page break found.
 */
 function paragraphPageBreakPosition(paragraph) {
+	if (!mayContainPageBreak(paragraph)) return null;
+	return findParagraphPageBreakPosition(paragraph);
+}
+function mayContainPageBreak(paragraph) {
+	for (const item of paragraph.content) {
+		if (item.type === "run") {
+			for (const content of item.content) if (content.type === "break" && content.breakType === "page") return true;
+			continue;
+		}
+		if (item.type === "hyperlink" || item.type === "simpleField" || item.type === "complexField" || item.type === "inlineSdt" || item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") return true;
+		if (item.type === "bookmarkStart" || item.type === "bookmarkEnd" || item.type === "commentRangeStart" || item.type === "commentRangeEnd" || item.type === "commentReference" || item.type === "moveFromRangeStart" || item.type === "moveFromRangeEnd" || item.type === "moveToRangeStart" || item.type === "moveToRangeEnd" || item.type === "mathEquation") continue;
+	}
+	return false;
+}
+function findParagraphPageBreakPosition(paragraph) {
 	const state = { seenVisibleContent: false };
 	function isPageBreak(content) {
 		return content.type === "break" && content.breakType === "page";
@@ -1468,4 +1729,4 @@ function createEmptyDoc() {
 	return schema.node("doc", null, [schema.node("paragraph", {}, [])]);
 }
 //#endregion
-export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, textFormattingToMarks, toProseDoc };
+export { createEmptyDoc, footnoteToProseDoc, headerFooterToProseDoc, standaloneTableCellToProseMirror, textFormattingToMarks, toProseDoc };