@stll/folio-core 0.12.0 → 0.13.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -5,10 +5,13 @@ import { ShapeOutlineStyleSchema, narrowEnum } from "../../docx/parserEnums.js";
 import { numPrEqual } from "../../docx/numberingParser.js";
 import { pixelsToEmu } from "../../utils/units.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.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;
@@ -71,11 +74,120 @@ 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);
@@ -605,7 +717,8 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 			const info = {
 				id: changeAttrs.revisionId,
 				author: changeAttrs.author || "Unknown",
-				...changeAttrs.date ? { date: changeAttrs.date } : {}
+				...changeAttrs.date ? { date: changeAttrs.date } : {},
+				...changeAttrs.initials ? { initials: changeAttrs.initials } : {}
 			};
 			if (insertionMark) content.push({
 				type: changeAttrs.moveKind === "moveTo" ? "moveTo" : "insertion",
@@ -635,6 +748,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 				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,
@@ -1563,7 +1677,8 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges) {
 		info: {
 			id: attrs.trIns.revisionId,
 			author: attrs.trIns.author,
-			...attrs.trIns.date != null && { date: attrs.trIns.date }
+			...attrs.trIns.date != null && { date: attrs.trIns.date },
+			...attrs.trIns.initials != null && { initials: attrs.trIns.initials }
 		}
 	};
 	else if (attrs.trDel) row.structuralChange = {
@@ -1571,7 +1686,8 @@ function convertPMTableRow(node, documentCounts, activeVerticalMerges) {
 		info: {
 			id: attrs.trDel.revisionId,
 			author: attrs.trDel.author,
-			...attrs.trDel.date != null && { date: attrs.trDel.date }
+			...attrs.trDel.date != null && { date: attrs.trDel.date },
+			...attrs.trDel.initials != null && { initials: attrs.trDel.initials }
 		}
 	};
 	return row;
@@ -1652,7 +1768,8 @@ function convertPMTableCell(node, documentCounts) {
 		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.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",

package/dist/prosemirror/conversion/index.js

@@ -1,4 +1,4 @@
 import { assertValidProseMirrorDocument, formatProseMirrorDocumentIssues, validateProseMirrorDocument } from "../validation.js";
-import { fromProseDoc, proseDocToBlocks, updateDocumentContent } from "./fromProseDoc.js";
 import { createEmptyDoc, headerFooterToProseDoc, toProseDoc } from "./toProseDoc.js";
+import { fromProseDoc, proseDocToBlocks, updateDocumentContent } from "./fromProseDoc.js";
 export { assertValidProseMirrorDocument, createEmptyDoc, formatProseMirrorDocumentIssues, fromProseDoc, headerFooterToProseDoc, proseDocToBlocks, toProseDoc, updateDocumentContent, validateProseMirrorDocument };

package/dist/prosemirror/conversion/toProseDoc.js

@@ -4,17 +4,32 @@ import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { assertValidProseMirrorDocument } from "../validation.js";
 import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
-import { marksToTextFormatting } from "./fromProseDoc.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
 *
 * @param document - The Document to convert
@@ -25,8 +40,7 @@ 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") {
@@ -244,6 +258,7 @@ function convertTrackedChange(change, markType, getInheritedRunFormatting, style
 		revisionId: change.info.id,
 		author: change.info.author,
 		date: change.info.date ?? null,
+		initials: change.info.initials ?? null,
 		moveKind
 	});
 	return nodes.map((node) => {
@@ -896,14 +911,12 @@ function convertTableCell({ cell, styleResolver, context, isHeader, gridWidthPer
 	return schema.node(nodeType, attrs, contentNodes);
 }
 function standaloneTableCellToProseMirror(cell, nodeType) {
-	let textBoxGroupIndex = 0;
-	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
 	return convertTableCell({
 		cell,
 		styleResolver: null,
 		context: {
 			theme: null,
-			nextTextBoxGroupId
+			nextTextBoxGroupId: createTextBoxGroupIdFactory()
 		},
 		isHeader: nodeType === "tableHeader",
 		gridWidthPercent: void 0,
@@ -1602,8 +1615,7 @@ 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, {

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

@@ -237,7 +237,8 @@ const paragraphNodeSpec = {
 		_autospacingBase: { default: null },
 		_sectionProperties: { default: null },
 		_propertyChanges: { default: null },
-		pPrMark: { default: null }
+		pPrMark: { default: null },
+		_suggestedInsert: { default: null }
 	},
 	parseDOM: [{
 		tag: "p",

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

@@ -1,4 +1,5 @@
 import { createExtension } from "../create.js";
+import { sanitizeImageSrc } from "../../../utils/sanitizeImageSrc.js";
 import { getClipboardImageFiles } from "../../../utils/clipboard.js";
 import { isSafeImageFile } from "../../../utils/imageValidation.js";
 import { Plugin, TextSelection } from "prosemirror-state";
@@ -20,13 +21,18 @@ async function readFileAsDataUrl(file) {
 }
 async function loadImageSize(src) {
 	return await new Promise((resolve, reject) => {
+		const safeSrc = sanitizeImageSrc(src);
+		if (!safeSrc) {
+			reject(/* @__PURE__ */ new Error("Rejected unsafe image source"));
+			return;
+		}
 		const img = new Image();
 		img.addEventListener("load", () => resolve({
 			width: img.naturalWidth || 1,
 			height: img.naturalHeight || 1
 		}));
 		img.addEventListener("error", () => reject(/* @__PURE__ */ new Error("Failed to load pasted image")));
-		img.src = src;
+		img.src = safeSrc;
 	});
 }
 async function insertImageFiles(view, files) {
@@ -37,7 +43,9 @@ async function insertImageFiles(view, files) {
 		if (!await isSafeImageFile(file)) continue;
 		let dataUrl;
 		try {
-			dataUrl = await readFileAsDataUrl(file);
+			const safeSrc = sanitizeImageSrc(await readFileAsDataUrl(file));
+			if (!safeSrc) continue;
+			dataUrl = safeSrc;
 		} catch {
 			continue;
 		}

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

@@ -1,3 +1,4 @@
+import { stripXmlDeclarations } from "../../../utils/stripXmlDeclarations.js";
 //#region src/prosemirror/extensions/features/pasteCleanup.ts
 /**
 * Office / web paste cleanup
@@ -112,11 +113,22 @@ function splitStyleDeclarations(value) {
 }
 const TAG_TAIL = `(?:"[^"]*"|'[^']*'|[^>"'])*`;
 const NAMESPACED_TAG = new RegExp(`<\\/?(?:[owvm]|st\\d+):${TAG_TAIL}>`, "gi");
-const XML_PROCESSING_INSTRUCTION = new RegExp(`<\\?xml${TAG_TAIL}>`, "gi");
 const STRAY_XML_TAG = new RegExp(`<\\/?xml${TAG_TAIL}>`, "gi");
 const NOISE_TAG = new RegExp(`<\\/?(?:font|meta|link)${TAG_TAIL}>`, "gi");
 const EMPTY_SPAN = new RegExp(`<span(?:\\s${TAG_TAIL})?><\\/span>`, "gi");
 const MAX_EMPTY_SPAN_PASSES = 5;
+const PM_SLICE_MARKER = /\bdata-pm-slice\s*=/i;
+const TEXTBOX_ANCHOR_ATTR = /\s+data-docx-textbox-anchor(?:="[^"]*"|='[^']*')?/gi;
+/**
+* Remove the `data-docx-textbox-anchor` marker from HTML that did not come
+* from a ProseMirror clipboard slice (see {@link PM_SLICE_MARKER}). Internal
+* copy/paste of a real text box carries the marker HTML unmodified so it
+* keeps working; anything else has the marker stripped defensively.
+*/
+function stripForeignTextBoxAnchors(html, originalHtml) {
+	if (PM_SLICE_MARKER.test(originalHtml)) return html;
+	return html.replace(TEXTBOX_ANCHOR_ATTR, "");
+}
 /**
 * Remove empty spans left behind after stripping `mso-*` styles. Only truly
 * empty spans are removed (whitespace-only spans are kept so word-separating
@@ -144,12 +156,13 @@ function cleanPastedHtml(html) {
 	if (!html) return html;
 	try {
 		let cleaned = stripHtmlComments(html);
-		cleaned = cleaned.replace(XML_PROCESSING_INSTRUCTION, "");
+		cleaned = stripXmlDeclarations(cleaned);
 		cleaned = cleaned.replace(NAMESPACED_TAG, "");
 		cleaned = cleaned.replace(STRAY_XML_TAG, "");
 		cleaned = cleaned.replace(NOISE_TAG, "");
 		cleaned = stripMsoStyles(cleaned);
 		cleaned = stripEmptySpans(cleaned);
+		cleaned = stripForeignTextBoxAnchors(cleaned, html);
 		return cleaned.trim();
 	} catch {
 		return html;

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

@@ -1,11 +1,37 @@
 import { expectHyperlinkMarkAttrs } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
 import { isMarkActive } from "./markUtils.js";
+import { normalizeUserUrl, sanitizeExternalUrl } from "../../../utils/urlSecurity.js";
 import { panic } from "better-result";
 //#region src/prosemirror/extensions/marks/HyperlinkExtension.ts
 /**
 * Hyperlink Mark Extension
 */
+/**
+* Sanitize an href arriving from (or being emitted to) the DOM: pasted HTML,
+* clipboard content, or a mark attr already stored on the document. Only
+* allow-listed absolute URLs (http/https/mailto/tel) and internal bookmark
+* anchors survive; everything else (javascript:, data:, file:, ...) becomes
+* an empty href, matching how the codebase already signals "no link" for an
+* unresolved hyperlink (see `toProseDoc.ts`'s `hyperlink.href || ""`).
+*/
+function sanitizeStoredHref(rawHref) {
+	if (!rawHref) return "";
+	const trimmed = rawHref.trim();
+	if (trimmed.startsWith("#")) return trimmed;
+	return sanitizeExternalUrl(trimmed) ?? "";
+}
+/**
+* Normalize/sanitize a URL typed by a user (hyperlink dialog/popup) before it
+* is written into a mark. Protocol-less input (e.g. "example.com") is
+* accepted and normalized to https; anything resolving to a disallowed
+* scheme is dropped.
+*/
+function normalizeHyperlinkInput(rawHref) {
+	const trimmed = rawHref.trim();
+	if (trimmed.startsWith("#")) return trimmed;
+	return normalizeUserUrl(trimmed);
+}
 function isHyperlinkActive(state) {
 	const hlType = state.schema.marks["hyperlink"];
 	if (!hlType) return false;
@@ -62,14 +88,14 @@ const HyperlinkExtension = createMarkExtension({
 		parseDOM: [{
 			tag: "a[href]",
 			getAttrs: (dom) => ({
-				href: dom.getAttribute("href") ?? "",
+				href: sanitizeStoredHref(dom.getAttribute("href") ?? void 0),
 				tooltip: dom.getAttribute("title") ?? void 0
 			})
 		}],
 		toDOM(mark) {
 			const { href, tooltip } = expectHyperlinkMarkAttrs(mark);
 			const domAttrs = {
-				href,
+				href: sanitizeStoredHref(href),
 				target: "_blank",
 				rel: "noopener noreferrer"
 			};
@@ -89,7 +115,7 @@ const HyperlinkExtension = createMarkExtension({
 			if (empty) return false;
 			if (dispatch) {
 				const mark = hlType.create({
-					href,
+					href: normalizeHyperlinkInput(href),
 					tooltip: tooltip || null
 				});
 				let tr = state.tr.addMark(from, to, mark);
@@ -127,7 +153,7 @@ const HyperlinkExtension = createMarkExtension({
 		const insertHyperlink = (text, href, tooltip) => (state, dispatch) => {
 			if (dispatch) {
 				const mark = hlType.create({
-					href,
+					href: normalizeHyperlinkInput(href),
 					tooltip: tooltip || null
 				});
 				const textNode = state.schema.text(text, [mark]);

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

@@ -18,6 +18,20 @@ import { AUTHOR_COLORS, getAuthorColorIdx } from "../../../utils/authorColors.js
 const insertionStyle = (color) => `color: ${color}; text-decoration: underline; text-decoration-color: ${color};`;
 const deletionStyle = (color) => `color: ${color}; text-decoration: line-through; text-decoration-color: ${color};`;
 /**
+* Suggested (AI-proposed) tracked changes reuse the insertion/deletion visual
+* grammar but with a DOTTED stroke and a dedicated suggestion hue, kept
+* distinct from the per-author redline colors. The hue and tint are driven by
+* the `--suggestion-color` / `--suggestion-bg` CSS custom properties (see
+* editor.css); the inline fallbacks below keep the paged-canvas projection —
+* which reuses this same `toDOM` style string — legible when the stylesheet
+* variables are not in scope.
+*/
+const SUGGESTION_COLOR = "var(--suggestion-color, #6d3bd6)";
+const SUGGESTION_TINT = "var(--suggestion-bg, color-mix(in oklch, #6d3bd6 12%, transparent))";
+const SUGGESTION_TINT_LAYER = `linear-gradient(${SUGGESTION_TINT}, ${SUGGESTION_TINT})`;
+const suggestedInsertionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: underline; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
+const suggestedDeletionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: line-through; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
+/**
 * Insertion mark — text added in tracked changes
 * Renders with per-author colored underline.
 */
@@ -29,7 +43,10 @@ const InsertionExtension = createMarkExtension({
 			revisionId: { default: 0 },
 			author: { default: "" },
 			date: { default: null },
-			moveKind: { default: null }
+			moveKind: { default: null },
+			initials: { default: null },
+			provenance: { default: "user" },
+			suggestionId: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
@@ -43,20 +60,23 @@ const InsertionExtension = createMarkExtension({
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
+			const suggested = provenance === "suggested";
 			return [
 				"span",
 				{
-					class: "docx-insertion",
+					class: suggested ? "docx-insertion docx-insertion--suggested" : "docx-insertion",
 					"data-revision-id": String(revisionId),
 					"data-author": author,
 					"data-tc-author-idx": String(idx),
+					...suggested ? { "data-provenance": "suggested" } : {},
+					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
-					...titleParts.length > 0 ? { title: `Inserted: ${titleParts.join(", ")}` } : {},
-					style: insertionStyle(color)
+					...titleParts.length > 0 ? { title: `${suggested ? "Suggested" : "Inserted"}: ${titleParts.join(", ")}` } : {},
+					style: suggested ? suggestedInsertionStyle() : insertionStyle(color)
 				},
 				0
 			];
@@ -75,7 +95,10 @@ const DeletionExtension = createMarkExtension({
 			revisionId: { default: 0 },
 			author: { default: "" },
 			date: { default: null },
-			moveKind: { default: null }
+			moveKind: { default: null },
+			initials: { default: null },
+			provenance: { default: "user" },
+			suggestionId: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
@@ -89,20 +112,23 @@ const DeletionExtension = createMarkExtension({
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
+			const suggested = provenance === "suggested";
 			return [
 				"span",
 				{
-					class: "docx-deletion",
+					class: suggested ? "docx-deletion docx-deletion--suggested" : "docx-deletion",
 					"data-revision-id": String(revisionId),
 					"data-author": author,
 					"data-tc-author-idx": String(idx),
+					...suggested ? { "data-provenance": "suggested" } : {},
+					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
-					...titleParts.length > 0 ? { title: `Deleted: ${titleParts.join(", ")}` } : {},
-					style: deletionStyle(color)
+					...titleParts.length > 0 ? { title: `${suggested ? "Suggested deletion" : "Deleted"}: ${titleParts.join(", ")}` } : {},
+					style: suggested ? suggestedDeletionStyle() : deletionStyle(color)
 				},
 				0
 			];
@@ -120,13 +146,23 @@ const RunPropertyChangeExtension = createMarkExtension({
 	name: "runPropertyChange",
 	schemaMarkName: "runPropertyChange",
 	markSpec: {
-		attrs: { changes: { default: [] } },
+		attrs: {
+			changes: { default: [] },
+			provenance: { default: "user" },
+			suggestionId: { default: null }
+		},
 		inclusive: false,
 		parseDOM: [{ tag: "span.docx-run-property-change" }],
-		toDOM() {
+		toDOM(mark) {
+			const suggested = mark.attrs["provenance"] === "suggested";
+			const suggestionId = mark.attrs["suggestionId"];
 			return [
 				"span",
-				{ class: "docx-run-property-change" },
+				{
+					class: suggested ? "docx-run-property-change docx-run-property-change--suggested" : "docx-run-property-change",
+					...suggested ? { "data-provenance": "suggested" } : {},
+					...suggested && typeof suggestionId === "string" ? { "data-suggestion-id": suggestionId } : {}
+				},
 				0
 			];
 		}

package/dist/prosemirror/extensions/nodes/TableExtension.d.ts

@@ -1,5 +1,5 @@
-import { AnyExtension, Extension, NodeExtension } from "../types.js";
 import { ColorValue } from "../../../types/colors.js";
+import { AnyExtension, Extension, NodeExtension } from "../types.js";
 import { Command, EditorState } from "prosemirror-state";
 import { Node } from "prosemirror-model";
 

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -1,7 +1,7 @@
 import { TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_WIDTH_TYPE_VALUES } from "../../../types/documentEnumValues.js";
 import { expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs } from "../../attrs/index.js";
 import { createExtension, createNodeExtension } from "../create.js";
-import { resolveColor } from "../../../utils/colorResolver.js";
+import { isValidHexColor, resolveColor } from "../../../utils/colorResolver.js";
 import { panic } from "better-result";
 import { CellSelection, TableMap, columnResizing, mergeCells, removeRow, selectedRect, splitCell, tableEditing } from "prosemirror-tables";
 import { Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
@@ -127,7 +127,8 @@ function parseCellAttrsFromDOM(element) {
 	const margins = extractCellMarginsFromCSS(style);
 	const rawValign = element.dataset["valign"];
 	const verticalAlign = (rawValign === "top" || rawValign === "center" || rawValign === "bottom" ? rawValign : void 0) ?? mapCssVerticalAlign(style.verticalAlign) ?? void 0;
-	const backgroundColor = element.dataset["bgcolor"] || parseCssColorToHex(style.backgroundColor) || void 0;
+	const rawBgColor = element.dataset["bgcolor"];
+	const backgroundColor = (isValidHexColor(rawBgColor) ? rawBgColor : void 0) || parseCssColorToHex(style.backgroundColor) || void 0;
 	return {
 		colspan: Number(element.getAttribute("colspan") ?? "1") || 1,
 		rowspan: Number(element.getAttribute("rowspan") ?? "1") || 1,
@@ -154,7 +155,8 @@ const tableSpec = {
 		borders: { default: null },
 		_resolvedIndent: { default: null },
 		_originalFormatting: { default: null },
-		tblPrChange: { default: null }
+		tblPrChange: { default: null },
+		_suggestedInsert: { default: null }
 	},
 	parseDOM: [{
 		tag: "table",

package/dist/prosemirror/index.d.ts

@@ -1,5 +1,5 @@
-import { ImageAttrs, ParagraphAttrs } from "./schema/nodes.js";
 import { FontFamilyAttrs, FontSizeAttrs, HyperlinkAttrs, TextColorAttrs, UnderlineAttrs } from "./schema/marks.js";
+import { ImageAttrs, ParagraphAttrs } from "./schema/nodes.js";
 import { schema, singletonManager } from "./schema/index.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
 import { clearFormatting, getMarkAttr, isMarkActive } from "./extensions/marks/markUtils.js";

package/dist/prosemirror/index.js

@@ -1,5 +1,4 @@
 import { assertValidProseMirrorDocument, formatProseMirrorDocumentIssues, validateProseMirrorDocument } from "./validation.js";
-import { fromProseDoc, updateDocumentContent } from "./conversion/fromProseDoc.js";
 import { StyleResolver, createStyleResolver } from "./styles/styleResolver.js";
 import { getParagraphAlignment, getParagraphBidi, getStyleId } from "./extensions/core/ParagraphExtension.js";
 import { createDocumentStylesPlugin, documentStylesKey, getDocumentStyleResolver } from "./plugins/documentStyles.js";
@@ -11,6 +10,7 @@ import { createSelectionTrackerPlugin, extractSelectionContext, getSelectionCont
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "./extensions/marks/HyperlinkExtension.js";
 import { schema, singletonManager } from "./schema/index.js";
 import { createEmptyDoc, toProseDoc } from "./conversion/toProseDoc.js";
+import { fromProseDoc, updateDocumentContent } from "./conversion/fromProseDoc.js";
 import { addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyTableStyle, autoFitContents, deleteColumn, deleteRow, deleteTable, distributeColumns, insertTable, mergeCells, removeTableBorders, selectColumn, selectRow, selectTable, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setInsideTableBorders, setOutsideTableBorders, setRowHeight, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, splitCell, toggleHeaderRow, toggleNoWrap } from "./commands/table.js";
 import { extractSelectionState } from "./selectionState.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./commands/formatting.js";

package/dist/prosemirror/plugins/contentControlWidgets.d.ts

@@ -1,4 +1,4 @@
-import { ContentControlLockedError, ContentControlTypeError } from "../../content-controls/errors.js";
+import { ContentControlBoundError, ContentControlLockedError, ContentControlTypeError } from "../../content-controls/errors.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 
@@ -33,7 +33,7 @@ type ContentControlWidgetEvent = {
   pmPos: number;
   sdtType: string;
   anchor: ContentControlWidgetAnchor;
-  error: ContentControlLockedError | ContentControlTypeError;
+  error: ContentControlLockedError | ContentControlTypeError | ContentControlBoundError;
 };
 type ContentControlWidgetCallback = (event: ContentControlWidgetEvent) => void;
 type ContentControlWidgetClickEvent = {