@stll/folio-core 0.11.0 → 0.13.0

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

@@ -1,10 +1,10 @@
 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 { Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
 import { CellSelection, TableMap, columnResizing, mergeCells, removeRow, selectedRect, splitCell, tableEditing } from "prosemirror-tables";
+import { Plugin, PluginKey, Selection, TextSelection } from "prosemirror-state";
 import { Decoration, DecorationSet } from "prosemirror-view";
 //#region src/prosemirror/extensions/nodes/TableExtension.ts
 /**
@@ -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",
@@ -190,7 +192,7 @@ const tableSpec = {
 	}
 };
 const tableRowSpec = {
-	content: "(tableCell | tableHeader)+",
+	content: "(tableCell | tableHeader)*",
 	tableRole: "row",
 	attrs: {
 		height: { default: null },
@@ -198,7 +200,9 @@ const tableRowSpec = {
 		isHeader: { default: false },
 		hidden: { default: false },
 		_originalFormatting: { default: null },
-		trPrChange: { default: null }
+		trPrChange: { default: null },
+		trIns: { default: null },
+		trDel: { default: null }
 	},
 	parseDOM: [{ tag: "tr" }],
 	toDOM(node) {
@@ -315,8 +319,10 @@ const tableCellSpec = {
 		margins: { default: null },
 		textDirection: { default: null },
 		noWrap: { default: false },
+		hideMark: { default: false },
 		_originalFormatting: { default: null },
 		tcPrChange: { default: null },
+		cellMarker: { default: null },
 		_preserveVMergeRestart: { default: null },
 		_docxVMergeContinuationCells: { default: null }
 	},
@@ -369,8 +375,10 @@ const tableHeaderSpec = {
 		margins: { default: null },
 		textDirection: { default: null },
 		noWrap: { default: false },
+		hideMark: { default: false },
 		_originalFormatting: { default: null },
 		tcPrChange: { default: null },
+		cellMarker: { default: null },
 		_preserveVMergeRestart: { default: null },
 		_docxVMergeContinuationCells: { default: null }
 	},

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

@@ -0,0 +1,13 @@
+import { NodeExtension } from "../types.js";
+
+//#region src/prosemirror/extensions/nodes/TextBoxAnchorExtension.d.ts
+/**
+ * Zero-width inline anchor for a text box extracted to a sibling PM block.
+ *
+ * Keeping the anchor in the paragraph lets ordinary ProseMirror transactions
+ * map its position as surrounding text is edited. The save conversion consumes
+ * it when the sibling text box is restored to the DOCX run stream.
+ */
+declare const TextBoxAnchorExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
+//#endregion
+export { TextBoxAnchorExtension };

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

@@ -0,0 +1,41 @@
+import { expectTextBoxAnchorAttrs } from "../../textBoxAnchorAttrs.js";
+import { createNodeExtension } from "../create.js";
+//#region src/prosemirror/extensions/nodes/TextBoxAnchorExtension.ts
+/**
+* Zero-width inline anchor for a text box extracted to a sibling PM block.
+*
+* Keeping the anchor in the paragraph lets ordinary ProseMirror transactions
+* map its position as surrounding text is edited. The save conversion consumes
+* it when the sibling text box is restored to the DOCX run stream.
+*/
+const TextBoxAnchorExtension = createNodeExtension({
+	name: "textBoxAnchor",
+	schemaNodeName: "textBoxAnchor",
+	nodeSpec: {
+		inline: true,
+		group: "inline",
+		marks: "_",
+		atom: true,
+		selectable: false,
+		attrs: { anchorId: {} },
+		parseDOM: [{
+			tag: "span[data-docx-textbox-anchor]",
+			getAttrs(dom) {
+				if (!(dom instanceof HTMLElement)) return false;
+				const anchorId = dom.dataset["docxTextboxAnchor"];
+				return anchorId ? { anchorId } : false;
+			}
+		}],
+		toDOM(node) {
+			const { anchorId } = expectTextBoxAnchorAttrs(node);
+			return ["span", {
+				"data-docx-textbox-anchor": anchorId,
+				"aria-hidden": "true",
+				contenteditable: "false",
+				style: "display: inline-block; width: 0; height: 0; overflow: hidden; pointer-events: none;"
+			}];
+		}
+	}
+});
+//#endregion
+export { TextBoxAnchorExtension };

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

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../../../types/document.js";
 import { OutlineStyleAttr } from "../../../types/documentEnumValues.js";
 import { NodeExtension } from "../types.js";
-import { ImagePositionAttrs } from "../../schema/nodes.js";
+import { ImagePositionAttrs, TextBoxAttrs as TextBoxAttrs$1 } from "../../schema/nodes.js";
 
 //#region src/prosemirror/extensions/nodes/TextBoxExtension.d.ts
 type TextBoxAttrs = {
@@ -28,7 +28,10 @@ type TextBoxAttrs = {
   distRight?: number; /** Position for floating/anchored text boxes. */
   position?: ImagePositionAttrs; /** Original DOCX placement hint for save-path reconstruction. */
   _docxPlacement?: "standalone" | "inlineWithPrevious"; /** Original DOCX paragraph group for standalone text-box reconstruction. */
-  _docxGroupId?: string;
+  _docxGroupId?: string; /** Inline anchor linking this block node to its source run position. */
+  _docxAnchorId?: string; /** Original run-level revision wrapper for save-path reconstruction. */
+  _docxTrackedChange?: TextBoxAttrs$1["_docxTrackedChange"]; /** Original inline content-control ancestry for save-path reconstruction. */
+  _docxInlineSdts?: TextBoxAttrs$1["_docxInlineSdts"];
 };
 declare const TextBoxExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
 //#endregion

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

@@ -50,7 +50,10 @@ const TextBoxExtension = createNodeExtension({
 			distRight: { default: null },
 			position: { default: null },
 			_docxPlacement: { default: null },
-			_docxGroupId: { default: null }
+			_docxGroupId: { default: null },
+			_docxAnchorId: { default: null },
+			_docxTrackedChange: { default: null },
+			_docxInlineSdts: { default: null }
 		},
 		parseDOM: [{
 			tag: "div.docx-textbox",

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,20 +1,26 @@
-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";
 
 //#region src/prosemirror/plugins/contentControlWidgets.d.ts
+type ContentControlWidgetAnchor = {
+  getBoundingClientRect: () => {
+    bottom: number;
+    left: number;
+  };
+};
 type ContentControlWidgetEvent = {
   kind: "dropdownOpen";
   tag: string; /** PM position of the clicked SDT instance — disambiguates duplicates. */
   pmPos: number;
   sdtType: "dropdown" | "comboBox";
-  anchor: HTMLElement;
+  anchor: ContentControlWidgetAnchor;
   listItemsJson: string | undefined;
 } | {
   kind: "datePick";
   tag: string;
   pmPos: number;
-  anchor: HTMLElement;
+  anchor: ContentControlWidgetAnchor;
   currentValue: string | undefined;
 } | {
   /**
@@ -26,21 +32,41 @@ type ContentControlWidgetEvent = {
   tag: string;
   pmPos: number;
   sdtType: string;
-  anchor: HTMLElement;
-  error: ContentControlLockedError | ContentControlTypeError;
+  anchor: ContentControlWidgetAnchor;
+  error: ContentControlLockedError | ContentControlTypeError | ContentControlBoundError;
 };
 type ContentControlWidgetCallback = (event: ContentControlWidgetEvent) => void;
+type ContentControlWidgetClickEvent = {
+  preventDefault: () => void;
+  target: unknown;
+};
+type ContentControlWidgetView = Pick<EditorView, "dispatch" | "state">;
+type HandleContentControlWidgetClickOptions = {
+  event: ContentControlWidgetClickEvent;
+  onEvent: ContentControlWidgetCallback;
+  view: ContentControlWidgetView;
+};
 declare const contentControlWidgetsPluginKey: PluginKey<unknown>;
 /**
  * CustomEvent name dispatched on the editor view DOM whenever the plugin
- * needs to surface a `ContentControlWidgetEvent` to the React shell. The
- * shell subscribes via `addEventListener` and renders the matching chrome.
+ * needs to surface a `ContentControlWidgetEvent` to an adapter shell. The
+ * adapter subscribes via `addEventListener` and renders the matching chrome.
  *
- * Using a CustomEvent keeps the plugin from owning a React reference and
- * makes the host's responsibility explicit: receive event → render UI →
+ * Using a CustomEvent keeps the plugin framework-neutral and makes the
+ * adapter's responsibility explicit: receive event → render UI →
  * call dispatchDropdownPick / dispatchDatePick.
  */
 declare const CONTENT_CONTROL_WIDGET_EVENT_NAME = "folio:content-control-widget";
+/**
+ * Interpret one click from either the live ProseMirror DOM or the painted page
+ * tree. Both surfaces carry the same `data-sdt-*` projection, so adapters only
+ * need to forward the click and render the resulting typed event.
+ */
+declare const handleContentControlWidgetClick: ({
+  event,
+  onEvent,
+  view
+}: HandleContentControlWidgetClickOptions) => boolean;
 declare function createContentControlWidgetsPlugin(onEvent?: ContentControlWidgetCallback): Plugin;
 /**
  * Stable resolver helpers exposed for the UI shell so a popover menu or
@@ -53,4 +79,4 @@ declare function createContentControlWidgetsPlugin(onEvent?: ContentControlWidge
 declare function dispatchDropdownPick(view: EditorView, pmPos: number, value: string): boolean;
 declare function dispatchDatePick(view: EditorView, pmPos: number, date: string): boolean;
 //#endregion
-export { CONTENT_CONTROL_WIDGET_EVENT_NAME, ContentControlWidgetCallback, ContentControlWidgetEvent, contentControlWidgetsPluginKey, createContentControlWidgetsPlugin, dispatchDatePick, dispatchDropdownPick };
+export { CONTENT_CONTROL_WIDGET_EVENT_NAME, ContentControlWidgetAnchor, ContentControlWidgetCallback, ContentControlWidgetEvent, contentControlWidgetsPluginKey, createContentControlWidgetsPlugin, dispatchDatePick, dispatchDropdownPick, handleContentControlWidgetClick };

package/dist/prosemirror/plugins/contentControlWidgets.js

@@ -1,4 +1,4 @@
-import { ContentControlLockedError, ContentControlTypeError } from "../../content-controls/errors.js";
+import { ContentControlBoundError, ContentControlLockedError, ContentControlTypeError } from "../../content-controls/errors.js";
 import { findBlockSdtMatch, setContentControlValueTr } from "../commands/contentControls.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/contentControlWidgets.ts
@@ -19,18 +19,129 @@ import { Plugin, PluginKey } from "prosemirror-state";
 const contentControlWidgetsPluginKey = new PluginKey("contentControlWidgets");
 /**
 * CustomEvent name dispatched on the editor view DOM whenever the plugin
-* needs to surface a `ContentControlWidgetEvent` to the React shell. The
-* shell subscribes via `addEventListener` and renders the matching chrome.
+* needs to surface a `ContentControlWidgetEvent` to an adapter shell. The
+* adapter subscribes via `addEventListener` and renders the matching chrome.
 *
-* Using a CustomEvent keeps the plugin from owning a React reference and
-* makes the host's responsibility explicit: receive event → render UI →
+* Using a CustomEvent keeps the plugin framework-neutral and makes the
+* adapter's responsibility explicit: receive event → render UI →
 * call dispatchDropdownPick / dispatchDatePick.
 */
 const CONTENT_CONTROL_WIDGET_EVENT_NAME = "folio:content-control-widget";
-function findSdtAncestor(target) {
-	if (!(target instanceof Element)) return null;
-	return target.closest("[data-sdt-type]");
-}
+const SDT_DATASET_KEY = {
+	checked: "sdtChecked",
+	listItems: "sdtListItems",
+	pmPos: "sdtPmPos",
+	tag: "sdtTag",
+	type: "sdtType"
+};
+const SDT_TYPE = {
+	checkbox: "checkbox",
+	comboBox: "comboBox",
+	date: "date",
+	dropdown: "dropdown"
+};
+const SDT_TYPE_SELECTOR = "[data-sdt-type]";
+const findClosest = (target, selector) => {
+	if (typeof target !== "object" || target === null || !("closest" in target) || typeof target.closest !== "function") return null;
+	return target.closest(selector);
+};
+const isContentControlWidgetElement = (value) => {
+	if (typeof value !== "object" || value === null || !("dataset" in value) || typeof value.dataset !== "object" || value.dataset === null || !("getBoundingClientRect" in value) || typeof value.getBoundingClientRect !== "function") return false;
+	return true;
+};
+const findSdtAncestor = (target) => {
+	const candidate = findClosest(target, SDT_TYPE_SELECTOR);
+	return isContentControlWidgetElement(candidate) ? candidate : null;
+};
+/**
+* Interpret one click from either the live ProseMirror DOM or the painted page
+* tree. Both surfaces carry the same `data-sdt-*` projection, so adapters only
+* need to forward the click and render the resulting typed event.
+*/
+const handleContentControlWidgetClick = ({ event, onEvent, view }) => {
+	const anchor = findSdtAncestor(event.target);
+	if (!anchor) return false;
+	const tag = anchor.dataset[SDT_DATASET_KEY.tag] ?? "";
+	const sdtType = anchor.dataset[SDT_DATASET_KEY.type];
+	const pmPosRaw = anchor.dataset[SDT_DATASET_KEY.pmPos];
+	const pmPos = pmPosRaw ? Number.parseInt(pmPosRaw, 10) : NaN;
+	if (!sdtType || Number.isNaN(pmPos)) return false;
+	try {
+		if (sdtType === SDT_TYPE.checkbox) {
+			const current = anchor.dataset[SDT_DATASET_KEY.checked] === "true";
+			const tr = setContentControlValueTr(view.state, { pmPos }, {
+				kind: SDT_TYPE.checkbox,
+				checked: !current
+			});
+			if (tr) {
+				view.dispatch(tr);
+				event.preventDefault();
+				return true;
+			}
+		} else if (sdtType === SDT_TYPE.dropdown || sdtType === SDT_TYPE.comboBox) {
+			const refusal = lockRefusalFor(view, pmPos);
+			if (refusal) {
+				onEvent({
+					kind: "refused",
+					tag,
+					pmPos,
+					sdtType,
+					anchor,
+					error: refusal
+				});
+				event.preventDefault();
+				return true;
+			}
+			onEvent({
+				kind: "dropdownOpen",
+				tag,
+				pmPos,
+				sdtType,
+				anchor,
+				listItemsJson: anchor.dataset[SDT_DATASET_KEY.listItems]
+			});
+			event.preventDefault();
+			return true;
+		} else if (sdtType === SDT_TYPE.date) {
+			const refusal = lockRefusalFor(view, pmPos);
+			if (refusal) {
+				onEvent({
+					kind: "refused",
+					tag,
+					pmPos,
+					sdtType,
+					anchor,
+					error: refusal
+				});
+				event.preventDefault();
+				return true;
+			}
+			onEvent({
+				kind: "datePick",
+				tag,
+				pmPos,
+				anchor,
+				currentValue: findBlockSdtMatch(view.state.doc, { pmPos })?.node.textContent
+			});
+			event.preventDefault();
+			return true;
+		}
+	} catch (error) {
+		if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError || error instanceof ContentControlBoundError) {
+			onEvent({
+				kind: "refused",
+				tag,
+				pmPos,
+				sdtType,
+				anchor,
+				error
+			});
+			return true;
+		}
+		throw error;
+	}
+	return false;
+};
 function createContentControlWidgetsPlugin(onEvent = () => void 0) {
 	const emit = (view, payload) => {
 		onEvent(payload);
@@ -42,88 +153,11 @@ function createContentControlWidgetsPlugin(onEvent = () => void 0) {
 	return new Plugin({
 		key: contentControlWidgetsPluginKey,
 		props: { handleDOMEvents: { click(view, event) {
-			const anchor = findSdtAncestor(event.target);
-			if (!anchor) return false;
-			const tag = anchor.dataset["sdtTag"] ?? "";
-			const sdtType = anchor.dataset["sdtType"];
-			const pmPosRaw = anchor.dataset["sdtPmPos"];
-			const pmPos = pmPosRaw ? Number.parseInt(pmPosRaw, 10) : NaN;
-			if (!sdtType || Number.isNaN(pmPos)) return false;
-			try {
-				if (sdtType === "checkbox") {
-					const current = anchor.dataset["sdtChecked"] === "true";
-					const tr = setContentControlValueTr(view.state, { pmPos }, {
-						kind: "checkbox",
-						checked: !current
-					});
-					if (tr) {
-						view.dispatch(tr);
-						event.preventDefault();
-						return true;
-					}
-				} else if (sdtType === "dropdown" || sdtType === "comboBox") {
-					const refusal = lockRefusalFor(view, pmPos);
-					if (refusal) {
-						emit(view, {
-							kind: "refused",
-							tag,
-							pmPos,
-							sdtType,
-							anchor,
-							error: refusal
-						});
-						event.preventDefault();
-						return true;
-					}
-					emit(view, {
-						kind: "dropdownOpen",
-						tag,
-						pmPos,
-						sdtType,
-						anchor,
-						listItemsJson: anchor.dataset["sdtListItems"]
-					});
-					event.preventDefault();
-					return true;
-				} else if (sdtType === "date") {
-					const refusal = lockRefusalFor(view, pmPos);
-					if (refusal) {
-						emit(view, {
-							kind: "refused",
-							tag,
-							pmPos,
-							sdtType,
-							anchor,
-							error: refusal
-						});
-						event.preventDefault();
-						return true;
-					}
-					emit(view, {
-						kind: "datePick",
-						tag,
-						pmPos,
-						anchor,
-						currentValue: void 0
-					});
-					event.preventDefault();
-					return true;
-				}
-			} catch (error) {
-				if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError) {
-					emit(view, {
-						kind: "refused",
-						tag,
-						pmPos,
-						sdtType,
-						anchor,
-						error
-					});
-					return true;
-				}
-				throw error;
-			}
-			return false;
+			return handleContentControlWidgetClick({
+				view,
+				event,
+				onEvent: (payload) => emit(view, payload)
+			});
 		} } },
 		view() {
 			return {};
@@ -149,7 +183,7 @@ function dispatchDropdownPick(view, pmPos, value) {
 		view.dispatch(tr);
 		return true;
 	} catch (error) {
-		if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError) return false;
+		if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError || error instanceof ContentControlBoundError) return false;
 		throw error;
 	}
 }
@@ -163,7 +197,7 @@ function dispatchDatePick(view, pmPos, date) {
 		view.dispatch(tr);
 		return true;
 	} catch (error) {
-		if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError) return false;
+		if (error instanceof ContentControlLockedError || error instanceof ContentControlTypeError || error instanceof ContentControlBoundError) return false;
 		throw error;
 	}
 }
@@ -189,4 +223,4 @@ function lockRefusalFor(view, pmPos) {
 	});
 }
 //#endregion
-export { CONTENT_CONTROL_WIDGET_EVENT_NAME, contentControlWidgetsPluginKey, createContentControlWidgetsPlugin, dispatchDatePick, dispatchDropdownPick };
+export { CONTENT_CONTROL_WIDGET_EVENT_NAME, contentControlWidgetsPluginKey, createContentControlWidgetsPlugin, dispatchDatePick, dispatchDropdownPick, handleContentControlWidgetClick };

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

@@ -0,0 +1,23 @@
+import { Node } from "prosemirror-model";
+
+//#region src/prosemirror/plugins/revisionIds.d.ts
+/**
+ * Mint the next tracked-revision id (`w:id`). Strictly monotonic per realm,
+ * and always inside the range serialized `w:id` may occupy.
+ */
+declare function mintRevisionId(): number;
+/**
+ * Raise the counter above `maxId` so freshly minted ids cannot collide with
+ * ids already present in a loaded document. Only ever raises.
+ *
+ * `maxId` is derived from file content, so it is untrusted: a malformed or
+ * out-of-range value is ignored outright rather than folded into range.
+ */
+declare function seedRevisionIdsAbove(maxId: number): void;
+/**
+ * Raise the counter above every revision id already present in `doc`.
+ * Called from the suggestion-mode plugin's `state.init`.
+ */
+declare function seedRevisionIdsFromDoc(doc: Node): void;
+//#endregion
+export { mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/plugins/revisionIds.js

@@ -0,0 +1,57 @@
+import { MAX_REVISION_ID } from "@stll/docx-core/model";
+//#region src/prosemirror/plugins/revisionIds.ts
+/**
+* Next id to hand out. Starts at 1 (0 is the serializer's "unusable metadata"
+* fallback) and is raised past a loaded document's existing ids by
+* `seedRevisionIdsAbove`.
+*
+* NOT seeded from a clock. `Date.now()` (~1.8e12) overflows the signed 32-bit
+* int consumers read `w:id` into.
+*/
+let counter = 1;
+/**
+* Mint the next tracked-revision id (`w:id`). Strictly monotonic per realm,
+* and always inside the range serialized `w:id` may occupy.
+*/
+function mintRevisionId() {
+	if (counter > MAX_REVISION_ID) counter = 1;
+	return counter++;
+}
+/**
+* Raise the counter above `maxId` so freshly minted ids cannot collide with
+* ids already present in a loaded document. Only ever raises.
+*
+* `maxId` is derived from file content, so it is untrusted: a malformed or
+* out-of-range value is ignored outright rather than folded into range.
+*/
+function seedRevisionIdsAbove(maxId) {
+	if (!Number.isInteger(maxId) || maxId < 0 || maxId >= MAX_REVISION_ID) return;
+	if (maxId >= counter) counter = maxId + 1;
+}
+/** Node attrs that carry a revision id directly (`revisionId` field). */
+const DIRECT_REVISION_ATTR_KEYS = ["trIns", "trDel"];
+/**
+* Raise the counter above every revision id already present in `doc`.
+* Called from the suggestion-mode plugin's `state.init`.
+*/
+function seedRevisionIdsFromDoc(doc) {
+	let max = 0;
+	const consider = (id) => {
+		if (typeof id === "number" && Number.isInteger(id) && id > max && id <= MAX_REVISION_ID) max = id;
+	};
+	doc.descendants((node) => {
+		for (const mark of node.marks) consider(mark.attrs["revisionId"]);
+		const attrs = node.attrs;
+		const pPrMark = attrs["pPrMark"];
+		if (pPrMark?.info) consider(pPrMark.info.id);
+		for (const key of DIRECT_REVISION_ATTR_KEYS) {
+			const value = attrs[key];
+			if (value) consider(value.revisionId);
+		}
+		const cellMarker = attrs["cellMarker"];
+		if (cellMarker?.info) consider(cellMarker.info.revisionId);
+	});
+	seedRevisionIdsAbove(max);
+}
+//#endregion
+export { mintRevisionId, seedRevisionIdsAbove, seedRevisionIdsFromDoc };

package/dist/prosemirror/plugins/selectionTracker.js

@@ -36,6 +36,7 @@ function extractSelectionContext(state) {
 			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
 			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
 		}
+		if (typeof paragraph.attrs["snapToGrid"] === "boolean") paragraphFormatting.snapToGrid = paragraph.attrs["snapToGrid"];
 		if (paragraph.attrs["indentLeft"]) paragraphFormatting.indentLeft = paragraph.attrs["indentLeft"];
 		if (paragraph.attrs["indentRight"]) paragraphFormatting.indentRight = paragraph.attrs["indentRight"];
 		if (paragraph.attrs["indentFirstLine"]) paragraphFormatting.indentFirstLine = paragraph.attrs["indentFirstLine"];

package/dist/prosemirror/plugins/suggestionMode.js

@@ -1,6 +1,7 @@
 import { splitBlockClearBorders } from "../extensions/features/BaseKeymapExtension.js";
-import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
+import { mintRevisionId, seedRevisionIdsFromDoc } from "./revisionIds.js";
 import { isHistoryTransaction } from "prosemirror-history";
+import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 //#region src/prosemirror/plugins/suggestionMode.ts
 /**
 * Suggestion Mode Plugin
@@ -17,10 +18,9 @@ import { isHistoryTransaction } from "prosemirror-history";
 const suggestionModeKey = new PluginKey("suggestionMode");
 const SUGGESTION_META = "suggestionModeApplied";
 const SUGGESTION_BYPASS_META = "suggestionModeBypass";
-let nextRevisionId = Date.now();
 function makeMarkAttrs(pluginState) {
 	return {
-		revisionId: nextRevisionId++,
+		revisionId: mintRevisionId(),
 		author: pluginState.author,
 		date: (/* @__PURE__ */ new Date()).toISOString()
 	};
@@ -340,7 +340,8 @@ function createSuggestionModePlugin(initialActive = false, author = "User") {
 	return new Plugin({
 		key: suggestionModeKey,
 		state: {
-			init() {
+			init(_config, instance) {
+				seedRevisionIdsFromDoc(instance.doc);
 				return {
 					active: initialActive,
 					author

package/dist/prosemirror/runFormattingMarkNames.d.ts

@@ -0,0 +1,14 @@
+//#region src/prosemirror/runFormattingMarkNames.d.ts
+/**
+ * Names of the marks that carry run-level (character) formatting.
+ *
+ * Single source of truth shared by every place that must swap a run's live
+ * formatting back to a previously recorded set: rejecting a `runPropertyChange`
+ * (commands/comments.ts) and stripping a *suggested* `runPropertyChange` at the
+ * serialization boundary (conversion/fromProseDoc.ts). Keeping one list makes
+ * it structurally impossible for the two paths to drift and let a formatting
+ * mark survive a revert.
+ */
+declare const RUN_FORMATTING_MARK_NAMES: Set<string>;
+//#endregion
+export { RUN_FORMATTING_MARK_NAMES };