@stll/folio-core 0.11.0 → 0.12.0

package/dist/prosemirror/plugins/contentControlWidgets.js

@@ -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) {
+			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 {};
@@ -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/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,6 @@
 import { splitBlockClearBorders } from "../extensions/features/BaseKeymapExtension.js";
-import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 import { isHistoryTransaction } from "prosemirror-history";
+import { Plugin, PluginKey, TextSelection } from "prosemirror-state";
 //#region src/prosemirror/plugins/suggestionMode.ts
 /**
 * Suggestion Mode Plugin

package/dist/prosemirror/schema/index.d.ts

@@ -1,6 +1,6 @@
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
 import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
 
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
@@ -12,4 +12,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

package/dist/prosemirror/schema/marks.d.ts

@@ -91,6 +91,10 @@ type TrackedChangeMarkAttrs = {
   date?: string;
   moveKind?: "moveTo" | "moveFrom";
 };
+/** Run-property revisions carried through the editable model. */
+type RunPropertyChangeMarkAttrs = {
+  changes: document_d_exports.RunPropertyChange[];
+};
 type RunFormattingOverrideAttrs = { [K in keyof Pick<document_d_exports.TextFormatting, "bold" | "italic" | "strike" | "doubleStrike" | "allCaps" | "smallCaps" | "hidden" | "emboss" | "imprint" | "shadow" | "outline" | "rtl">]?: false } & {
   underline?: "none";
 };
@@ -120,4 +124,4 @@ type HyperlinkAttrs = {
   _docxHyperlinkIndex?: number;
 };
 //#endregion
-export { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs };
+export { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs };

package/dist/prosemirror/schema/nodes.d.ts

@@ -21,8 +21,10 @@ type ParagraphAttrs = {
   spaceAfter?: number;
   lineSpacing?: number;
   lineSpacingRule?: document_d_exports.LineSpacingRule;
+  snapToGrid?: boolean;
   spacingExplicit?: SpacingExplicit; /** Layout provenance: document defaults survive on empty paragraphs. */
-  spacingFromDocDefaults?: SpacingExplicit;
+  spacingFromDocDefaults?: SpacingExplicit; /** Layout provenance: implicit default-style spacing survives on empty paragraphs. */
+  spacingFromImplicitDefaultStyle?: SpacingExplicit;
   indentLeft?: number;
   indentRight?: number;
   indentFirstLine?: number;
@@ -88,7 +90,8 @@ type ParagraphAttrs = {
   tabs?: document_d_exports.TabStop[];
   pageBreakBefore?: boolean; /** Word's cached rendered-page-break marker; preserved for round-trip only. */
   renderedPageBreakBefore?: boolean; /** Internal import marker for a paragraph whose only run content is a hard page break. */
-  _pageBreakCarrier?: boolean;
+  _pageBreakCarrier?: boolean; /** Internal import marker for a hard page break after this paragraph's text. */
+  _trailingPageBreak?: boolean;
   keepNext?: boolean;
   keepLines?: boolean;
   widowControl?: boolean; /** Contextual spacing — suppress space between same-style paragraphs */
@@ -337,7 +340,26 @@ 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?: {
+    type: "insertion";
+    info: document_d_exports.TrackedChangeInfo;
+  } | {
+    type: "deletion";
+    info: document_d_exports.TrackedChangeInfo;
+  } | {
+    type: "moveFrom";
+    info: document_d_exports.TrackedChangeInfo;
+  } | {
+    type: "moveTo";
+    info: document_d_exports.TrackedChangeInfo;
+  }; /** Original inline content-control ancestry for save-path reconstruction. */
+  _docxInlineSdts?: SdtAttrs[];
+};
+/** Internal inline position marker for an extracted text box block. */
+type TextBoxAnchorAttrs = {
+  anchorId: string;
 };
 /**
  * Table node attributes
@@ -371,7 +393,24 @@ type TableRowAttrs = {
   hidden?: boolean; /** Original row formatting from DOCX for lossless round-trip serialization */
   _originalFormatting?: document_d_exports.TableRowFormatting; /** Tracked row property changes (w:trPrChange) for round-trip + accept/reject */
   trPrChange?: document_d_exports.TableRowPropertyChange[];
-};
+} & ({
+  /** Tracked structural row insertion (w:trPr/w:ins). */trIns: {
+    revisionId: number;
+    author: string;
+    date?: string | null;
+  };
+  trDel?: never;
+} | {
+  trIns?: never; /** Tracked structural row deletion (w:trPr/w:del). */
+  trDel: {
+    revisionId: number;
+    author: string;
+    date?: string | null;
+  };
+} | {
+  trIns?: never;
+  trDel?: never;
+});
 /**
  * Table cell attributes
  */
@@ -385,7 +424,8 @@ type TableCellAttrs = {
   backgroundColor?: string; /** Resolved source color. PM-only; distinguishes theme rendering from a user override. */
   _resolvedBackgroundColor?: string; /** OOXML text direction (e.g. 'tbRl', 'btLr') */
   textDirection?: NonNullable<document_d_exports.TableCellFormatting["textDirection"]>; /** No text wrapping in cell */
-  noWrap?: boolean; /** Cell borders — full BorderSpec per side (style, color, size) */
+  noWrap?: boolean; /** Effective end-of-cell marker suppression (`w:hideMark`). */
+  hideMark?: boolean; /** Cell borders — full BorderSpec per side (style, color, size) */
   borders?: document_d_exports.TableCellBorders; /** Cell margins/padding in twips per side */
   margins?: {
     top?: number;
@@ -394,9 +434,26 @@ type TableCellAttrs = {
     right?: number;
   }; /** Original cell formatting from DOCX for lossless round-trip serialization */
   _originalFormatting?: document_d_exports.TableCellFormatting; /** Tracked cell property changes (w:tcPrChange) for round-trip + accept/reject */
-  tcPrChange?: document_d_exports.TableCellPropertyChange[]; /** Preserve a DOCX vMerge restart even when PM cannot model it as a rowspan. */
+  tcPrChange?: document_d_exports.TableCellPropertyChange[]; /** Tracked cell structural revision for round-trip + accept/reject. */
+  cellMarker?: {
+    kind: "ins" | "del";
+    info: {
+      revisionId: number;
+      author: string;
+      date?: string | null;
+    };
+  } | {
+    kind: "merge";
+    info: {
+      revisionId: number;
+      author: string;
+      date?: string | null;
+    };
+    verticalMerge?: "continue" | "rest";
+    verticalMergeOriginal?: "continue" | "rest";
+  }; /** Preserve a DOCX vMerge restart even when PM cannot model it as a rowspan. */
   _preserveVMergeRestart?: boolean; /** Original DOCX vMerge continuation cells skipped into this PM rowspan. */
   _docxVMergeContinuationCells?: document_d_exports.TableCell[];
 };
 //#endregion
-export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs };
+export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, SdtAttrs, ShapeAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };

package/dist/prosemirror/selectionState.js

@@ -71,6 +71,7 @@ function extractSelectionState(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["numPr"]) paragraphFormatting.numPr = paragraph.attrs["numPr"];
 		if (paragraph.attrs["indentLeft"]) paragraphFormatting.indentLeft = paragraph.attrs["indentLeft"];
 		if (paragraph.attrs["indentRight"]) paragraphFormatting.indentRight = paragraph.attrs["indentRight"];

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -27,6 +27,7 @@ function paragraphAttrsFromResolvedStyle(resolved) {
 		spaceAfter: ppr?.spaceAfter ?? null,
 		lineSpacing: ppr?.lineSpacing ?? null,
 		lineSpacingRule: ppr?.lineSpacingRule ?? null,
+		snapToGrid: ppr?.snapToGrid ?? null,
 		indentLeft: ppr?.indentLeft ?? null,
 		indentRight: ppr?.indentRight ?? null,
 		indentFirstLine: ppr?.indentFirstLine ?? null,

package/dist/prosemirror/tableCellMergeRevision.d.ts

@@ -0,0 +1,9 @@
+import { document_d_exports } from "../types/document.js";
+
+//#region src/prosemirror/tableCellMergeRevision.d.ts
+type TableCellMergeChange = Extract<NonNullable<document_d_exports.TableCell["structuralChange"]>, {
+  type: "tableCellMerge";
+}>;
+declare const getTableCellMergeChange: (value: unknown) => TableCellMergeChange | null;
+//#endregion
+export { TableCellMergeChange, getTableCellMergeChange };

package/dist/prosemirror/tableCellMergeRevision.js

@@ -0,0 +1,22 @@
+//#region src/prosemirror/tableCellMergeRevision.ts
+const isRecord = (value) => typeof value === "object" && value !== null;
+const isVerticalMergeRevisionValue = (value) => value === "continue" || value === "rest";
+const getTableCellMergeChange = (value) => {
+	if (!isRecord(value)) return null;
+	const change = value["structuralChange"];
+	if (!isRecord(change) || change["type"] !== "tableCellMerge") return null;
+	const info = change["info"];
+	if (!isRecord(info) || typeof info["id"] !== "number" || typeof info["author"] !== "string") return null;
+	return {
+		type: "tableCellMerge",
+		info: {
+			id: info["id"],
+			author: info["author"],
+			...typeof info["date"] === "string" ? { date: info["date"] } : {}
+		},
+		...isVerticalMergeRevisionValue(change["verticalMerge"]) ? { verticalMerge: change["verticalMerge"] } : {},
+		...isVerticalMergeRevisionValue(change["verticalMergeOriginal"]) ? { verticalMergeOriginal: change["verticalMergeOriginal"] } : {}
+	};
+};
+//#endregion
+export { getTableCellMergeChange };

package/dist/prosemirror/textBoxAnchorAttrs.d.ts

@@ -0,0 +1,9 @@
+import { TextBoxAnchorAttrs } from "./schema/nodes.js";
+import { ReadProseMirrorAttrsResult } from "./attrs/index.js";
+import { Node } from "prosemirror-model";
+
+//#region src/prosemirror/textBoxAnchorAttrs.d.ts
+declare const readTextBoxAnchorAttrs: (node: Node) => ReadProseMirrorAttrsResult<TextBoxAnchorAttrs>;
+declare const expectTextBoxAnchorAttrs: (node: Node) => TextBoxAnchorAttrs;
+//#endregion
+export { expectTextBoxAnchorAttrs, readTextBoxAnchorAttrs };

package/dist/prosemirror/textBoxAnchorAttrs.js

@@ -0,0 +1,33 @@
+import { panic } from "better-result";
+//#region src/prosemirror/textBoxAnchorAttrs.ts
+const attrsCache = /* @__PURE__ */ new WeakMap();
+const readTextBoxAnchorAttrs = (node) => {
+	const issues = [];
+	if (node.type.name !== "textBoxAnchor") issues.push({
+		path: "textBoxAnchor.type.name",
+		message: `Expected textBoxAnchor, got ${node.type.name}.`
+	});
+	const anchorId = node.attrs["anchorId"];
+	if (typeof anchorId !== "string" || anchorId.length === 0) issues.push({
+		path: "textBoxAnchor.attrs.anchorId",
+		message: "Expected a non-empty string."
+	});
+	if (issues.length > 0 || typeof anchorId !== "string") return {
+		ok: false,
+		issues
+	};
+	return {
+		ok: true,
+		value: { anchorId }
+	};
+};
+const expectTextBoxAnchorAttrs = (node) => {
+	const cached = attrsCache.get(node);
+	if (cached) return cached;
+	const result = readTextBoxAnchorAttrs(node);
+	if (!result.ok) panic(`Invalid ProseMirror text box anchor attrs:\n${result.issues.map((issue) => `${issue.path}: ${issue.message}`).join("\n")}`);
+	attrsCache.set(node, result.value);
+	return result.value;
+};
+//#endregion
+export { expectTextBoxAnchorAttrs, readTextBoxAnchorAttrs };

package/dist/prosemirror/utils/extractTrackedChanges.d.ts

@@ -32,7 +32,7 @@ type TrackedChangeEntry = {
    * - `tablePropertiesChanged` — table-level formatting
    *   (`<w:tblPrChange>`).
    */
-  type: "insertion" | "deletion" | "replacement" | "paragraphMarkInsertion" | "paragraphMarkDeletion" | "paragraphPropertiesChanged" | "rowInserted" | "rowDeleted" | "rowPropertiesChanged" | "cellInserted" | "cellDeleted" | "cellMerged" | "cellPropertiesChanged" | "tableInserted" | "tableDeleted" | "tablePropertiesChanged";
+  type: "insertion" | "deletion" | "replacement" | "runPropertiesChanged" | "paragraphMarkInsertion" | "paragraphMarkDeletion" | "paragraphPropertiesChanged" | "rowInserted" | "rowDeleted" | "rowPropertiesChanged" | "cellInserted" | "cellDeleted" | "cellMerged" | "cellPropertiesChanged" | "tableInserted" | "tableDeleted" | "tablePropertiesChanged";
   /**
    * Affected text. For inline types this is the run's text; for
    * structural types it's the surrounding paragraph / cell content

package/dist/prosemirror/utils/extractTrackedChanges.js

@@ -1,3 +1,5 @@
+import { expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 //#region src/prosemirror/utils/extractTrackedChanges.ts
 const EMPTY_RESULT = {
 	entries: [],
@@ -23,7 +25,8 @@ function extractTrackedChanges(state) {
 	const insertionType = schema.marks["insertion"];
 	const deletionType = schema.marks["deletion"];
 	const commentType = schema.marks["comment"];
-	if (!insertionType && !deletionType) return EMPTY_RESULT;
+	const runPropertyChangeType = schema.marks["runPropertyChange"];
+	if (!insertionType && !deletionType && !runPropertyChangeType) return EMPTY_RESULT;
 	const raw = [];
 	const commentToRevision = /* @__PURE__ */ new Map();
 	const commentMetadata = /* @__PURE__ */ new Map();
@@ -116,6 +119,20 @@ function extractTrackedChanges(state) {
 					revisionId: cellMarker.info.revisionId
 				});
 			}
+			const continuationCells = node.attrs["_docxVMergeContinuationCells"];
+			if (Array.isArray(continuationCells)) for (const continuationCell of continuationCells) {
+				const change = getTableCellMergeChange(continuationCell);
+				if (!change) continue;
+				raw.push({
+					type: "cellMerged",
+					text: node.textContent || "",
+					author: change.info.author,
+					date: change.info.date,
+					from: pos,
+					to: pos + node.nodeSize,
+					revisionId: change.info.id
+				});
+			}
 			const tcPrChange = node.attrs["tcPrChange"];
 			if (Array.isArray(tcPrChange)) for (const entry of tcPrChange) {
 				if (!entry?.info || typeof entry.info.id !== "number") continue;
@@ -193,17 +210,31 @@ function extractTrackedChanges(state) {
 		else if (node.type.name === "image") inlineText = node.attrs["alt"] || "image";
 		else inlineText = node.type.name;
 		let tcMark = null;
-		for (const mark of node.marks) if (mark.type === insertionType || mark.type === deletionType) {
-			raw.push({
-				type: mark.type === insertionType ? "insertion" : "deletion",
-				text: inlineText,
-				author: mark.attrs["author"] || "",
-				date: mark.attrs["date"],
-				from: pos,
-				to: pos + node.nodeSize,
-				revisionId: mark.attrs["revisionId"]
-			});
-			tcMark = mark;
+		for (const mark of node.marks) {
+			if (mark.type === runPropertyChangeType) {
+				for (const change of expectRunPropertyChangeMarkAttrs(mark).changes) raw.push({
+					type: "runPropertiesChanged",
+					text: inlineText,
+					author: change.info.author,
+					date: change.info.date,
+					from: pos,
+					to: pos + node.nodeSize,
+					revisionId: change.info.id
+				});
+				continue;
+			}
+			if (mark.type === insertionType || mark.type === deletionType) {
+				raw.push({
+					type: mark.type === insertionType ? "insertion" : "deletion",
+					text: inlineText,
+					author: mark.attrs["author"] || "",
+					date: mark.attrs["date"],
+					from: pos,
+					to: pos + node.nodeSize,
+					revisionId: mark.attrs["revisionId"]
+				});
+				tcMark = mark;
+			}
 		}
 		if (commentType) {
 			const commentMark = node.marks.find((m) => m.type === commentType);
@@ -239,7 +270,24 @@ function extractTrackedChanges(state) {
 		cellPropertiesChanged: 3,
 		paragraphMarkInsertion: 2,
 		paragraphMarkDeletion: 2,
-		paragraphPropertiesChanged: 2
+		paragraphPropertiesChanged: 2,
+		runPropertiesChanged: 1
+	};
+	const STRUCTURAL_FAMILY_BY_TYPE = {
+		tableInserted: "insertion",
+		rowInserted: "insertion",
+		cellInserted: "insertion",
+		paragraphMarkInsertion: "insertion",
+		tableDeleted: "deletion",
+		rowDeleted: "deletion",
+		cellDeleted: "deletion",
+		paragraphMarkDeletion: "deletion",
+		tablePropertiesChanged: "properties",
+		rowPropertiesChanged: "properties",
+		cellPropertiesChanged: "properties",
+		paragraphPropertiesChanged: "properties",
+		runPropertiesChanged: "properties",
+		cellMerged: "merge"
 	};
 	const isStructuralType = (t) => t in STRUCTURAL_PRIORITY;
 	const slotByKey = /* @__PURE__ */ new Map();
@@ -256,7 +304,7 @@ function extractTrackedChanges(state) {
 			ordered.push(entry);
 			continue;
 		}
-		const key = `${entry.author}|${entry.date ?? ""}`;
+		const key = `${STRUCTURAL_FAMILY_BY_TYPE[entry.type] ?? entry.type}|${entry.author}|${entry.date ?? ""}`;
 		const slot = slotByKey.get(key);
 		if (slot === void 0) {
 			slotByKey.set(key, ordered.push(entry) - 1);

package/dist/prosemirror/validation.js

@@ -1,4 +1,5 @@
-import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
 var ProseMirrorDocumentValidationError = class extends Error {
 	issues;
@@ -48,6 +49,7 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "text":
 		case "horizontalRule":
 		case "pageBreak":
+		case "renderedPageBreak":
 		case "tab": return;
 		case "hardBreak":
 			appendAttrIssues(path, readHardBreakAttrs(node), issues);
@@ -87,6 +89,9 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "textBox":
 			appendAttrIssues(path, readTextBoxAttrs(node), issues);
 			return;
+		case "textBoxAnchor":
+			appendAttrIssues(path, readTextBoxAnchorAttrs(node), issues);
+			return;
 		default: issues.push({
 			path: `${path}.type.name`,
 			message: `Unsupported ProseMirror node type ${node.type.name}.`
@@ -155,6 +160,9 @@ const validateMarks = (marks, path, issues) => {
 			case "deletion":
 				appendAttrIssues(markPath, readTrackedChangeMarkAttrs(mark), issues);
 				continue;
+			case "runPropertyChange":
+				appendAttrIssues(markPath, readRunPropertyChangeMarkAttrs(mark), issues);
+				continue;
 			case "runFormattingOverride":
 				appendAttrIssues(markPath, readRunFormattingOverrideMarkAttrs(mark), issues);
 				continue;