@stll/folio-core 0.11.0 → 0.13.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,12 +1,17 @@
 import { OUTLINE_STYLE_CSS_ALIASES } from "../../types/documentEnumValues.js";
+import { directionToBidi } from "../paragraphDirection.js";
+import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
-import { pixelsToEmu } from "../../utils/units.js";
 import { numPrEqual } from "../../docx/numberingParser.js";
+import { pixelsToEmu } from "../../utils/units.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
-import { directionToBidi } from "../paragraphDirection.js";
-import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectParagraphAttrs, expectRunFormattingOverrideMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
+import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
+import { expectTextBoxAnchorAttrs } from "../textBoxAnchorAttrs.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { runShadingAttrsToShading } from "./runShadingMark.js";
+import { sdtPropertiesFromAttrs, sdtPropertiesMatchAttrs } from "./sdtAttrs.js";
+import { textFormattingToMarks } from "./toProseDoc.js";
+import { Fragment } from "prosemirror-model";
 //#region src/prosemirror/conversion/fromProseDoc.ts
 function normalizeShapeOutlineStyle(style) {
 	if (!style) return;
@@ -69,12 +74,122 @@ function fromProseDoc(pmDoc, baseDocument) {
 	};
 	return { package: { document: documentBody } };
 }
+const isSuggestedMark = (mark) => mark.attrs["provenance"] === "suggested";
+const hasSuggestedInsertion = (marks) => marks.some((mark) => mark.type.name === "insertion" && isSuggestedMark(mark));
+/**
+* Compute the mark set an inline node should keep once its suggested tracked
+* changes are stripped. Suggested deletions are dropped so their text survives
+* as plain content; a suggested `runPropertyChange` is dropped and the run's
+* live formatting is reverted to the recorded `previousFormatting`.
+*
+* Returns the input array unchanged when there is nothing to strip so callers
+* can skip rebuilding the node.
+*/
+function stripSuggestedInlineMarks(marks) {
+	const hasSuggestedDeletion = marks.some((mark) => mark.type.name === "deletion" && isSuggestedMark(mark));
+	const suggestedRunPropertyChange = marks.find((mark) => mark.type.name === "runPropertyChange" && isSuggestedMark(mark));
+	if (!hasSuggestedDeletion && !suggestedRunPropertyChange) return marks;
+	let next = marks.filter((mark) => !((mark.type.name === "deletion" || mark.type.name === "runPropertyChange") && isSuggestedMark(mark)));
+	if (suggestedRunPropertyChange) {
+		const previousFormatting = expectRunPropertyChangeMarkAttrs(suggestedRunPropertyChange).changes.at(0)?.previousFormatting;
+		next = next.filter((mark) => !RUN_FORMATTING_MARK_NAMES.has(mark.type.name));
+		for (const restored of textFormattingToMarks(previousFormatting)) next = restored.addToSet(next);
+	}
+	return next;
+}
+/**
+* Compute the node attrs a block/structural node keeps once its suggested
+* revision markers are neutralized. Returns `null` when nothing changes.
+*
+* - a suggested `trDel` / `cellMarker` (insertion or deletion) is cleared so
+*   the row/cell serializes as though the proposed change never happened;
+*   merge markers never carry suggestion provenance (structurally excluded);
+* - suggested INSERT markers are handled by the caller, which drops the whole
+*   node instead of clearing an attr.
+*
+* Reads go through the typed attr readers (adapter-boundary convention).
+*/
+function stripSuggestedNodeAttrs(node) {
+	const name = node.type.name;
+	if (name === "tableRow") {
+		const rowAttrs = expectTableRowAttrs(node);
+		if (rowAttrs.trDel?.provenance === "suggested") return {
+			...rowAttrs,
+			trDel: null
+		};
+		return null;
+	}
+	if (name === "tableCell" || name === "tableHeader") {
+		const cellAttrs = expectTableCellAttrs(node);
+		const marker = cellAttrs.cellMarker;
+		if (marker && marker.kind !== "merge" && marker.info.provenance === "suggested") return {
+			...cellAttrs,
+			cellMarker: null
+		};
+	}
+	return null;
+}
+/**
+* Whether a block/structural node is a suggested whole-node INSERT and must be
+* dropped from serialization entirely (paragraph, table, row, or column cell).
+*/
+function isSuggestedInsertedNode(node) {
+	const name = node.type.name;
+	if (name === "paragraph") return expectParagraphAttrs(node)._suggestedInsert != null;
+	if (name === "table") return expectTableAttrs(node)._suggestedInsert != null;
+	if (name === "tableRow") return expectTableRowAttrs(node).trIns?.provenance === "suggested";
+	if (name === "tableCell" || name === "tableHeader") {
+		const marker = expectTableCellAttrs(node).cellMarker;
+		return marker?.kind === "ins" && marker.info.provenance === "suggested";
+	}
+	return false;
+}
+/**
+* Recursively rewrite a ProseMirror node tree, removing every suggested
+* tracked change. Returns `null` when the node itself must be dropped: a
+* suggested-inserted inline node, or a suggested-inserted block/row/cell.
+* Surviving block nodes are rebuilt with their suggested delete/merge markers
+* cleared and their children stripped.
+*/
+function mapSuggestionStrippedNode(node) {
+	if (node.isInline) {
+		if (hasSuggestedInsertion(node.marks)) return null;
+		const marks = stripSuggestedInlineMarks(node.marks);
+		return marks === node.marks ? node : node.mark(marks);
+	}
+	if (isSuggestedInsertedNode(node)) return null;
+	const nextAttrs = stripSuggestedNodeAttrs(node);
+	const children = [];
+	let changed = nextAttrs !== null;
+	node.forEach((child) => {
+		const mapped = mapSuggestionStrippedNode(child);
+		if (mapped === null) {
+			changed = true;
+			return;
+		}
+		if (mapped !== child) changed = true;
+		children.push(mapped);
+	});
+	if (!changed) return node;
+	const content = Fragment.fromArray(children);
+	return nextAttrs === null ? node.copy(content) : node.type.create(nextAttrs, content, node.marks);
+}
+/**
+* Strip suggested (AI-proposed) tracked changes from a document so it
+* serializes as though the suggestion never happened. See the call site in
+* {@link extractBlocks} for why this is the sole serialization boundary.
+*/
+function stripSuggestedProvenance(doc) {
+	return mapSuggestionStrippedNode(doc) ?? doc;
+}
 /**
 * Extract block content (paragraphs, tables, block SDTs) from a ProseMirror
 * document.
 */
-function extractBlocks(pmDoc) {
+function extractBlocks(inputDoc) {
+	const pmDoc = stripSuggestedProvenance(inputDoc);
 	const blocks = [];
+	const textBoxAnchorMarkers = /* @__PURE__ */ new Map();
 	const documentCounts = buildDocumentTrackedChangeCounts(pmDoc);
 	let pendingPageBreaks = 0;
 	let previousStandaloneTextBox = null;
@@ -96,7 +211,7 @@ function extractBlocks(pmDoc) {
 			return;
 		}
 		if (node.type.name === "paragraph") {
-			const paragraph = convertPMParagraph(node, documentCounts);
+			const paragraph = convertPMParagraph(node, documentCounts, textBoxAnchorMarkers);
 			prependPageBreaks(paragraph, pendingPageBreaks);
 			pendingPageBreaks = 0;
 			blocks.push(paragraph);
@@ -108,7 +223,8 @@ function extractBlocks(pmDoc) {
 		} else if (node.type.name === "textBox") {
 			previousStandaloneTextBox = appendTextBoxBlock(blocks, node, {
 				pendingPageBreaks,
-				previousStandaloneTextBox
+				previousStandaloneTextBox,
+				textBoxAnchorMarkers
 			});
 			pendingPageBreaks = 0;
 		} else if (node.type.name === "blockSdt") {
@@ -118,6 +234,7 @@ function extractBlocks(pmDoc) {
 		}
 	});
 	if (pendingPageBreaks > 0 && !appendPendingPageBreaksToPreviousParagraph()) flushPendingPageBreaks();
+	removeUnresolvedTextBoxAnchors(blocks, textBoxAnchorMarkers);
 	return blocks;
 }
 function convertPMBlockSdt(node) {
@@ -176,11 +293,18 @@ function appendTextBoxBlock(blocks, node, options) {
 	const previousBlock = blocks.at(-1);
 	if (attrs._docxPlacement === "inlineWithPrevious" && previousBlock?.type === "paragraph") {
 		appendPageBreaks(previousBlock, options.pendingPageBreaks);
-		previousBlock.content.push(...paragraph.content);
+		const anchorId = attrs._docxAnchorId;
+		const anchorMarker = anchorId ? options.textBoxAnchorMarkers.get(anchorId) : void 0;
+		const textBoxRun = findTextBoxShapeRun(paragraph.content);
+		if (anchorId && anchorMarker && textBoxRun && replaceTextBoxAnchorInBlocks(blocks, anchorMarker, textBoxRun)) {
+			options.textBoxAnchorMarkers.delete(anchorId);
+			return null;
+		}
+		if (!mergeTextBoxIntoTrailingInlineSdts(previousBlock, paragraph, attrs._docxInlineSdts ?? [])) previousBlock.content.push(...paragraph.content);
 		return null;
 	}
 	if (attrs._docxPlacement === "standalone" && attrs._docxGroupId && options.previousStandaloneTextBox?.groupId === attrs._docxGroupId) {
-		options.previousStandaloneTextBox.paragraph.content.push(...paragraph.content);
+		if (!mergeTextBoxIntoTrailingInlineSdts(options.previousStandaloneTextBox.paragraph, paragraph, attrs._docxInlineSdts ?? [])) options.previousStandaloneTextBox.paragraph.content.push(...paragraph.content);
 		return options.previousStandaloneTextBox;
 	}
 	prependPageBreaks(paragraph, options.pendingPageBreaks);
@@ -190,6 +314,108 @@ function appendTextBoxBlock(blocks, node, options) {
 		groupId: attrs._docxGroupId
 	} : null;
 }
+function mergeTextBoxIntoTrailingInlineSdts(target, incoming, inlineSdts) {
+	if (inlineSdts.length === 0 || incoming.content.length !== 1) return false;
+	const incomingSdt = incoming.content.at(0);
+	const outerAttrs = inlineSdts.at(0);
+	if (!outerAttrs || incomingSdt?.type !== "inlineSdt") return false;
+	let targetSdt;
+	for (let index = target.content.length - 1; index >= 0; index -= 1) {
+		const content = target.content[index];
+		if (content?.type === "inlineSdt" && sdtPropertiesMatchAttrs(content.properties, outerAttrs)) {
+			targetSdt = content;
+			break;
+		}
+	}
+	if (!targetSdt) return false;
+	return mergeInlineSdtNodes(targetSdt, incomingSdt, inlineSdts, 0);
+}
+function mergeInlineSdtNodes(target, incoming, inlineSdts, index) {
+	const attrs = inlineSdts[index];
+	if (!attrs || !sdtPropertiesMatchAttrs(target.properties, attrs) || !sdtPropertiesMatchAttrs(incoming.properties, attrs)) return false;
+	if (index === inlineSdts.length - 1) {
+		target.content.push(...incoming.content);
+		return true;
+	}
+	const incomingNested = incoming.content.at(0);
+	const nestedAttrs = inlineSdts[index + 1];
+	if (!nestedAttrs || incomingNested?.type !== "inlineSdt") return false;
+	let targetNested;
+	for (let nestedIndex = target.content.length - 1; nestedIndex >= 0; nestedIndex -= 1) {
+		const content = target.content[nestedIndex];
+		if (content?.type === "inlineSdt" && sdtPropertiesMatchAttrs(content.properties, nestedAttrs)) {
+			targetNested = content;
+			break;
+		}
+	}
+	if (!targetNested) {
+		target.content.push(incomingNested);
+		return true;
+	}
+	return mergeInlineSdtNodes(targetNested, incomingNested, inlineSdts, index + 1);
+}
+function findTextBoxShapeRun(content) {
+	for (const item of content) {
+		if (item.type === "run") {
+			if (item.content.some((runContent) => runContent.type === "shape" && runContent.shape.shapeType === "textBox")) return item;
+			continue;
+		}
+		if (item.type === "inlineSdt" || item.type === "hyperlink" || item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
+			const run = findTextBoxShapeRun(item.type === "hyperlink" ? item.children : item.content);
+			if (run) return run;
+		}
+	}
+}
+function replaceTextBoxAnchorInBlocks(blocks, marker, textBoxRun) {
+	for (const block of blocks) {
+		if (block.type === "paragraph") {
+			if (editTextBoxAnchorInContent(block.content, marker, textBoxRun)) return true;
+			continue;
+		}
+		if (block.type === "table") {
+			for (const row of block.rows) for (const cell of row.cells) if (replaceTextBoxAnchorInBlocks(cell.content, marker, textBoxRun)) return true;
+			continue;
+		}
+		if (replaceTextBoxAnchorInBlocks(block.content, marker, textBoxRun)) return true;
+	}
+	return false;
+}
+function editTextBoxAnchorInContent(content, marker, replacement) {
+	for (let index = 0; index < content.length; index += 1) {
+		const item = content[index];
+		if (item === marker) {
+			content.splice(index, 1, ...replacement ? [replacement] : []);
+			return true;
+		}
+		let nestedContent;
+		if (item?.type === "hyperlink") nestedContent = item.children;
+		else if (item?.type === "inlineSdt" || item?.type === "insertion" || item?.type === "deletion" || item?.type === "moveFrom" || item?.type === "moveTo") nestedContent = item.content;
+		if (!nestedContent) continue;
+		const hadContent = nestedContent.length > 0;
+		if (editTextBoxAnchorInContent(nestedContent, marker, replacement)) {
+			if (!replacement && hadContent && nestedContent.length === 0) content.splice(index, 1);
+			return true;
+		}
+	}
+	return false;
+}
+function removeUnresolvedTextBoxAnchors(blocks, markers) {
+	for (const marker of markers.values()) removeTextBoxAnchorFromBlocks(blocks, marker);
+}
+function removeTextBoxAnchorFromBlocks(blocks, marker) {
+	for (const block of blocks) {
+		if (block.type === "paragraph") {
+			if (editTextBoxAnchorInContent(block.content, marker)) return true;
+			continue;
+		}
+		if (block.type === "table") {
+			for (const row of block.rows) for (const cell of row.cells) if (removeTextBoxAnchorFromBlocks(cell.content, marker)) return true;
+			continue;
+		}
+		if (removeTextBoxAnchorFromBlocks(block.content, marker)) return true;
+	}
+	return false;
+}
 /**
 * Inverse of toProseDoc's listRendering → list* attrs flattening. Markdown
 * export (`toMarkdown`) and re-layout of the rebuilt Document key off
@@ -254,9 +480,9 @@ function appendPageBreaks(paragraph, count) {
 /**
 * Convert a ProseMirror paragraph node to our Paragraph type
 */
-function convertPMParagraph(node, documentCounts) {
+function convertPMParagraph(node, documentCounts, textBoxAnchorMarkers) {
 	const attrs = expectParagraphAttrs(node);
-	let content = extractParagraphContent(node, documentCounts, attrs._emptyHyperlinks ?? void 0);
+	let content = extractParagraphContent(node, documentCounts, attrs._emptyHyperlinks ?? void 0, textBoxAnchorMarkers, attrs.renderedPageBreakBefore === true);
 	const bookmarks = attrs.bookmarks;
 	if (bookmarks && bookmarks.length > 0) {
 		const starts = bookmarks.map((b) => ({
@@ -344,6 +570,7 @@ function paragraphAttrsToFormatting(attrs) {
 		else delete result.styleId;
 		assignBooleanToggle(result, attrs, orig, "pageBreakBefore");
 		assignBooleanToggle(result, attrs, orig, "widowControl");
+		assignBooleanToggle(result, attrs, orig, "snapToGrid");
 		assignBooleanToggle(result, attrs, orig, "kinsoku");
 		assignBooleanToggle(result, attrs, orig, "overflowPunctuation");
 		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
@@ -356,7 +583,7 @@ function paragraphAttrsToFormatting(attrs) {
 	}
 	const outlineLevel = Reflect.get(attrs, "outlineLevel");
 	const bidi = directionToBidi(attrs.direction);
-	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
+	if (!(attrs.alignment || shouldSerializeSpaceBefore || shouldSerializeSpaceAfter || beforeAutospacingEdited || afterAutospacingEdited || attrs.lineSpacing || attrs.snapToGrid != null || attrs.indentLeft || attrs.indentRight || attrs.indentFirstLine || attrs.numPr || attrs.styleId || attrs.borders || attrs.shading || attrs.tabs || typeof outlineLevel === "number" || attrs.contextualSpacing || attrs.spacingExplicit || bidi != null || attrs.pageBreakBefore != null || attrs.widowControl != null || attrs.kinsoku != null || attrs.overflowPunctuation != null || attrs.suppressAutoHyphens != null)) return;
 	const f = {};
 	if (attrs.alignment) f.alignment = attrs.alignment;
 	if (shouldSerializeSpaceBefore) f.spaceBefore = spaceBefore;
@@ -365,6 +592,7 @@ function paragraphAttrsToFormatting(attrs) {
 	if (afterAutospacingEdited) f.afterAutospacing = false;
 	if (attrs.lineSpacing) f.lineSpacing = attrs.lineSpacing;
 	if (attrs.lineSpacingRule) f.lineSpacingRule = attrs.lineSpacingRule;
+	if (attrs.snapToGrid != null) f.snapToGrid = attrs.snapToGrid;
 	if (attrs.spacingExplicit) f.spacingExplicit = attrs.spacingExplicit;
 	if (attrs.indentLeft) f.indentLeft = attrs.indentLeft;
 	if (attrs.indentRight) f.indentRight = attrs.indentRight;
@@ -391,13 +619,14 @@ function paragraphAttrsToFormatting(attrs) {
 * Coalesces consecutive text with the same marks into single Runs
 * for efficient DOCX representation.
 */
-function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
+function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, textBoxAnchorMarkers, skipLeadingRenderedPageBreak = false) {
 	const content = [];
 	const sortedEmptyHyperlinks = (emptyHyperlinks ?? []).map((attrs, order) => ({
 		attrs,
 		order
 	})).toSorted((left, right) => left.attrs.offset - right.attrs.offset || left.order - right.order);
 	let nextEmptyHyperlink = 0;
+	let leadingRenderedPageBreakPending = skipLeadingRenderedPageBreak;
 	let currentRun = null;
 	let currentMarksKey = null;
 	let currentHyperlink = null;
@@ -455,11 +684,54 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 		}
 	};
 	const processInlineNode = (node, offset) => {
+		if (node.type.name === "renderedPageBreak" && leadingRenderedPageBreakPending) {
+			leadingRenderedPageBreakPending = false;
+			return;
+		}
+		leadingRenderedPageBreakPending = false;
 		syncCommentRanges(node, offset);
 		const linkMark = node.marks.find((m) => m.type.name === "hyperlink");
 		const noteRefMark = node.marks.find((m) => m.type.name === "footnoteRef");
 		const insertionMark = node.marks.find((m) => m.type.name === "insertion");
 		const deletionMark = node.marks.find((m) => m.type.name === "deletion");
+		if (node.type.name === "textBoxAnchor") {
+			flushCurrentInline();
+			if (!textBoxAnchorMarkers) return;
+			const { anchorId } = expectTextBoxAnchorAttrs(node);
+			const marker = {
+				type: "run",
+				content: []
+			};
+			if (textBoxAnchorMarkers.has(anchorId)) return;
+			textBoxAnchorMarkers.set(anchorId, marker);
+			const anchoredContent = linkMark ? {
+				...createHyperlink(linkMark),
+				children: [marker]
+			} : marker;
+			const changeMark = insertionMark ?? deletionMark;
+			if (!changeMark) {
+				content.push(anchoredContent);
+				return;
+			}
+			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
+			const info = {
+				id: changeAttrs.revisionId,
+				author: changeAttrs.author || "Unknown",
+				...changeAttrs.date ? { date: changeAttrs.date } : {},
+				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
+			};
+			if (insertionMark) content.push({
+				type: changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion",
+				info,
+				content: [anchoredContent]
+			});
+			else content.push({
+				type: changeAttrs.moveKind === "moveFrom" ? "moveFrom" : "deletion",
+				info,
+				content: [anchoredContent]
+			});
+			return;
+		}
 		if (insertionMark || deletionMark) {
 			flushCurrentInline();
 			const changeMark = insertionMark ?? deletionMark;
@@ -467,30 +739,35 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 			const changeAttrs = expectTrackedChangeMarkAttrs(changeMark);
 			const run = createTrackedChangeRun(node, node.marks.filter((m) => m.type.name !== "insertion" && m.type.name !== "deletion"));
 			if (!run) return;
+			const trackedContent = linkMark ? {
+				...createHyperlink(linkMark),
+				children: [run]
+			} : run;
 			const info = {
 				id: changeAttrs.revisionId,
 				author: changeAttrs.author || "Unknown"
 			};
 			if (changeAttrs.date) info.date = changeAttrs.date;
+			if (changeAttrs.initials) info.initials = changeAttrs.initials;
 			if (insertionMark) if (changeAttrs.moveKind === "moveTo") content.push({
 				type: "moveTo",
 				info,
-				content: [run]
+				content: [trackedContent]
 			});
 			else content.push({
 				type: "insertion",
 				info,
-				content: [run]
+				content: [trackedContent]
 			});
 			else if (changeAttrs.moveKind === "moveFrom") content.push({
 				type: "moveFrom",
 				info,
-				content: [run]
+				content: [trackedContent]
 			});
 			else content.push({
 				type: "deletion",
 				info,
-				content: [run]
+				content: [trackedContent]
 			});
 			return;
 		}
@@ -530,12 +807,15 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks) {
 		} else if (node.type.name === "tab") {
 			flushCurrentInline();
 			content.push(createTabRun());
+		} else if (node.type.name === "renderedPageBreak") {
+			flushCurrentInline();
+			content.push(createRenderedPageBreakRun());
 		} else if (node.type.name === "field") {
 			flushCurrentInline();
 			content.push(createFieldFromNode(node, node.marks));
 		} else if (node.type.name === "sdt") {
 			flushCurrentInline();
-			content.push(createInlineSdtFromNode(node));
+			content.push(createInlineSdtFromNode(node, textBoxAnchorMarkers));
 		} else if (node.type.name === "math") {
 			flushCurrentInline();
 			content.push(createMathFromNode(node));
@@ -576,7 +856,7 @@ function createTrackedChangeRun(node, marks) {
 	if (noteRefMark) return createNoteReferenceRun(noteRefMark, marks);
 	if (node.isText) {
 		const formatting = marksToTextFormatting(marks);
-		return {
+		const run = {
 			type: "run",
 			content: node.text ? [{
 				type: "text",
@@ -584,11 +864,14 @@ function createTrackedChangeRun(node, marks) {
 			}] : [],
 			...Object.keys(formatting).length > 0 ? { formatting } : {}
 		};
+		restoreRunPropertyChanges(run, marks);
+		return run;
 	}
 	if (node.type.name === "hardBreak") return createBreakRun(readHardBreakType(node));
 	if (node.type.name === "image") return createImageRun(node);
 	if (node.type.name === "shape") return createShapeRun(node);
 	if (node.type.name === "tab") return createTabRun();
+	if (node.type.name === "renderedPageBreak") return createRenderedPageBreakRun();
 	return null;
 }
 function createEmptyHyperlink(attrs) {
@@ -699,6 +982,10 @@ function addNodeToHyperlink(hyperlink, node) {
 		hyperlink.children.push(createTabRun(nonLinkMarks));
 		return;
 	}
+	if (node.type.name === "renderedPageBreak") {
+		hyperlink.children.push(createRenderedPageBreakRun());
+		return;
+	}
 	if (node.type.name === "image") {
 		hyperlink.children.push(createImageRun(node));
 		return;
@@ -736,8 +1023,16 @@ function createRunFromText(text, marks) {
 		}]
 	};
 	if (formatting) run.formatting = formatting;
+	restoreRunPropertyChanges(run, marks);
 	return run;
 }
+function restoreRunPropertyChanges(run, marks) {
+	const changeMark = marks.find((mark) => mark.type.name === "runPropertyChange");
+	if (!changeMark) return;
+	const { changes } = expectRunPropertyChangeMarkAttrs(changeMark);
+	if (changes.length === 0) return;
+	run.propertyChanges = [...changes];
+}
 function getRunFormattingFromMarks(marks) {
 	if (!marks || marks.length === 0) return;
 	const formatting = marksToTextFormatting(marks);
@@ -769,6 +1064,12 @@ function createBreakRun(breakType = "textWrapping", marks) {
 	if (formatting) run.formatting = formatting;
 	return run;
 }
+function createRenderedPageBreakRun() {
+	return {
+		type: "run",
+		content: [{ type: "renderedPageBreak" }]
+	};
+}
 function readHardBreakType(node) {
 	return expectHardBreakAttrs(node).breakType ?? "textWrapping";
 }
@@ -848,41 +1149,13 @@ function createMathFromNode(node) {
 /**
 * Create an InlineSdt from a PM sdt node
 */
-function createInlineSdtFromNode(node) {
-	const attrs = expectSdtAttrs(node);
-	const properties = { sdtType: attrs.sdtType };
-	if (attrs.alias) properties.alias = attrs.alias;
-	if (attrs.tag) properties.tag = attrs.tag;
-	if (typeof attrs.id === "number") properties.id = attrs.id;
-	if (attrs.lock) properties.lock = attrs.lock;
-	if (attrs.placeholder) properties.placeholder = attrs.placeholder;
-	if (attrs.showingPlaceholder !== void 0) properties.showingPlaceholder = attrs.showingPlaceholder;
-	if (attrs.dateFormat) properties.dateFormat = attrs.dateFormat;
-	if (attrs.dateValueISO) properties.dateValueISO = attrs.dateValueISO;
-	if (attrs.listItems) properties.listItems = parseSdtListItems(attrs.listItems);
-	if (typeof attrs.dropdownLastValue === "string") properties.dropdownLastValue = attrs.dropdownLastValue;
-	if (typeof attrs.checked === "boolean") properties.checked = attrs.checked;
-	if (attrs.rawPropertiesXml) properties.rawPropertiesXml = attrs.rawPropertiesXml;
-	if (attrs.rawEndPropertiesXml) properties.rawEndPropertiesXml = attrs.rawEndPropertiesXml;
+function createInlineSdtFromNode(node, textBoxAnchorMarkers) {
 	return {
 		type: "inlineSdt",
-		properties,
-		content: extractParagraphContent(node).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "mathEquation")
+		properties: sdtPropertiesFromAttrs(expectSdtAttrs(node)),
+		content: extractParagraphContent(node, void 0, void 0, textBoxAnchorMarkers).filter((c) => c.type === "run" || c.type === "hyperlink" || c.type === "simpleField" || c.type === "complexField" || c.type === "inlineSdt" || c.type === "insertion" || c.type === "deletion" || c.type === "moveFrom" || c.type === "moveTo" || c.type === "mathEquation")
 	};
 }
-function parseSdtListItems(rawItems) {
-	const parsed = JSON.parse(rawItems);
-	if (!Array.isArray(parsed)) throw new TypeError("Invalid ProseMirror sdt attrs: listItems is not an array");
-	return parsed.map((item) => {
-		if (!item || typeof item !== "object" || Array.isArray(item)) throw new TypeError("Invalid ProseMirror sdt attrs: listItems contains an invalid item");
-		const itemAttrs = item;
-		if (typeof itemAttrs.displayText !== "string" || typeof itemAttrs.value !== "string") throw new TypeError("Invalid ProseMirror sdt attrs: listItems contains an invalid item");
-		return {
-			displayText: itemAttrs.displayText,
-			value: itemAttrs.value
-		};
-	});
-}
 /**
 * Create a Run containing an image
 */
@@ -1399,6 +1672,24 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges) {
 	const rowFormatting = tableRowAttrsToFormatting(attrs);
 	if (rowFormatting) row.formatting = rowFormatting;
 	if (Array.isArray(attrs.trPrChange) && attrs.trPrChange.length > 0) row.propertyChanges = [...attrs.trPrChange];
+	if (attrs.trIns) row.structuralChange = {
+		type: "tableRowInsertion",
+		info: {
+			id: attrs.trIns.revisionId,
+			author: attrs.trIns.author,
+			...attrs.trIns.date != null && { date: attrs.trIns.date },
+			...attrs.trIns.initials != null && { initials: attrs.trIns.initials }
+		}
+	};
+	else if (attrs.trDel) row.structuralChange = {
+		type: "tableRowDeletion",
+		info: {
+			id: attrs.trDel.revisionId,
+			author: attrs.trDel.author,
+			...attrs.trDel.date != null && { date: attrs.trDel.date },
+			...attrs.trDel.initials != null && { initials: attrs.trDel.initials }
+		}
+	};
 	return row;
 }
 function createVerticalMergeContinuationCell(colspan) {
@@ -1450,19 +1741,22 @@ function tableRowAttrsToFormatting(attrs) {
 function convertPMTableCell(node, documentCounts) {
 	const attrs = expectTableCellAttrs(node);
 	const content = [];
+	const textBoxAnchorMarkers = /* @__PURE__ */ new Map();
 	let previousStandaloneTextBox = null;
 	node.forEach((contentNode) => {
 		if (contentNode.type.name === "paragraph") {
-			content.push(convertPMParagraph(contentNode, documentCounts));
+			content.push(convertPMParagraph(contentNode, documentCounts, textBoxAnchorMarkers));
 			previousStandaloneTextBox = null;
 		} else if (contentNode.type.name === "table") {
 			content.push(convertPMTable(contentNode, documentCounts));
 			previousStandaloneTextBox = null;
 		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
 			pendingPageBreaks: 0,
-			previousStandaloneTextBox
+			previousStandaloneTextBox,
+			textBoxAnchorMarkers
 		});
 	});
+	removeUnresolvedTextBoxAnchors(content, textBoxAnchorMarkers);
 	const cell = {
 		type: "tableCell",
 		content
@@ -1470,8 +1764,27 @@ function convertPMTableCell(node, documentCounts) {
 	const cellFormatting = tableCellAttrsToFormatting(attrs);
 	if (cellFormatting) cell.formatting = cellFormatting;
 	if (Array.isArray(attrs.tcPrChange) && attrs.tcPrChange.length > 0) cell.propertyChanges = [...attrs.tcPrChange];
+	if (attrs.cellMarker) {
+		const info = {
+			id: attrs.cellMarker.info.revisionId,
+			author: attrs.cellMarker.info.author,
+			...attrs.cellMarker.info.date != null && { date: attrs.cellMarker.info.date },
+			...attrs.cellMarker.info.initials != null && { initials: attrs.cellMarker.info.initials }
+		};
+		if (attrs.cellMarker.kind === "merge") cell.structuralChange = {
+			type: "tableCellMerge",
+			info,
+			...attrs.cellMarker.verticalMerge !== void 0 ? { verticalMerge: attrs.cellMarker.verticalMerge } : {},
+			...attrs.cellMarker.verticalMergeOriginal !== void 0 ? { verticalMergeOriginal: attrs.cellMarker.verticalMergeOriginal } : {}
+		};
+		else cell.structuralChange = {
+			type: attrs.cellMarker.kind === "ins" ? "tableCellInsertion" : "tableCellDeletion",
+			info
+		};
+	}
 	return cell;
 }
+const standaloneTableCellFromProseMirror = (node) => convertPMTableCell(node);
 const cellShadingFromAttrs = (attrs) => attrs.backgroundColor ? { fill: { rgb: attrs.backgroundColor } } : { pattern: "nil" };
 function tableCellAttrsToFormatting(attrs) {
 	const backgroundChanged = attrs.backgroundColor !== attrs._resolvedBackgroundColor;
@@ -1479,6 +1792,7 @@ function tableCellAttrsToFormatting(attrs) {
 		const orig = attrs._originalFormatting;
 		const result = { ...orig };
 		if (attrs.colspan > 1) result.gridSpan = attrs.colspan;
+		else delete result.gridSpan;
 		if (attrs.rowspan > 1) result.vMerge = "restart";
 		else if (result.vMerge === "restart" && !attrs._preserveVMergeRestart) delete result.vMerge;
 		const cellWidth = attrs.width;
@@ -1517,9 +1831,10 @@ function tableCellAttrsToFormatting(attrs) {
 */
 function convertPMTextBox(node) {
 	const attrs = expectTextBoxAttrs(node);
-	const childParagraphs = [];
+	const childBlocks = [];
 	node.forEach((child) => {
-		if (child.type.name === "paragraph") childParagraphs.push(convertPMParagraph(child));
+		if (child.type.name === "paragraph") childBlocks.push(convertPMParagraph(child));
+		else if (child.type.name === "table") childBlocks.push(convertPMTable(child));
 	});
 	const shape = {
 		type: "shape",
@@ -1529,7 +1844,7 @@ function convertPMTextBox(node) {
 			height: attrs.height ? pixelsToEmu(attrs.height) : 0
 		},
 		textBody: {
-			content: childParagraphs.length > 0 ? childParagraphs : [{
+			content: childBlocks.length > 0 ? childBlocks : [{
 				type: "paragraph",
 				content: []
 			}],
@@ -1561,16 +1876,43 @@ function convertPMTextBox(node) {
 	if (wrap) shape.wrap = wrap;
 	const position = imagePositionFromAttrs(attrs.position);
 	if (position) shape.position = position;
-	return {
-		type: "paragraph",
+	const run = {
+		type: "run",
 		content: [{
-			type: "run",
-			content: [{
-				type: "shape",
-				shape
-			}]
+			type: "shape",
+			shape
 		}]
 	};
+	const trackedChange = attrs._docxTrackedChange;
+	const inlineSdts = attrs._docxInlineSdts ?? [];
+	if (inlineSdts.length > 0) {
+		let wrapped = trackedChange ? {
+			type: trackedChange.type,
+			info: trackedChange.info,
+			content: [run]
+		} : run;
+		for (let index = inlineSdts.length - 1; index >= 0; index -= 1) {
+			const sdtAttrs = inlineSdts[index];
+			if (!sdtAttrs) continue;
+			wrapped = {
+				type: "inlineSdt",
+				properties: sdtPropertiesFromAttrs(sdtAttrs),
+				content: [wrapped]
+			};
+		}
+		return {
+			type: "paragraph",
+			content: [wrapped]
+		};
+	}
+	return {
+		type: "paragraph",
+		content: trackedChange ? [{
+			type: trackedChange.type,
+			info: trackedChange.info,
+			content: [run]
+		}] : [run]
+	};
 }
 /**
 * Update a Document with content from a ProseMirror document
@@ -1590,4 +1932,4 @@ function proseDocToBlocks(pmDoc) {
 	return extractBlocks(pmDoc);
 }
 //#endregion
-export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, updateDocumentContent };
+export { fromProseDoc, marksToTextFormatting, proseDocToBlocks, standaloneTableCellFromProseMirror, updateDocumentContent };