@stll/folio-core 0.46.0 → 0.47.0

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

@@ -1,9 +1,13 @@
 import { setTableLookFlags } from "../../../docx/tableLook.js";
-import { TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_WIDTH_TYPE_VALUES } from "../../../types/documentEnumValues.js";
+import { TABLE_JUSTIFICATION_VALUES, TABLE_WIDTH_TYPE_VALUES, TEXT_DIRECTION_VALUES } from "../../../types/documentEnumValues.js";
+import { cssBorderStyle } from "../../../utils/borderCss.js";
 import { isValidHexColor, resolveColor } from "../../../utils/colorResolver.js";
+import { resolveTablePlacementAlignment } from "../../../utils/tablePlacement.js";
+import { textFlowCss } from "../../../utils/textDirectionFlow.js";
 import { expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs } from "../../attrs/index.js";
 import { createExtension, createNodeExtension } from "../create.js";
 import { panic } from "better-result";
+import { statesNoBorder } from "@stll/docx-core/model";
 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";
@@ -14,6 +18,27 @@ import { Decoration, DecorationSet } from "prosemirror-view";
 * Uses separate NodeExtension instances for each table node type,
 * plus an Extension for plugins and commands.
 */
+const isOmittedGridSlot = (value) => value === "before" || value === "after";
+const isEmptyOmittedGridSlotNode = (node) => {
+	if (node.childCount !== 1) return false;
+	const paragraph = node.child(0);
+	return paragraph.type.name === "paragraph" && paragraph.content.size === 0;
+};
+const hasOmittedGridSlots = (table) => {
+	let found = false;
+	table.forEach((row) => {
+		if (row.type.name !== "tableRow") return;
+		row.forEach((cell) => {
+			if ((cell.type.name === "tableCell" || cell.type.name === "tableHeader") && isOmittedGridSlot(expectTableCellAttrs(cell)._omittedGridSlot)) found = true;
+		});
+	});
+	return found;
+};
+const preserveOmittedGridSlots = (command) => (state, dispatch, view) => {
+	const { table } = getTableContext(state);
+	if (table && hasOmittedGridSlots(table)) return false;
+	return command(state, dispatch, view);
+};
 const isOneOf = (value, values) => value !== null && value !== void 0 && values.some((allowed) => allowed === value);
 /** Map CSS border-style to OOXML border style. */
 function cssBorderStyleToOoxml(cssStyle) {
@@ -121,6 +146,12 @@ function mapCssVerticalAlign(cssValue) {
 function parseCssColorToHex(cssColor) {
 	return parseCssColorToColorValue(cssColor)?.rgb;
 }
+const isEmptyOmittedGridSlotDOM = (element) => {
+	if (!element.children || element.children.length !== 1) return false;
+	const paragraph = element.children[0];
+	if (paragraph?.localName !== "p" || paragraph.textContent !== "") return false;
+	return Array.from(paragraph.children).every((child) => child.localName === "br");
+};
 /** Shared parseDOM getAttrs for td/th — extracts borders, padding, alignment from CSS. */
 function parseCellAttrsFromDOM(element) {
 	const style = element.style;
@@ -130,13 +161,16 @@ function parseCellAttrsFromDOM(element) {
 	const verticalAlign = (rawValign === "top" || rawValign === "center" || rawValign === "bottom" ? rawValign : void 0) ?? mapCssVerticalAlign(style.verticalAlign) ?? void 0;
 	const rawBgColor = element.dataset["bgcolor"];
 	const backgroundColor = (isValidHexColor(rawBgColor) ? rawBgColor : void 0) || parseCssColorToHex(style.backgroundColor) || void 0;
+	const rawOmittedGridSlot = element.dataset["omittedGridSlot"];
+	const omittedGridSlot = isEmptyOmittedGridSlotDOM(element) && isOmittedGridSlot(rawOmittedGridSlot) ? rawOmittedGridSlot : void 0;
 	return {
 		colspan: Number(element.getAttribute("colspan") ?? "1") || 1,
 		rowspan: Number(element.getAttribute("rowspan") ?? "1") || 1,
 		...verticalAlign !== void 0 ? { verticalAlign } : {},
 		...backgroundColor !== void 0 ? { backgroundColor } : {},
 		...borders ? { borders } : {},
-		...margins ? { margins } : {}
+		...margins ? { margins } : {},
+		...omittedGridSlot !== void 0 ? { _omittedGridSlot: omittedGridSlot } : {}
 	};
 }
 const tableSpec = {
@@ -160,6 +194,8 @@ const tableSpec = {
 		_resolvedBidi: { default: null },
 		_originalFormatting: { default: null },
 		tblPrChange: { default: null },
+		_bookmarks: { default: null },
+		_preserved: { default: null },
 		_suggestedInsert: { default: null }
 	},
 	parseDOM: [{
@@ -167,7 +203,7 @@ const tableSpec = {
 		getAttrs(dom) {
 			const styleId = dom.dataset["styleId"];
 			const rawJustification = dom.dataset["justification"];
-			const justification = rawJustification === "left" || rawJustification === "center" || rawJustification === "right" ? rawJustification : void 0;
+			const justification = rawJustification !== void 0 && isOneOf(rawJustification, TABLE_JUSTIFICATION_VALUES) ? rawJustification : void 0;
 			return {
 				...styleId ? { styleId } : {},
 				...justification !== void 0 ? { justification } : {}
@@ -185,8 +221,7 @@ const tableSpec = {
 			styles.push(`width: ${widthPx}px`);
 		} else styles.push("width: 100%");
 		styles.push("table-layout: fixed");
-		if (attrs.justification === "center") styles.push("margin-left: auto", "margin-right: auto");
-		else if (attrs.justification === "right") styles.push("margin-left: auto");
+		styles.push(...tablePlacementStyles(attrs));
 		domAttrs["style"] = styles.join("; ");
 		return [
 			"table",
@@ -202,11 +237,16 @@ const tableRowSpec = {
 		height: { default: null },
 		heightRule: { default: null },
 		isHeader: { default: false },
-		hidden: { default: false },
+		hidden: { default: null },
 		_resolvedJustification: { default: null },
 		_originalFormatting: { default: null },
+		_tablePropertyExceptions: { default: null },
 		trPrChange: { default: null },
+		tblPrExChange: { default: null },
 		_preservedAttributes: { default: null },
+		_bookmarks: { default: null },
+		contentControls: { default: null },
+		_preserved: { default: null },
 		trIns: { default: null },
 		trDel: { default: null }
 	},
@@ -223,40 +263,15 @@ const tableRowSpec = {
 		];
 	}
 };
-const BORDER_STYLE_CSS = {
-	single: "solid",
-	double: "double",
-	dotted: "dotted",
-	dashed: "dashed",
-	thick: "solid",
-	dashSmallGap: "dashed",
-	dotDash: "dashed",
-	dotDotDash: "dotted",
-	triple: "double",
-	thinThickSmallGap: "double",
-	thickThinSmallGap: "double",
-	thinThickThinSmallGap: "double",
-	thinThickMediumGap: "double",
-	thickThinMediumGap: "double",
-	thinThickThinMediumGap: "double",
-	thinThickLargeGap: "double",
-	thickThinLargeGap: "double",
-	thinThickThinLargeGap: "double",
-	wave: "solid",
-	doubleWave: "double",
-	dashDotStroked: "dashed",
-	threeDEmboss: "ridge",
-	threeDEngrave: "groove",
-	outset: "outset",
-	inset: "inset"
-};
 function buildCellBorderStyles(attrs) {
 	const styles = [];
 	const borders = attrs.borders;
 	if (!borders) return styles;
 	const borderToCss = (border) => {
-		if (!border || !border.style || border.style === "none" || border.style === "nil") return "none";
-		return `${border.size !== void 0 && border.size > 0 ? Math.max(1, Math.round(border.size / 8 * 1.333)) : 1}px ${BORDER_STYLE_CSS[border.style] || "solid"} ${resolveColor(border.color, void 0)}`;
+		if (!border || border.style === void 0 || statesNoBorder(border.style)) return "none";
+		const widthPx = border.size !== void 0 && border.size > 0 ? Math.max(1, Math.round(border.size / 8 * 1.333)) : 1;
+		const color = resolveColor(border.color, void 0);
+		return `${widthPx}px ${cssBorderStyle(border.style)} ${color}`;
 	};
 	styles.push(`border-top: ${borderToCss(borders.top)}`);
 	styles.push(`border-bottom: ${borderToCss(borders.bottom)}`);
@@ -273,27 +288,18 @@ function buildCellPaddingStyles(attrs) {
 	const toPixels = (twips) => twips !== void 0 && twips > 0 ? Math.round(twips / 20 * 1.333) : 0;
 	return [`padding: ${toPixels(margins.top)}px ${toPixels(margins.right)}px ${toPixels(margins.bottom)}px ${toPixels(margins.left)}px`];
 }
+const tablePlacementStyles = (attrs) => {
+	if (attrs.justification === void 0) return [];
+	const alignment = resolveTablePlacementAlignment(attrs.justification, attrs._resolvedBidi === true);
+	if (alignment === "center") return ["margin-left: auto", "margin-right: auto"];
+	return alignment === "right" ? ["margin-left: auto"] : [];
+};
 function buildTextDirectionStyles(textDirection) {
 	if (!textDirection) return [];
+	const flow = textFlowCss(textDirection);
 	const styles = [];
-	switch (textDirection) {
-		case "tbRl":
-		case "tbRlV":
-			styles.push("writing-mode: vertical-rl");
-			break;
-		case "btLr":
-			styles.push("writing-mode: vertical-lr", "transform: rotate(180deg)");
-			break;
-		case "rl":
-		case "rlV":
-			styles.push("direction: rtl");
-			break;
-		case "tb":
-		case "tbV":
-			styles.push("writing-mode: vertical-lr");
-			break;
-		default: break;
-	}
+	if (flow.writingMode !== "horizontal-tb") styles.push(`writing-mode: ${flow.writingMode}`);
+	if (flow.rotateDegrees !== void 0) styles.push(`transform: rotate(${String(flow.rotateDegrees)}deg)`);
 	return styles;
 }
 function buildCellWidthStyles(attrs) {
@@ -308,16 +314,33 @@ function buildCellWidthStyles(attrs) {
 	}
 	return styles;
 }
+/**
+* The width attrs of a cell that states `value`.
+*
+* `mergeTableCellAttrs` derives `_authoredWidth` for a command that patches an
+* existing cell; a command that builds a cell's attr record from scratch has no
+* node to merge against and states them here.
+*/
+const statedCellWidth = (value, type) => ({
+	width: value,
+	widthType: type,
+	_authoredWidth: {
+		value,
+		type
+	}
+});
 const tableCellSpec = {
-	content: "(paragraph | table | textBox | preservedBlock)+",
+	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
 		colspan: { default: 1 },
 		rowspan: { default: 1 },
+		_omittedGridSlot: { default: null },
 		colwidth: { default: null },
 		width: { default: null },
 		widthType: { default: null },
+		_authoredWidth: { default: null },
 		verticalAlign: { default: null },
 		backgroundColor: { default: null },
 		_resolvedBackgroundColor: { default: null },
@@ -331,6 +354,7 @@ const tableCellSpec = {
 		_originalFormatting: { default: null },
 		tcPrChange: { default: null },
 		cellMarker: { default: null },
+		contentControls: { default: null },
 		_preserveVMergeRestart: { default: null },
 		_docxVMergeContinuationCells: { default: null }
 	},
@@ -341,10 +365,17 @@ const tableCellSpec = {
 	toDOM(node) {
 		const attrs = expectTableCellAttrs(node);
 		const domAttrs = { class: "docx-table-cell" };
+		const omittedGridSlot = isEmptyOmittedGridSlotNode(node) && isOmittedGridSlot(attrs._omittedGridSlot) ? attrs._omittedGridSlot : void 0;
 		if (attrs.colspan > 1) domAttrs["colspan"] = String(attrs.colspan);
 		if (attrs.rowspan > 1) domAttrs["rowspan"] = String(attrs.rowspan);
 		const styles = [];
-		styles.push(...buildCellPaddingStyles(attrs));
+		if (omittedGridSlot !== void 0) {
+			domAttrs["aria-hidden"] = "true";
+			domAttrs["class"] = "docx-table-omitted-grid-slot";
+			domAttrs["contenteditable"] = "false";
+			domAttrs["data-omitted-grid-slot"] = omittedGridSlot;
+			styles.push("visibility: hidden", "pointer-events: none", "padding: 0", "border: none");
+		} else styles.push(...buildCellPaddingStyles(attrs));
 		if (attrs.noWrap) styles.push("white-space: nowrap");
 		else styles.push("word-wrap: break-word", "overflow-wrap: break-word", "overflow: hidden");
 		styles.push(...buildCellWidthStyles(attrs));
@@ -367,15 +398,17 @@ const tableCellSpec = {
 	}
 };
 const tableHeaderSpec = {
-	content: "(paragraph | table | textBox | preservedBlock)+",
+	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {
 		colspan: { default: 1 },
 		rowspan: { default: 1 },
+		_omittedGridSlot: { default: null },
 		colwidth: { default: null },
 		width: { default: null },
 		widthType: { default: null },
+		_authoredWidth: { default: null },
 		verticalAlign: { default: null },
 		backgroundColor: { default: null },
 		_resolvedBackgroundColor: { default: null },
@@ -389,6 +422,7 @@ const tableHeaderSpec = {
 		_originalFormatting: { default: null },
 		tcPrChange: { default: null },
 		cellMarker: { default: null },
+		contentControls: { default: null },
 		_preserveVMergeRestart: { default: null },
 		_docxVMergeContinuationCells: { default: null }
 	},
@@ -399,10 +433,17 @@ const tableHeaderSpec = {
 	toDOM(node) {
 		const attrs = expectTableCellAttrs(node);
 		const domAttrs = { class: "docx-table-header" };
+		const omittedGridSlot = isEmptyOmittedGridSlotNode(node) && isOmittedGridSlot(attrs._omittedGridSlot) ? attrs._omittedGridSlot : void 0;
 		if (attrs.colspan > 1) domAttrs["colspan"] = String(attrs.colspan);
 		if (attrs.rowspan > 1) domAttrs["rowspan"] = String(attrs.rowspan);
 		const styles = ["font-weight: bold"];
-		styles.push(...buildCellPaddingStyles(attrs));
+		if (omittedGridSlot !== void 0) {
+			domAttrs["aria-hidden"] = "true";
+			domAttrs["class"] = "docx-table-omitted-grid-slot";
+			domAttrs["contenteditable"] = "false";
+			domAttrs["data-omitted-grid-slot"] = omittedGridSlot;
+			styles.push("visibility: hidden", "pointer-events: none", "padding: 0", "border: none");
+		} else styles.push(...buildCellPaddingStyles(attrs));
 		if (attrs.noWrap) styles.push("white-space: nowrap");
 		else styles.push("word-wrap: break-word", "overflow-wrap: break-word", "overflow: hidden");
 		styles.push(...buildCellWidthStyles(attrs));
@@ -474,7 +515,7 @@ function getTableContext(state) {
 			"left"
 		]) {
 			const border = borders[side];
-			if (border?.color && border.style && border.style !== "none" && border.style !== "nil") {
+			if (border?.color && border.style !== void 0 && !statesNoBorder(border.style)) {
 				cellBorderColor = border.color;
 				break;
 			}
@@ -537,64 +578,44 @@ function findCellInfo(state) {
 		tableDepth
 	};
 }
-function goToNextCell() {
+const authoredCells = (table, tablePos) => {
+	const cells = [];
+	table.forEach((row, rowOffset) => {
+		const rowPos = tablePos + 1 + rowOffset;
+		row.forEach((cell, cellOffset) => {
+			const omittedGridSlot = expectTableCellAttrs(cell)._omittedGridSlot;
+			if (omittedGridSlot === void 0 || omittedGridSlot === null) cells.push({
+				node: cell,
+				pos: rowPos + 1 + cellOffset
+			});
+		});
+	});
+	return cells;
+};
+const goToAdjacentAuthoredCell = (direction) => {
 	return (state, dispatch) => {
 		if (!isInTableCell(state)) return false;
 		const info = findCellInfo(state);
 		if (!info) return false;
 		const { $from } = state.selection;
 		const table = $from.node(info.tableDepth);
-		const row = $from.node(info.rowDepth);
-		const cellIndex = $from.index(info.rowDepth);
-		const rowIndex = $from.index(info.tableDepth);
-		if (cellIndex < row.childCount - 1) {
-			const nextCellPos = info.cellPos + $from.node(info.cellDepth).nodeSize;
-			if (dispatch) {
-				const textPos = nextCellPos + 1 + 1;
-				dispatch(state.tr.setSelection(Selection.near(state.doc.resolve(textPos))).scrollIntoView());
-			}
-			return true;
-		}
-		if (rowIndex < table.childCount - 1) {
-			const nextRowPos = $from.before(info.rowDepth) + row.nodeSize;
-			if (dispatch) {
-				const textPos = nextRowPos + 1 + 1 + 1;
-				dispatch(state.tr.setSelection(Selection.near(state.doc.resolve(textPos))).scrollIntoView());
-			}
-			return true;
+		const cells = authoredCells(table, $from.before(info.tableDepth));
+		const currentIndex = cells.findIndex(({ pos }) => pos === info.cellPos);
+		const targetIndex = currentIndex + direction;
+		const target = currentIndex === -1 || targetIndex < 0 || targetIndex >= cells.length ? void 0 : cells[targetIndex];
+		if (!target) return false;
+		if (dispatch) {
+			const textPos = direction === 1 ? target.pos + 2 : target.pos + target.node.nodeSize - 2;
+			dispatch(state.tr.setSelection(Selection.near(state.doc.resolve(textPos), direction)).scrollIntoView());
 		}
-		return false;
+		return true;
 	};
+};
+function goToNextCell() {
+	return goToAdjacentAuthoredCell(1);
 }
 function goToPrevCell() {
-	return (state, dispatch) => {
-		if (!isInTableCell(state)) return false;
-		const info = findCellInfo(state);
-		if (!info) return false;
-		const { $from } = state.selection;
-		const table = $from.node(info.tableDepth);
-		const cellIndex = $from.index(info.rowDepth);
-		const rowIndex = $from.index(info.tableDepth);
-		if (cellIndex > 0) {
-			const prevCell = $from.node(info.rowDepth).child(cellIndex - 1);
-			const cellStartPos = info.cellPos - prevCell.nodeSize;
-			if (dispatch) {
-				const textPos = cellStartPos + prevCell.nodeSize - 2;
-				dispatch(state.tr.setSelection(Selection.near(state.doc.resolve(textPos), -1)).scrollIntoView());
-			}
-			return true;
-		}
-		if (rowIndex > 0) {
-			const prevRow = table.child(rowIndex - 1);
-			const prevRowPos = $from.before(info.rowDepth) - prevRow.nodeSize;
-			if (dispatch) {
-				const textPos = prevRowPos + prevRow.nodeSize - 1 - 1;
-				dispatch(state.tr.setSelection(Selection.near(state.doc.resolve(textPos), -1)).scrollIntoView());
-			}
-			return true;
-		}
-		return false;
-	};
+	return goToAdjacentAuthoredCell(-1);
 }
 const TableNodeExtension = createNodeExtension({
 	name: "table",
@@ -642,6 +663,7 @@ const TablePluginExtension = createExtension({
 				colwidth: baseAttrs["colwidth"],
 				width: baseAttrs["width"],
 				widthType: baseAttrs["widthType"],
+				_authoredWidth: baseAttrs["_authoredWidth"],
 				verticalAlign: baseAttrs["verticalAlign"],
 				backgroundColor: baseAttrs["backgroundColor"],
 				borders: baseAttrs["borders"],
@@ -675,8 +697,7 @@ const TablePluginExtension = createExtension({
 						colspan: 1,
 						rowspan: 1,
 						borders: defaultBorders,
-						width: colWidthTwips,
-						widthType: "dxa"
+						...statedCellWidth(colWidthTwips, "dxa")
 					};
 					cells.push(nodeTypeTableCell.create(cellAttrs, paragraph));
 				}
@@ -754,7 +775,7 @@ const TablePluginExtension = createExtension({
 		*/
 		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 (!context.isInTable || context.rowIndex === void 0 || !context.table || context.tablePos === void 0 || hasOmittedGridSlots(context.table)) return false;
 			if (!dispatch) return true;
 			const { table, tablePos, rowIndex } = context;
 			const boundaryRow = rowIndex + boundaryOffset;
@@ -803,6 +824,7 @@ const TablePluginExtension = createExtension({
 		function deleteRow(state, dispatch) {
 			const context = getTableContext(state);
 			if (!context.isInTable || context.rowIndex === void 0 || !context.table || context.tablePos === void 0) return false;
+			if (hasOmittedGridSlots(context.table)) return false;
 			const tablePos = context.tablePos;
 			const table = context.table;
 			const rowCount = context.rowCount ?? 0;
@@ -847,7 +869,7 @@ const TablePluginExtension = createExtension({
 		}
 		function addColumnLeft(state, dispatch) {
 			const context = getTableContext(state);
-			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0) return false;
+			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0 || hasOmittedGridSlots(context.table)) return false;
 			if (dispatch) {
 				let tr = state.tr;
 				const newColumnCount = (context.columnCount ?? 1) + 1;
@@ -864,8 +886,7 @@ const TablePluginExtension = createExtension({
 									colspan: 1,
 									rowspan: 1
 								});
-								cellAttrs["width"] = newColWidthPercent;
-								cellAttrs["widthType"] = "pct";
+								Object.assign(cellAttrs, statedCellWidth(newColWidthPercent, "pct"));
 								const newCell = nodeTypeTableCell.create(cellAttrs, paragraph);
 								tr = tr.insert(tr.mapping.map(cellPos), newCell);
 							}
@@ -878,8 +899,7 @@ const TablePluginExtension = createExtension({
 								colspan: 1,
 								rowspan: 1
 							});
-							cellAttrs["width"] = newColWidthPercent;
-							cellAttrs["widthType"] = "pct";
+							Object.assign(cellAttrs, statedCellWidth(newColWidthPercent, "pct"));
 							const newCell = nodeTypeTableCell.create(cellAttrs, paragraph);
 							tr = tr.insert(tr.mapping.map(cellPos), newCell);
 						}
@@ -910,7 +930,7 @@ const TablePluginExtension = createExtension({
 		}
 		function addColumnRight(state, dispatch) {
 			const context = getTableContext(state);
-			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0) return false;
+			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0 || hasOmittedGridSlots(context.table)) return false;
 			if (dispatch) {
 				let tr = state.tr;
 				const newColumnCount = (context.columnCount ?? 1) + 1;
@@ -930,8 +950,7 @@ const TablePluginExtension = createExtension({
 									colspan: 1,
 									rowspan: 1
 								});
-								cellAttrs["width"] = newColWidthPercent;
-								cellAttrs["widthType"] = "pct";
+								Object.assign(cellAttrs, statedCellWidth(newColWidthPercent, "pct"));
 								const newCell = nodeTypeTableCell.create(cellAttrs, paragraph);
 								tr = tr.insert(tr.mapping.map(cellPos), newCell);
 								insertedCount += 1;
@@ -943,8 +962,7 @@ const TablePluginExtension = createExtension({
 								colspan: 1,
 								rowspan: 1
 							});
-							cellAttrs["width"] = newColWidthPercent;
-							cellAttrs["widthType"] = "pct";
+							Object.assign(cellAttrs, statedCellWidth(newColWidthPercent, "pct"));
 							const newCell = nodeTypeTableCell.create(cellAttrs, paragraph);
 							tr = tr.insert(tr.mapping.map(cellPos), newCell);
 						}
@@ -975,7 +993,7 @@ const TablePluginExtension = createExtension({
 		}
 		function deleteColumn(state, dispatch) {
 			const context = getTableContext(state);
-			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0 || (context.columnCount ?? 0) <= 1) return false;
+			if (!context.isInTable || context.columnIndex === void 0 || !context.table || context.tablePos === void 0 || (context.columnCount ?? 0) <= 1 || hasOmittedGridSlots(context.table)) return false;
 			if (dispatch) {
 				let tr = state.tr;
 				const newColumnCount = (context.columnCount ?? 2) - 1;
@@ -1486,7 +1504,7 @@ const TablePluginExtension = createExtension({
 				const context = getTableContext(state);
 				if (!context.isInTable || context.tablePos === void 0 || !context.table) return false;
 				if (dispatch) {
-					if (direction !== null && !isOneOf(direction, TABLE_CELL_TEXT_DIRECTION_VALUES)) return false;
+					if (direction !== null && !isOneOf(direction, TEXT_DIRECTION_VALUES)) return false;
 					const tr = state.tr;
 					const cells = getTargetCellPositions(state);
 					for (const { pos, node } of cells) tr.setNodeMarkup(tr.mapping.map(pos), void 0, mergeTableCellAttrs(node, { textDirection: direction ?? void 0 }));
@@ -1985,8 +2003,8 @@ const TablePluginExtension = createExtension({
 				selectTable: () => selectTable,
 				selectRow: () => selectRow,
 				selectColumn: () => selectColumn,
-				mergeCells: () => mergeCells,
-				splitCell: () => splitCell,
+				mergeCells: () => preserveOmittedGridSlots(mergeCells),
+				splitCell: () => preserveOmittedGridSlots(splitCell),
 				setCellBorder: (side, spec, clearOthers) => setCellBorder(side, spec, clearOthers),
 				setTableBorders: (preset, borderSpec) => setTableBorders(preset, borderSpec),
 				setTableBorderPreset: (preset) => setTableBorderPreset(preset),

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

@@ -107,6 +107,10 @@ const TextBoxExtension = createNodeExtension({
 			distLeft: { default: null },
 			distRight: { default: null },
 			position: { default: null },
+			anchor: { default: null },
+			wrapDistanceSlots: { default: null },
+			wrapEffectExtentSlots: { default: null },
+			wrapPolygon: { default: null },
 			_docxPlacement: { default: null },
 			_docxGroupId: { default: null },
 			_docxAnchorId: { default: null },

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

@@ -0,0 +1,23 @@
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/extensions/nodes/bookmarkBoundaryDom.d.ts
+declare const bookmarkBoundaryAttrSpec: {
+  type: {};
+  id: {};
+  name: {
+    default: null;
+  };
+  colFirst: {
+    default: null;
+  };
+  colLast: {
+    default: null;
+  };
+  displacedByCustomXml: {
+    default: null;
+  };
+};
+/** `false` when the element does not describe a boundary ProseMirror can hold. */
+declare const parseBookmarkBoundaryDom: (dom: HTMLElement | string) => Record<string, unknown> | false;
+declare const bookmarkBoundaryDomAttributes: (node: Node, internalClipboardToken?: string) => Record<string, string>;
+//#endregion
+export { bookmarkBoundaryAttrSpec, bookmarkBoundaryDomAttributes, parseBookmarkBoundaryDom };

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

@@ -0,0 +1,57 @@
+import { expectBookmarkBoundaryAttrs, isDisplacedByCustomXml } from "../../bookmarkBoundaryAttrs.js";
+//#region src/prosemirror/extensions/nodes/bookmarkBoundaryDom.ts
+const readNonnegativeInteger = (value) => {
+	if (value === null || !/^(?:0|[1-9]\d*)$/.test(value)) return false;
+	const parsed = Number(value);
+	return Number.isSafeInteger(parsed) ? parsed : false;
+};
+const readOptionalColumn = (dom, attribute) => {
+	const value = dom.getAttribute(attribute);
+	return value === null ? void 0 : readNonnegativeInteger(value);
+};
+const bookmarkBoundaryAttrSpec = {
+	type: {},
+	id: {},
+	name: { default: null },
+	colFirst: { default: null },
+	colLast: { default: null },
+	displacedByCustomXml: { default: null }
+};
+/** `false` when the element does not describe a boundary ProseMirror can hold. */
+const parseBookmarkBoundaryDom = (dom) => {
+	if (typeof dom === "string") return false;
+	const type = dom.getAttribute("data-docx-bookmark-boundary");
+	const id = readNonnegativeInteger(dom.getAttribute("data-docx-bookmark-id"));
+	if (type !== "start" && type !== "end" || id === false) return false;
+	const name = dom.getAttribute("data-docx-bookmark-name");
+	if (type === "start" && !name) return false;
+	const colFirst = readOptionalColumn(dom, "data-docx-bookmark-col-first");
+	const colLast = readOptionalColumn(dom, "data-docx-bookmark-col-last");
+	if (colFirst === false || colLast === false) return false;
+	const displaced = dom.getAttribute("data-docx-bookmark-displaced");
+	return {
+		type,
+		id,
+		...name ? { name } : {},
+		...colFirst !== void 0 ? { colFirst } : {},
+		...colLast !== void 0 ? { colLast } : {},
+		...isDisplacedByCustomXml(displaced) ? { displacedByCustomXml: displaced } : {}
+	};
+};
+const bookmarkBoundaryDomAttributes = (node, internalClipboardToken) => {
+	const attrs = expectBookmarkBoundaryAttrs(node);
+	return {
+		"data-docx-bookmark-boundary": attrs.type,
+		"data-docx-bookmark-id": String(attrs.id),
+		...attrs.type === "start" ? { "data-docx-bookmark-name": attrs.name } : {},
+		...attrs.type === "start" && attrs.colFirst !== void 0 ? { "data-docx-bookmark-col-first": String(attrs.colFirst) } : {},
+		...attrs.type === "start" && attrs.colLast !== void 0 ? { "data-docx-bookmark-col-last": String(attrs.colLast) } : {},
+		...attrs.displacedByCustomXml !== void 0 ? { "data-docx-bookmark-displaced": attrs.displacedByCustomXml } : {},
+		"aria-hidden": "true",
+		contenteditable: "false",
+		style: "display: none;",
+		...internalClipboardToken === void 0 ? {} : { "data-docx-internal-clipboard": internalClipboardToken }
+	};
+};
+//#endregion
+export { bookmarkBoundaryAttrSpec, bookmarkBoundaryDomAttributes, parseBookmarkBoundaryDom };

package/dist/prosemirror/extensions/types.d.ts

@@ -2,20 +2,29 @@ import { document_d_exports } from "../../types/document.js";
 import { TextColorAttrs } from "../schema/marks.js";
 import "../schema/index.js";
 import { TablePropertiesCommand } from "../../utils/tableOperations.js";
+import { SectionBreakType } from "../sectionCarrier.js";
 import { GenerateTableOfContentsOptions, ResolvedStyleAttrs } from "./core/ParagraphExtension.js";
 import { BorderPreset, TableBorderPreset } from "./nodes/TableExtension.js";
 import { Command, Plugin } from "prosemirror-state";
 import { MarkSpec, NodeSpec, Schema } from "prosemirror-model";
 //#region src/prosemirror/extensions/types.d.ts
+/**
+ * A border a host asks folio to apply.
+ *
+ * `style` is what the model holds, not a narrower authoring union: a table
+ * style preset is built by reading a parsed `w:tblBorders` and handing it
+ * back, so a token the schema does not declare has to survive the round trip
+ * rather than be refused at the command.
+ */
 type TableCellBorderCommandSpec = {
-  style: string;
+  style: document_d_exports.BorderStyleValue;
   size?: number;
   color?: {
     rgb: string;
   };
 };
 type TableBorderCommandSpec = {
-  style: string;
+  style: document_d_exports.BorderStyleValue;
   size: number;
   color: {
     rgb: string;
@@ -98,7 +107,7 @@ type FolioCommandArguments = {
   setSpaceAfter: [twips: number];
   applyStyle: [styleId: string, resolvedAttrs?: ResolvedStyleAttrs];
   clearStyle: [];
-  insertSectionBreak: [breakType: "nextPage" | "continuous" | "oddPage" | "evenPage"];
+  insertSectionBreak: [breakType: SectionBreakType];
   removeSectionBreak: [];
   addTabStop: [position: number, alignment?: document_d_exports.TabStopAlignment, leader?: document_d_exports.TabLeader];
   removeTabStop: [position: number];