@stll/folio-core 0.32.1 → 0.33.0

package/dist/prosemirror/conversion/toProseDoc.js

@@ -16,6 +16,7 @@ import { resolveEffectiveTableCellFormatting } from "./effectiveTableCellFormatt
 import { marksToTextFormatting } from "./fromProseDoc.js";
 import { shadingToRunShadingAttrs } from "./runShadingMark.js";
 import { sdtAttrsFromProperties } from "./sdtAttrs.js";
+import { panic } from "better-result";
 //#region src/prosemirror/conversion/toProseDoc.ts
 /**
 * Build a `nextTextBoxGroupId()` generator salted with a random per-load
@@ -358,7 +359,7 @@ function anchorPointComment(nodes, commentId) {
 function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, moveKind = null, textBoxAnchors) {
 	const nodes = [];
 	for (const item of change.content) if (item.type === "run") nodes.push(...convertRun(item, getInheritedRunFormatting(item.formatting), styleResolver, textBoxAnchors));
-	else {
+	else if (item.type === "hyperlink") {
 		const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
 		nodes.push(...convertHyperlink(item, {
 			getInheritedRunFormatting,
@@ -366,7 +367,30 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getI
 			hyperlinkIndex: currentHyperlinkIndex,
 			textBoxAnchors
 		}));
-	}
+	} else if (item.type === "simpleField" || item.type === "complexField") {
+		const fieldNode = convertField(item, {
+			getInheritedRunFormatting,
+			styleResolver,
+			nextHyperlinkInstanceIndex,
+			textBoxAnchors
+		});
+		if (fieldNode) nodes.push(fieldNode);
+	} else if (item.type === "insertion" || item.type === "deletion" || item.type === "moveFrom" || item.type === "moveTo") {
+		const nestedMarkType = item.type === "insertion" || item.type === "moveTo" ? "insertion" : "deletion";
+		const nestedMoveKind = item.type === "moveFrom" || item.type === "moveTo" ? item.type : null;
+		nodes.push(...convertTrackedChange(item, nestedMarkType, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, nestedMoveKind, textBoxAnchors));
+	} else if (item.type === "bookmarkStart") nodes.push(schema.node("bookmarkBoundary", {
+		type: "start",
+		id: item.id,
+		name: item.name,
+		colFirst: item.colFirst,
+		colLast: item.colLast
+	}));
+	else if (item.type === "bookmarkEnd") nodes.push(schema.node("bookmarkBoundary", {
+		type: "end",
+		id: item.id
+	}));
+	else panic(`Unsupported tracked-run content: ${JSON.stringify(item)}`);
 	const mark = schema.marks[markType].create({
 		revisionId: change.info.id,
 		author: change.info.author,
@@ -375,12 +399,16 @@ function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getI
 		moveKind
 	});
 	return nodes.map((node) => {
+		if (node.marks.some(({ type }) => type.name === "insertion" || type.name === "deletion")) return node;
 		if (canCarryTrackedRunMark(node, mark.type)) return node.mark(mark.addToSet(node.marks));
 		return node;
 	});
 }
 function canCarryTrackedRunMark(node, markType) {
-	return node.isText || node.isInline && node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "symbol" || node.type.name === "bookmarkBoundary" || node.type.name === "textBoxAnchor");
+	if (node.isText) return true;
+	if (!node.isInline) return false;
+	if (node.type.name === "field" || node.type.name === "structuredField") return true;
+	return node.type.allowsMarkType(markType) && (node.type.name === "image" || node.type.name === "shape" || node.type.name === "hardBreak" || node.type.name === "tab" || node.type.name === "symbol" || node.type.name === "bookmarkBoundary" || node.type.name === "textBoxAnchor");
 }
 /**
 * Convert ParagraphFormatting to ProseMirror paragraph attrs
@@ -1706,7 +1734,7 @@ function extractTextBoxes(paragraph, textBoxGroupId) {
 				});
 				continue;
 			}
-			visitHyperlink(item, {
+			if (item.type === "hyperlink") visitHyperlink(item, {
 				...context,
 				trackedChange
 			});
@@ -1965,6 +1993,15 @@ function findParagraphPageBreakPosition(paragraph) {
 		for (const child of children) {
 			if (child.type === "run" && visitRun(child)) return true;
 			if (child.type === "hyperlink" && visitHyperlinkChildren(child)) return true;
+			if (child.type === "simpleField") for (const fieldChild of child.content) {
+				if (fieldChild.type === "run" && visitRun(fieldChild)) return true;
+				if (fieldChild.type === "hyperlink" && visitHyperlinkChildren(fieldChild)) return true;
+			}
+			if (child.type === "complexField") {
+				for (const run of child.fieldCode) if (visitRun(run)) return true;
+				for (const run of child.fieldResult) if (visitRun(run)) return true;
+			}
+			if ((child.type === "insertion" || child.type === "deletion" || child.type === "moveFrom" || child.type === "moveTo") && visitRunOrHyperlinkList(child.content)) return true;
 		}
 		return false;
 	}

package/dist/prosemirror/extensions/features/ParaIdAllocatorExtension.d.ts

@@ -1,8 +1,21 @@
 import { Extension } from "../types.js";
-import { EditorState, PluginKey } from "prosemirror-state";
+import { EditorState, PluginKey, Transaction } from "prosemirror-state";
 import { Node } from "prosemirror-model";
 //#region src/prosemirror/extensions/features/ParaIdAllocatorExtension.d.ts
 declare const paraIdAllocatorKey: PluginKey<any>;
+/**
+ * Transaction meta asking this plugin to derive the ids it mints from a
+ * caller-supplied seed instead of `Math.random()`.
+ *
+ * A live editor wants random ids: two people typing must not collide. A
+ * generator whose whole output has to be reproducible — the document compare —
+ * cannot afford them, and it is the only party that knows its run is meant to
+ * be deterministic, so it says so on its own transaction rather than leaving
+ * the plugin to guess.
+ */
+declare const deterministicParaIdSeedKey: PluginKey<string>;
+/** Ask the allocator to mint reproducible ids for the paragraphs `tr` creates. */
+declare const requestDeterministicParaIds: (tr: Transaction, seed: string) => Transaction;
 /**
  * Allocate initial paragraph IDs before constructing editor state.
  *
@@ -14,4 +27,4 @@ declare const ensureParaIdsInDoc: (doc: Node) => Node;
 declare const ensureParaIdsInState: (state: EditorState) => EditorState;
 declare const ParaIdAllocatorExtension: (options?: Partial<{}> | undefined) => Extension;
 //#endregion
-export { ParaIdAllocatorExtension, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey };
+export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey, requestDeterministicParaIds };

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

@@ -1,4 +1,4 @@
-import { generateHexId } from "../../../utils/hexId.js";
+import { deterministicHexId, generateHexId } from "../../../utils/hexId.js";
 import { createExtension } from "../create.js";
 import { ignoreTrackedChanges } from "./ParagraphChangeTrackerExtension.js";
 import { Fragment } from "prosemirror-model";
@@ -42,6 +42,35 @@ import { Plugin, PluginKey } from "prosemirror-state";
 *   another one.
 */
 const paraIdAllocatorKey = new PluginKey("paraIdAllocator");
+/**
+* Transaction meta asking this plugin to derive the ids it mints from a
+* caller-supplied seed instead of `Math.random()`.
+*
+* A live editor wants random ids: two people typing must not collide. A
+* generator whose whole output has to be reproducible — the document compare —
+* cannot afford them, and it is the only party that knows its run is meant to
+* be deterministic, so it says so on its own transaction rather than leaving
+* the plugin to guess.
+*/
+const deterministicParaIdSeedKey = new PluginKey("deterministicParaIdSeed");
+/** Ask the allocator to mint reproducible ids for the paragraphs `tr` creates. */
+const requestDeterministicParaIds = (tr, seed) => tr.setMeta(deterministicParaIdSeedKey, seed);
+/**
+* A fresh id not already in `taken`: derived from `seed` and the paragraph's
+* position when the caller asked for reproducibility, random otherwise. Both
+* loops terminate — the id space is 2^31 wide and `taken` holds at most one
+* entry per paragraph.
+*/
+const mintParaId = (taken, seed, pos) => {
+	if (seed === null) {
+		let id = generateHexId();
+		while (taken.has(id)) id = generateHexId();
+		return id;
+	}
+	let id = deterministicHexId(`${seed}:${String(pos)}`);
+	for (let salt = 1; taken.has(id); salt++) id = deterministicHexId(`${seed}:${String(pos)}:${String(salt)}`);
+	return id;
+};
 const isUsableParaId = (value) => typeof value === "string" && value.length > 0 && value !== "00000000";
 /**
 * For every valid paraId in the pre-transaction doc, the position its
@@ -70,7 +99,7 @@ const mapKeeperPositions = (oldDoc, transactions) => {
 	});
 	return keepers;
 };
-const collectParaIdUpdates = (doc, keeperPositions) => {
+const collectParaIdUpdates = (doc, keeperPositions, deterministicSeed = null) => {
 	const missing = [];
 	const occurrencesById = /* @__PURE__ */ new Map();
 	doc.descendants((node, pos) => {
@@ -100,8 +129,7 @@ const collectParaIdUpdates = (doc, keeperPositions) => {
 	const taken = new Set(occurrencesById.keys());
 	const updates = [];
 	for (const { pos, attrs } of needFreshId) {
-		let newId = generateHexId();
-		while (taken.has(newId)) newId = generateHexId();
+		const newId = mintParaId(taken, deterministicSeed, pos);
 		taken.add(newId);
 		updates.push({
 			pos,
@@ -182,7 +210,8 @@ const createParaIdAllocatorPlugin = () => new Plugin({
 	appendTransaction(transactions, oldState, newState) {
 		if (!transactions.some((t) => t.docChanged)) return null;
 		const keeperPositions = mapKeeperPositions(oldState.doc, transactions);
-		const updates = collectParaIdUpdates(newState.doc, keeperPositions);
+		const seed = transactions.map((transaction) => transaction.getMeta(deterministicParaIdSeedKey)).find((value) => typeof value === "string") ?? null;
+		const updates = collectParaIdUpdates(newState.doc, keeperPositions, seed);
 		if (updates.length === 0) return null;
 		const tr = newState.tr;
 		for (const u of updates) tr.setNodeMarkup(u.pos, void 0, u.attrs);
@@ -200,4 +229,4 @@ const ParaIdAllocatorExtension = createExtension({
 	}
 });
 //#endregion
-export { ParaIdAllocatorExtension, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey };
+export { ParaIdAllocatorExtension, deterministicParaIdSeedKey, ensureParaIdsInDoc, ensureParaIdsInState, paraIdAllocatorKey, requestDeterministicParaIds };

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

@@ -1,6 +1,6 @@
 import { createExtension } from "../create.js";
+import { AddMarkStep, AddNodeMarkStep, AttrStep, RemoveMarkStep, RemoveNodeMarkStep } from "prosemirror-transform";
 import { Plugin, PluginKey } from "prosemirror-state";
-import { AddMarkStep, AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from "prosemirror-transform";
 //#region src/prosemirror/extensions/features/ParagraphChangeTrackerExtension.ts
 /**
 * Paragraph Change Tracker Extension
@@ -121,7 +121,7 @@ function createParagraphChangeTrackerPlugin() {
 						if (hasUntracked) newState.hasUntrackedChanges = true;
 						continue;
 					}
-					if (step instanceof AddNodeMarkStep || step instanceof RemoveNodeMarkStep) {
+					if (step instanceof AddNodeMarkStep || step instanceof RemoveNodeMarkStep || step instanceof AttrStep) {
 						const pos = mapStepPosition(remap, step.pos, 1);
 						const node = tr.doc.nodeAt(pos);
 						if (!node) continue;

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

@@ -1,3 +1,4 @@
+import { htmlCommentEnd } from "../../../utils/htmlComments.js";
 import { stripXmlDeclarations } from "../../../utils/stripXmlDeclarations.js";
 import { readBookmarkBoundaryAttrs } from "../../bookmarkBoundaryAttrs.js";
 import { Fragment, Slice } from "prosemirror-model";
@@ -61,9 +62,9 @@ function stripHtmlComments(html) {
 			continue;
 		}
 		result += html.slice(cursor, commentStart);
-		const commentEnd = html.indexOf("-->", commentStart + 4);
-		if (commentEnd === -1) break;
-		cursor = commentEnd + 3;
+		const commentEnd = htmlCommentEnd(html, commentStart);
+		if (commentEnd === null) break;
+		cursor = commentEnd;
 	}
 	return result;
 }

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

@@ -4,6 +4,8 @@ import { NodeExtension } from "../types.js";
 type BookmarkBoundaryOptions = {
   getInternalClipboardToken?: () => string;
 };
+/** The node name, for callers asking whether a paragraph holds any content. */
+declare const BOOKMARK_BOUNDARY_NODE_NAME = "bookmarkBoundary";
 declare const BookmarkBoundaryExtension: (options?: Partial<BookmarkBoundaryOptions> | undefined) => NodeExtension;
 //#endregion
-export { BookmarkBoundaryExtension };
+export { BOOKMARK_BOUNDARY_NODE_NAME, BookmarkBoundaryExtension };

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

@@ -11,9 +11,11 @@ function readOptionalColumn(dom, attribute) {
 	const value = dom.getAttribute(attribute);
 	return value === null ? void 0 : readNonnegativeInteger(value);
 }
+/** The node name, for callers asking whether a paragraph holds any content. */
+const BOOKMARK_BOUNDARY_NODE_NAME = "bookmarkBoundary";
 const BookmarkBoundaryExtension = createNodeExtension({
-	name: "bookmarkBoundary",
-	schemaNodeName: "bookmarkBoundary",
+	name: BOOKMARK_BOUNDARY_NODE_NAME,
+	schemaNodeName: BOOKMARK_BOUNDARY_NODE_NAME,
 	nodeSpec: (options) => ({
 		inline: true,
 		group: "inline",
@@ -64,4 +66,4 @@ const BookmarkBoundaryExtension = createNodeExtension({
 	})
 });
 //#endregion
-export { BookmarkBoundaryExtension };
+export { BOOKMARK_BOUNDARY_NODE_NAME, BookmarkBoundaryExtension };

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

@@ -1,6 +1,12 @@
 import { NodeExtension } from "../types.js";
 //#region src/prosemirror/extensions/nodes/RenderedPageBreakExtension.d.ts
 /** Zero-width cached pagination boundary preserved from DOCX. */
+/**
+ * The node name, for callers that have to ask whether anything is LEFT in a
+ * paragraph. This node is zero-width and carries no revision of its own, so a
+ * paragraph holding only these holds nothing a reader would see.
+ */
+declare const RENDERED_PAGE_BREAK_NODE_NAME = "renderedPageBreak";
 declare const RenderedPageBreakExtension: (options?: Partial<Record<string, unknown>> | undefined) => NodeExtension;
 //#endregion
-export { RenderedPageBreakExtension };
+export { RENDERED_PAGE_BREAK_NODE_NAME, RenderedPageBreakExtension };

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

@@ -1,9 +1,15 @@
 import { createNodeExtension } from "../create.js";
 //#region src/prosemirror/extensions/nodes/RenderedPageBreakExtension.ts
 /** Zero-width cached pagination boundary preserved from DOCX. */
+/**
+* The node name, for callers that have to ask whether anything is LEFT in a
+* paragraph. This node is zero-width and carries no revision of its own, so a
+* paragraph holding only these holds nothing a reader would see.
+*/
+const RENDERED_PAGE_BREAK_NODE_NAME = "renderedPageBreak";
 const RenderedPageBreakExtension = createNodeExtension({
-	name: "renderedPageBreak",
-	schemaNodeName: "renderedPageBreak",
+	name: RENDERED_PAGE_BREAK_NODE_NAME,
+	schemaNodeName: RENDERED_PAGE_BREAK_NODE_NAME,
 	nodeSpec: {
 		inline: true,
 		group: "inline",
@@ -19,4 +25,4 @@ const RenderedPageBreakExtension = createNodeExtension({
 	}
 });
 //#endregion
-export { RenderedPageBreakExtension };
+export { RENDERED_PAGE_BREAK_NODE_NAME, RenderedPageBreakExtension };

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

@@ -730,51 +730,68 @@ const TablePluginExtension = createExtension({
 				return true;
 			};
 		}
-		function addRowAbove(state, dispatch) {
+		/**
+		* Insert an empty row so that it lands ABOVE grid row `boundaryRow`.
+		*
+		* A vertically merged cell that covers both sides of the boundary is
+		* EXTENDED, not duplicated: Word grows the merge through the inserted row
+		* (`w:vMerge="continue"` gains one row) rather than splitting it. Cloning
+		* the caret row cell-for-cell instead emitted a cell for a column the merge
+		* already occupies, which widens the grid and desynchronises every later
+		* row — the opposite of `deleteRow`, which is merge-correct because it
+		* delegates to prosemirror-tables.
+		*
+		* Only the columns the boundary actually opens get a new cell, and each is
+		* shaped from the cell covering that column so widths, borders, margins and
+		* text direction survive.
+		*/
+		function insertTableRow(state, dispatch, boundaryOffset) {
 			const context = getTableContext(state);
 			if (!context.isInTable || context.rowIndex === void 0 || !context.table || context.tablePos === void 0) return false;
-			if (dispatch) {
-				const tr = state.tr;
-				const rowNode = context.table.child(context.rowIndex);
-				const cells = [];
-				rowNode.forEach((cell) => {
-					const paragraph = nodeTypeParagraph.create();
-					const cellAttrs = buildCellAttrsFromTemplate(cell);
-					cells.push(nodeTypeTableCell.create(cellAttrs, paragraph));
-				});
-				const newRow = nodeTypeTableRow.create({
-					height: rowNode.attrs["height"] ?? 360,
-					heightRule: rowNode.attrs["heightRule"] ?? "atLeast"
-				}, cells);
-				let rowPos = context.tablePos + 1;
-				for (let i = 0; i < context.rowIndex; i++) rowPos += context.table.child(i).nodeSize;
-				tr.insert(rowPos, newRow);
-				dispatch(tr.scrollIntoView());
+			if (!dispatch) return true;
+			const { table, tablePos, rowIndex } = context;
+			const boundaryRow = rowIndex + boundaryOffset;
+			const map = TableMap.get(table);
+			const tableStart = tablePos + 1;
+			const tr = state.tr;
+			const cells = [];
+			const extended = /* @__PURE__ */ new Set();
+			let lastTemplatePos = -1;
+			for (let column = 0; column < map.width; column += 1) {
+				const below = boundaryRow < map.height ? map.map[boundaryRow * map.width + column] : void 0;
+				const above = boundaryRow > 0 ? map.map[(boundaryRow - 1) * map.width + column] : void 0;
+				if (below !== void 0 && below === above) {
+					if (!extended.has(below)) {
+						extended.add(below);
+						const merged = table.nodeAt(below);
+						if (merged) tr.setNodeMarkup(tableStart + below, void 0, {
+							...merged.attrs,
+							rowspan: (Number(merged.attrs["rowspan"]) || 1) + 1
+						});
+					}
+					continue;
+				}
+				const templatePos = below ?? above;
+				if (templatePos === void 0 || templatePos === lastTemplatePos) continue;
+				lastTemplatePos = templatePos;
+				cells.push(nodeTypeTableCell.create(buildCellAttrsFromTemplate(table.nodeAt(templatePos)), nodeTypeParagraph.create()));
 			}
+			const rowNode = table.child(rowIndex);
+			const newRow = nodeTypeTableRow.create({
+				height: rowNode.attrs["height"] ?? 360,
+				heightRule: rowNode.attrs["heightRule"] ?? "atLeast"
+			}, cells);
+			let rowPos = tableStart;
+			for (let i = 0; i < boundaryRow; i += 1) rowPos += table.child(i).nodeSize;
+			tr.insert(rowPos, newRow);
+			dispatch(tr.scrollIntoView());
 			return true;
 		}
+		function addRowAbove(state, dispatch) {
+			return insertTableRow(state, dispatch, 0);
+		}
 		function addRowBelow(state, dispatch) {
-			const context = getTableContext(state);
-			if (!context.isInTable || context.rowIndex === void 0 || !context.table || context.tablePos === void 0) return false;
-			if (dispatch) {
-				const tr = state.tr;
-				const rowNode = context.table.child(context.rowIndex);
-				const cells = [];
-				rowNode.forEach((cell) => {
-					const paragraph = nodeTypeParagraph.create();
-					const cellAttrs = buildCellAttrsFromTemplate(cell);
-					cells.push(nodeTypeTableCell.create(cellAttrs, paragraph));
-				});
-				const newRow = nodeTypeTableRow.create({
-					height: rowNode.attrs["height"] ?? 360,
-					heightRule: rowNode.attrs["heightRule"] ?? "atLeast"
-				}, cells);
-				let rowPos = context.tablePos + 1;
-				for (let i = 0; i <= context.rowIndex; i++) rowPos += context.table.child(i).nodeSize;
-				tr.insert(rowPos, newRow);
-				dispatch(tr.scrollIntoView());
-			}
-			return true;
+			return insertTableRow(state, dispatch, 1);
 		}
 		function deleteRow(state, dispatch) {
 			const context = getTableContext(state);

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

@@ -10,6 +10,8 @@ import { NodeExtension } from "../types.js";
 type TextBoxAnchorOptions = {
   getInternalClipboardToken?: () => string;
 };
+/** The node name, for callers asking whether a paragraph holds any content. */
+declare const TEXT_BOX_ANCHOR_NODE_NAME = "textBoxAnchor";
 declare const TextBoxAnchorExtension: (options?: Partial<TextBoxAnchorOptions> | undefined) => NodeExtension;
 //#endregion
-export { TextBoxAnchorExtension };
+export { TEXT_BOX_ANCHOR_NODE_NAME, TextBoxAnchorExtension };

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

@@ -8,9 +8,11 @@ import { createNodeExtension } from "../create.js";
 * 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.
 */
+/** The node name, for callers asking whether a paragraph holds any content. */
+const TEXT_BOX_ANCHOR_NODE_NAME = "textBoxAnchor";
 const TextBoxAnchorExtension = createNodeExtension({
-	name: "textBoxAnchor",
-	schemaNodeName: "textBoxAnchor",
+	name: TEXT_BOX_ANCHOR_NODE_NAME,
+	schemaNodeName: TEXT_BOX_ANCHOR_NODE_NAME,
 	nodeSpec: (options) => ({
 		inline: true,
 		group: "inline",
@@ -39,4 +41,4 @@ const TextBoxAnchorExtension = createNodeExtension({
 	})
 });
 //#endregion
-export { TextBoxAnchorExtension };
+export { TEXT_BOX_ANCHOR_NODE_NAME, TextBoxAnchorExtension };

package/dist/prosemirror/plugins/suggestionMode.js

@@ -76,6 +76,7 @@ function markRangeAsDeleted(tr, doc, from, to, insertionType, deletionType, plug
 		const end = Math.min(pos + node.nodeSize, to);
 		if (start >= end) return;
 		const isOwnInsert = node.marks.some((m) => m.type === insertionType && m.attrs["author"] === pluginState.author);
+		if (node.marks.some((m) => m.type === deletionType)) return;
 		ranges.push({
 			from: start,
 			to: end,

package/dist/prosemirror/revisionCarriers.js

@@ -1,5 +1,21 @@
 import { expectParagraphAttrs } from "./attrs/index.js";
+import { PARAGRAPH_MARK_CHANGE_KINDS } from "@stll/docx-core/model";
 //#region src/prosemirror/revisionCarriers.ts
+/**
+* Which carrier each paragraph-mark kind reports as. A relocation's break
+* resolves as the insertion or deletion it is; the kind exists so a reader is
+* told the two ends belong together, not to change what resolving does.
+*
+* Total over the kinds by construction, so a kind the model gains has to be
+* given a carrier here rather than silently reporting none.
+*/
+const PARAGRAPH_MARK_KIND_CARRIERS = {
+	ins: "paragraphMarkInserted",
+	moveTo: "paragraphMarkInserted",
+	del: "paragraphMarkDeleted",
+	moveFrom: "paragraphMarkDeleted"
+};
+const isParagraphMarkChangeKind = (value) => PARAGRAPH_MARK_CHANGE_KINDS.some((kind) => kind === value);
 const isObjectRecord = (value) => typeof value === "object" && value !== null;
 const revisionMetadata = (value) => {
 	if (!isObjectRecord(value) || typeof value["id"] !== "number") return null;
@@ -37,11 +53,12 @@ const getFolioNodeRevisionCarriers = (node, nodePos) => {
 		const to = nodePos + node.nodeSize;
 		const paragraphAttrs = expectParagraphAttrs(node);
 		const paragraphMark = node.attrs["pPrMark"];
-		if (isObjectRecord(paragraphMark) && (paragraphMark["kind"] === "ins" || paragraphMark["kind"] === "del")) {
+		const paragraphMarkKind = isObjectRecord(paragraphMark) && isParagraphMarkChangeKind(paragraphMark["kind"]) ? PARAGRAPH_MARK_KIND_CARRIERS[paragraphMark["kind"]] : void 0;
+		if (paragraphMarkKind !== void 0 && isObjectRecord(paragraphMark)) {
 			const metadata = revisionMetadata(paragraphMark["info"]);
 			if (metadata) carriers.push({
 				...metadata,
-				type: paragraphMark["kind"] === "ins" ? "paragraphMarkInserted" : "paragraphMarkDeleted",
+				type: paragraphMarkKind,
 				text: node.textContent,
 				from,
 				to

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

@@ -94,8 +94,8 @@ type TrackedChangesResult = {
  * Walk the PM doc and extract every tracked change as a flat list of
  * `TrackedChangeEntry` plus a comment→revision overlap map. Adjacent
  * inline marks coalesce by `(type, revisionId, author, date)`; a
- * deletion immediately followed by an insertion (same author + same
- * date) collapses into a single `replacement` entry; paragraph-mark
+ * deletion immediately followed by the same author's insertion
+ * collapses into a single `replacement` entry; paragraph-mark
  * cards (`paragraphMarkInsertion` / `paragraphMarkDeletion`) are
  * hidden when an inline entry already covers their revision triple
  * (one Accept clears every site of one conceptual change).

package/dist/prosemirror/utils/extractTrackedChanges.js

@@ -6,11 +6,28 @@ const EMPTY_RESULT = {
 	commentToRevision: /* @__PURE__ */ new Map()
 };
 /**
+* Fold a run's revision mark into the enclosing row's card when both halves
+* are the same change. Folio writes both under one revision id; Word mints a
+* fresh `w:id` per element, so an author + timestamp match counts too. Returns
+* false for a third party's edit inside the row, which keeps its own card.
+*/
+const foldIntoRowRevision = (scope, mark) => {
+	if (!scope || mark.type !== scope.markType) return false;
+	const revisionId = mark.attrs["revisionId"];
+	if (!(revisionId === scope.entry.revisionId || mark.attrs["author"] === scope.entry.author && mark.attrs["date"] === scope.entry.date)) return false;
+	if (revisionId !== scope.entry.revisionId) {
+		const ids = new Set(scope.entry.coalescedRevisionIds ?? []);
+		ids.add(revisionId);
+		scope.entry.coalescedRevisionIds = [...ids];
+	}
+	return true;
+};
+/**
 * Walk the PM doc and extract every tracked change as a flat list of
 * `TrackedChangeEntry` plus a comment→revision overlap map. Adjacent
 * inline marks coalesce by `(type, revisionId, author, date)`; a
-* deletion immediately followed by an insertion (same author + same
-* date) collapses into a single `replacement` entry; paragraph-mark
+* deletion immediately followed by the same author's insertion
+* collapses into a single `replacement` entry; paragraph-mark
 * cards (`paragraphMarkInsertion` / `paragraphMarkDeletion`) are
 * hidden when an inline entry already covers their revision triple
 * (one Accept clears every site of one conceptual change).
@@ -30,7 +47,9 @@ function extractTrackedChanges(state) {
 	const raw = [];
 	const commentToRevision = /* @__PURE__ */ new Map();
 	const commentMetadata = /* @__PURE__ */ new Map();
+	const rowRevisionScopes = [];
 	doc.descendants((node, pos) => {
+		while (pos >= (rowRevisionScopes.at(-1)?.end ?? Number.POSITIVE_INFINITY)) rowRevisionScopes.pop();
 		if (node.type.name === "paragraph") {
 			const ins = node.attrs["pPrIns"];
 			const del = node.attrs["pPrDel"];
@@ -69,24 +88,40 @@ function extractTrackedChanges(state) {
 		if (node.type.name === "tableRow") {
 			const trIns = node.attrs["trIns"];
 			const trDel = node.attrs["trDel"];
-			if (trIns) raw.push({
-				type: "rowInserted",
-				text: node.textContent || "",
-				author: trIns.author || "",
-				date: trIns.date ?? void 0,
-				from: pos,
-				to: pos + node.nodeSize,
-				revisionId: trIns.revisionId
-			});
-			if (trDel) raw.push({
-				type: "rowDeleted",
-				text: node.textContent || "",
-				author: trDel.author || "",
-				date: trDel.date ?? void 0,
-				from: pos,
-				to: pos + node.nodeSize,
-				revisionId: trDel.revisionId
-			});
+			if (trIns) {
+				const entry = {
+					type: "rowInserted",
+					text: node.textContent || "",
+					author: trIns.author || "",
+					date: trIns.date ?? void 0,
+					from: pos,
+					to: pos + node.nodeSize,
+					revisionId: trIns.revisionId
+				};
+				raw.push(entry);
+				rowRevisionScopes.push({
+					end: pos + node.nodeSize,
+					markType: insertionType,
+					entry
+				});
+			}
+			if (trDel) {
+				const entry = {
+					type: "rowDeleted",
+					text: node.textContent || "",
+					author: trDel.author || "",
+					date: trDel.date ?? void 0,
+					from: pos,
+					to: pos + node.nodeSize,
+					revisionId: trDel.revisionId
+				};
+				raw.push(entry);
+				rowRevisionScopes.push({
+					end: pos + node.nodeSize,
+					markType: deletionType,
+					entry
+				});
+			}
 			const trPrChange = node.attrs["trPrChange"];
 			if (Array.isArray(trPrChange)) for (const entry of trPrChange) {
 				if (!entry?.info || typeof entry.info.id !== "number") continue;
@@ -185,7 +220,7 @@ function extractTrackedChanges(state) {
 				});
 				if (allShare) {
 					let visibleText = "";
-					if (deletionType) node.descendants((child) => {
+					if (deletionType && sharedAttr === "trIns") node.descendants((child) => {
 						if (child.isText && !child.marks.some((m) => m.type === deletionType)) visibleText += child.text || "";
 					});
 					else visibleText = node.textContent || "";
@@ -224,6 +259,8 @@ function extractTrackedChanges(state) {
 				continue;
 			}
 			if (mark.type === insertionType || mark.type === deletionType) {
+				tcMark = mark;
+				if (foldIntoRowRevision(rowRevisionScopes.at(-1), mark)) continue;
 				raw.push({
 					type: mark.type === insertionType ? "insertion" : "deletion",
 					text: inlineText,
@@ -233,7 +270,6 @@ function extractTrackedChanges(state) {
 					to: pos + node.nodeSize,
 					revisionId: mark.attrs["revisionId"]
 				});
-				tcMark = mark;
 			}
 		}
 		if (commentType) {
@@ -350,7 +386,7 @@ function extractTrackedChanges(state) {
 	for (let i = 0; i < merged.length; i++) {
 		const curr = merged[i];
 		const next = merged[i + 1];
-		if (curr.type === "deletion" && next && next.type === "insertion" && curr.author === next.author && curr.date === next.date && curr.to === next.from) {
+		if (curr.type === "deletion" && next && next.type === "insertion" && curr.author === next.author && curr.to === next.from) {
 			final.push({
 				type: "replacement",
 				text: next.text,