@stll/folio-core 0.5.0 → 0.6.1

package/dist/layout-painter/renderParagraph.js

@@ -910,7 +910,9 @@ function renderLine(block, line, alignment, doc, options) {
 		if (!options.isLastLine || options.paragraphEndsWithLineBreak) {
 			const firstLineIndentPx = options.isFirstLine ? options.firstLineIndentPx ?? 0 : 0;
 			const firstLineHangingPx = Math.max(0, -firstLineIndentPx);
-			const justifyCapacityPx = options.availableWidth + firstLineHangingPx;
+			const hasVisibleListMarker = options.isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden;
+			const firstLineHangingExpansionPx = hasVisibleListMarker ? Math.min(firstLineHangingPx, Math.max(0, options.leftIndentPx ?? 0)) : firstLineHangingPx;
+			const justifyCapacityPx = options.availableWidth + firstLineHangingExpansionPx;
 			const overfullPx = line.width - justifyCapacityPx;
 			const shrinkableSpaces = countShrinkableSpaces(runsForLine);
 			if (overfullPx > RIGHT_EDGE_EPSILON_PX && shrinkableSpaces > 0) {
@@ -925,7 +927,7 @@ function renderLine(block, line, alignment, doc, options) {
 				lineEl.style.textAlign = "justify";
 				lineEl.style.textAlignLast = "justify";
 			}
-			const listFirstLineOffset = options.isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden ? options.firstLineIndentPx ?? 0 : 0;
+			const listFirstLineOffset = hasVisibleListMarker ? Math.max(firstLineIndentPx, -firstLineHangingExpansionPx) : 0;
 			lineEl.style.width = `${options.availableWidth - listFirstLineOffset}px`;
 		}
 	}
@@ -1249,7 +1251,6 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
 			else if (hasFirstLine && !isFlexLine) lineEl.style.textIndent = `${indent.firstLine ?? 0}px`;
 		} else if (indentLeft > 0) lineEl.style.paddingLeft = `${indentLeft}px`;
-		else if (hasHanging && indentLeft === 0) lineEl.style.paddingLeft = `${indent.hanging ?? 0}px`;
 		if (indentRight > 0) lineEl.style.paddingRight = `${indentRight}px`;
 		if (isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden) {
 			const hanging = indent?.hanging ?? 0;
@@ -1269,7 +1270,7 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			const markerFontSize = block.attrs.listMarkerFontSize ?? firstTextRun?.fontSize ?? block.attrs.defaultFontSize;
 			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), doc, markerFontFamily, markerFontSize, block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
 			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
-			if (markerMarginLeft < 0 && indentLeft !== 0) marker.style.marginLeft = `${markerMarginLeft}px`;
+			if (markerMarginLeft < 0) marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
 		}
 		fragmentEl.append(lineEl);

package/dist/layout-painter/renderTable.js

@@ -1,8 +1,10 @@
-import { tableColumnsArePinned } from "../layout-engine/types.js";
+import { emuToPixels } from "../utils/units.js";
+import { isFloatingImageRun, isFloatingTextBoxBlock, tableColumnsArePinned } from "../layout-engine/types.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { getAutomaticTextColorForBackground } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
 import { buildTableCellFloatingZones, getTableCellContentWidth, getTableCellFloatingImages } from "../layout-engine/measure/tableCellFloating.js";
+import { renderTextBoxFragment } from "./renderTextBox.js";
 //#region src/layout-painter/renderTable.ts
 /**
 * Table Renderer
@@ -26,9 +28,6 @@ const TABLE_CLASS_NAMES = {
 	tableEdgeHandleBottom: "layout-table-edge-handle-bottom",
 	tableEdgeHandleRight: "layout-table-edge-handle-right"
 };
-/**
-* Render cell content (paragraphs and nested tables)
-*/
 function renderCellContent(cell, cellMeasure, context, doc) {
 	const contentEl = doc.createElement("div");
 	contentEl.className = TABLE_CLASS_NAMES.cellContent;
@@ -37,6 +36,7 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 	contentEl.style.width = `${contentWidth}px`;
 	const cellFloatingImages = getTableCellFloatingImages(cell, cellMeasure, contentWidth);
 	const floatingZones = buildTableCellFloatingZones(cellFloatingImages, contentWidth);
+	const floatingLayers = [];
 	if (cellFloatingImages.length > 0) {
 		const floatingLayer = doc.createElement("div");
 		floatingLayer.className = "layout-cell-floating-images-layer";
@@ -47,7 +47,7 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 		floatingLayer.style.height = "100%";
 		floatingLayer.style.pointerEvents = "none";
 		floatingLayer.style.zIndex = "10";
-		floatingLayer.style.overflow = "hidden";
+		floatingLayer.style.overflow = "visible";
 		for (const img of cellFloatingImages) {
 			const imgContainer = doc.createElement("div");
 			imgContainer.className = "layout-cell-floating-image";
@@ -67,9 +67,11 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			imgContainer.append(imgEl);
 			floatingLayer.append(imgContainer);
 		}
-		contentEl.append(floatingLayer);
+		floatingLayers.push(floatingLayer);
 	}
 	let cumulativeY = 0;
+	let anchorParagraphY = 0;
+	let floatingTextBoxesLayer;
 	for (let i = 0; i < cell.blocks.length; i++) {
 		const block = cell.blocks[i];
 		const measure = cellMeasure.blocks[i];
@@ -103,15 +105,81 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			const spaceBefore = paragraphBlock.attrs?.spacing?.before ?? 0;
 			if (spaceBefore > 0) fragEl.style.paddingTop = `${spaceBefore}px`;
 			contentEl.append(fragEl);
+			anchorParagraphY = cumulativeY;
 			cumulativeY += paragraphMeasure.totalHeight;
 		} else if (block?.kind === "table" && measure?.kind === "table") {
 			const nestedTableEl = renderNestedTable(block, measure, context, doc);
 			nestedTableEl.style.position = "relative";
 			contentEl.append(nestedTableEl);
 			cumulativeY += measure.totalHeight;
+			anchorParagraphY = cumulativeY;
+		} else if (block?.kind === "textBox" && measure?.kind === "textBox") {
+			const textBoxBlock = block;
+			const textBoxMeasure = measure;
+			const textBoxEl = renderTextBoxFragment({
+				kind: "textBox",
+				blockId: textBoxBlock.id,
+				x: 0,
+				y: 0,
+				width: textBoxMeasure.width,
+				height: textBoxMeasure.height,
+				...textBoxBlock.pmStart !== void 0 ? { pmStart: textBoxBlock.pmStart } : {},
+				...textBoxBlock.pmEnd !== void 0 ? { pmEnd: textBoxBlock.pmEnd } : {}
+			}, textBoxBlock, textBoxMeasure, {
+				...context,
+				insideTableCell: true
+			}, { document: doc });
+			if (isFloatingTextBoxBlock(textBoxBlock)) {
+				floatingTextBoxesLayer ??= createCellFloatingTextBoxesLayer(doc);
+				textBoxEl.style.left = `${resolveCellTextBoxX(textBoxBlock, contentWidth)}px`;
+				textBoxEl.style.top = `${anchorParagraphY + resolveCellTextBoxY(textBoxBlock)}px`;
+				textBoxEl.style.pointerEvents = "auto";
+				floatingTextBoxesLayer.append(textBoxEl);
+				continue;
+			}
+			textBoxEl.style.position = "relative";
+			textBoxEl.style.left = "0";
+			textBoxEl.style.top = "0";
+			contentEl.append(textBoxEl);
+			cumulativeY += textBoxMeasure.height;
+			anchorParagraphY = cumulativeY;
 		}
 	}
-	return contentEl;
+	if (floatingTextBoxesLayer) floatingLayers.push(floatingTextBoxesLayer);
+	return {
+		content: contentEl,
+		floatingLayers
+	};
+}
+function createCellFloatingTextBoxesLayer(doc) {
+	const layer = doc.createElement("div");
+	layer.className = "layout-cell-floating-text-boxes-layer";
+	layer.style.position = "absolute";
+	layer.style.inset = "0";
+	layer.style.pointerEvents = "none";
+	layer.style.zIndex = "10";
+	layer.style.overflow = "visible";
+	return layer;
+}
+function resolveCellTextBoxX(block, contentWidth) {
+	const horizontal = block.position?.horizontal;
+	if (horizontal?.posOffset !== void 0) return emuToPixels(horizontal.posOffset);
+	if (horizontal?.align === "center") return (contentWidth - block.width) / 2;
+	if (horizontal?.align === "right" || horizontal?.align === "outside") return contentWidth - block.width;
+	return 0;
+}
+function resolveCellTextBoxY(block) {
+	const vertical = block.position?.vertical;
+	if (vertical?.posOffset !== void 0) return emuToPixels(vertical.posOffset);
+	return 0;
+}
+function tableHasFloatingCellContent(block) {
+	for (const row of block.rows) for (const cell of row.cells) for (const cellBlock of cell.blocks) {
+		if (cellBlock.kind === "textBox" && isFloatingTextBoxBlock(cellBlock)) return true;
+		if (cellBlock.kind === "paragraph" && cellBlock.runs.some((run) => run.kind === "image" && isFloatingImageRun(run))) return true;
+		if (cellBlock.kind === "table" && tableHasFloatingCellContent(cellBlock)) return true;
+	}
+	return false;
 }
 /**
 * Render a nested table (within a cell)
@@ -214,8 +282,18 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPi
 			default: break;
 		}
 	}
-	const contentEl = renderCellContent(cell, cellMeasure, context, doc);
-	cellEl.append(contentEl);
+	const renderedContent = renderCellContent(cell, cellMeasure, context, doc);
+	if (renderedContent.floatingLayers.length > 0) {
+		renderedContent.content.style.height = "100%";
+		renderedContent.content.style.overflow = "hidden";
+		cellEl.style.overflow = "visible";
+	}
+	cellEl.append(renderedContent.content);
+	for (const floatingLayer of renderedContent.floatingLayers) {
+		floatingLayer.style.left = `${padLeft}px`;
+		floatingLayer.style.top = `${padTop}px`;
+		cellEl.append(floatingLayer);
+	}
 	if (cell.blocks.length > 0) {
 		const firstBlock = cell.blocks.at(0);
 		const lastBlock = cell.blocks.at(-1);
@@ -316,7 +394,7 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 	tableEl.style.position = "absolute";
 	tableEl.style.width = `${fragment.width}px`;
 	tableEl.style.height = `${fragment.height}px`;
-	tableEl.style.overflow = "hidden";
+	tableEl.style.overflow = tableHasFloatingCellContent(block) ? "visible" : "hidden";
 	tableEl.dataset["blockId"] = String(fragment.blockId);
 	tableEl.dataset["fromRow"] = String(fragment.fromRow);
 	tableEl.dataset["toRow"] = String(fragment.toRow);

package/dist/managers/TableSelectionManager.js

@@ -1,5 +1,5 @@
-import { addColumn, addRow, createTableContext, deleteColumn, deleteRow, getColumnCount, mergeCells, splitCell } from "../utils/tableOperations.js";
 import { Subscribable } from "./Subscribable.js";
+import { addColumn, addRow, createTableContext, deleteColumn, deleteRow, getColumnCount, mergeCells, splitCell } from "../utils/tableOperations.js";
 //#region src/managers/TableSelectionManager.ts
 /** Data attributes for table elements in the rendered DOM */
 const TABLE_DATA_ATTRIBUTES = {

package/dist/paged-layout/sectionBlockWidths.js

@@ -20,8 +20,10 @@ function computePerBlockWidths({ blocks, bodyConfig, finalConfig }) {
 	}).widths;
 }
 function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
-	function colWidth(cw, cols) {
+	function colWidth(cw, cols, columnIndex) {
 		if (cols.count <= 1) return cw;
+		const authoredWidth = cols.widths?.[columnIndex];
+		if (authoredWidth !== void 0) return authoredWidth;
 		return Math.floor((cw - (cols.count - 1) * cols.gap) / cols.count);
 	}
 	function contentWidth(config) {
@@ -29,17 +31,23 @@ function computePerBlockMeasureInputs({ blocks, bodyConfig, finalConfig }) {
 	}
 	const { configs: sectionConfigs, breakIndices } = collectSectionConfigs(blocks, bodyConfig, finalConfig);
 	let sectionIdx = 0;
+	let columnIndex = 0;
 	const widths = [];
 	const marginTops = [];
 	const pageHeights = [];
 	const marginBottoms = [];
 	for (let i = 0; i < blocks.length; i++) {
 		const config = sectionConfigs[sectionIdx] ?? finalConfig;
-		widths.push(colWidth(contentWidth(config), config.columns ?? SINGLE_COLUMN_LAYOUT));
+		const columns = config.columns ?? SINGLE_COLUMN_LAYOUT;
+		widths.push(colWidth(contentWidth(config), columns, columnIndex));
 		marginTops.push(config.margins.top);
 		pageHeights.push(config.pageSize.h);
 		marginBottoms.push(config.margins.bottom);
-		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) sectionIdx++;
+		if (sectionIdx < breakIndices.length && i === breakIndices[sectionIdx]) {
+			sectionIdx++;
+			columnIndex = 0;
+		} else if (blocks[i]?.kind === "pageBreak") columnIndex = 0;
+		else if (blocks[i]?.kind === "columnBreak") columnIndex = (columnIndex + 1) % columns.count;
 	}
 	return {
 		widths,

package/dist/prosemirror/commands/index.js

@@ -5,9 +5,9 @@ import { getTableContext, isInTable as isInTableCell } from "../extensions/nodes
 import { getListInfo, isInList } from "../extensions/features/ListExtension.js";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice, pasteWithoutFormatting } from "./pastePlainText.js";
 import { getHyperlinkAttrs, getSelectedText, isHyperlinkActive } from "../extensions/marks/HyperlinkExtension.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 "./table.js";
 import { clearFontFamily, clearFontSize, clearHighlight, clearTextColor, insertHyperlink, removeHyperlink, setFontFamily, setFontSize, setHighlight, setHyperlink, setTextColor, setUnderlineStyle, toggleBold, toggleItalic, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "./formatting.js";
 import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, doubleSpacing, generateTOC, increaseIndent, increaseListLevel, oneAndHalfSpacing, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, setSpaceAfter, setSpaceBefore, singleSpacing, toggleBidi, toggleBulletList, toggleNumberedList } from "./paragraph.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 "./table.js";
 import { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./formatPainter.js";
 import { insertPageBreak } from "./pageBreak.js";
 export { CLIPBOARD_READ_ERROR_EVENT, PAINTABLE_MARK_NAMES, acceptAIEditRevision, acceptAllChanges, acceptChange, addColumnLeft, addColumnRight, addCommentMark, addRowAbove, addRowBelow, addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, buildPlainTextSlice, captureFormatMarks, clearFontFamily, clearFontSize, clearFormatting, clearHighlight, clearStyle, clearTextColor, createRemoveMarkCommand, createSetMarkCommand, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, doubleSpacing, findAIEditRevisionRange, findNextChange, findPreviousChange, generateTOC, getHyperlinkAttrs, getListInfo, getMarkAttr, getParagraphAlignment, getParagraphBidi, getSelectedText, getStyleId, getTableContext, increaseIndent, increaseListLevel, insertHyperlink, insertPageBreak, insertTable, isHyperlinkActive, isInList, isInTableCell as isInTable, isMarkActive, mergeCells, oneAndHalfSpacing, pasteWithoutFormatting, rejectAIEditRevision, rejectAllChanges, rejectChange, removeCommentMark, removeHyperlink, removeList, removeTabStop, removeTableBorders, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setHyperlink, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setSpaceAfter, setSpaceBefore, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableBorders, setTableProperties, setTextColor, setUnderlineStyle, singleSpacing, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1430,9 +1430,18 @@ function tableRowAttrsToFormatting(attrs) {
 function convertPMTableCell(node, documentCounts) {
 	const attrs = expectTableCellAttrs(node);
 	const content = [];
+	let previousStandaloneTextBox = null;
 	node.forEach((contentNode) => {
-		if (contentNode.type.name === "paragraph") content.push(convertPMParagraph(contentNode, documentCounts));
-		else if (contentNode.type.name === "table") content.push(convertPMTable(contentNode, documentCounts));
+		if (contentNode.type.name === "paragraph") {
+			content.push(convertPMParagraph(contentNode, documentCounts));
+			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "table") {
+			content.push(convertPMTable(contentNode, documentCounts));
+			previousStandaloneTextBox = null;
+		} else if (contentNode.type.name === "textBox") previousStandaloneTextBox = appendTextBoxBlock(content, contentNode, {
+			pendingPageBreaks: 0,
+			previousStandaloneTextBox
+		});
 	});
 	const cell = {
 		type: "tableCell",

package/dist/prosemirror/conversion/toProseDoc.js

@@ -24,15 +24,18 @@ function toProseDoc(document, options) {
 	const styleResolver = createStyleEngine(options?.styles ?? document.package.styles);
 	const theme = options?.theme ?? document.package.theme ?? null;
 	let textBoxGroupIndex = 0;
+	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
 		for (const block of blocks) if (block.type === "paragraph") {
 			const pbPos = paragraphPageBreakPosition(block);
 			if (pbPos === "before") out.push(schema.node("pageBreak"));
-			out.push(...convertParagraphWithTextBoxes(block, styleResolver, String(textBoxGroupIndex)));
-			textBoxGroupIndex += 1;
+			out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, theme));
+		} else if (block.type === "table") out.push(convertTable(block, styleResolver, {
+			theme,
+			nextTextBoxGroupId
+		}));
 		else out.push(convertBlockSdt(block, convertBodyBlocks));
 		return out;
 	};
@@ -535,7 +538,7 @@ function paragraphContentHasMeaningfulContent(content) {
 	if (content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo") return content.content.some(paragraphContentHasMeaningfulContent);
 	return true;
 }
-function convertTable(table, styleResolver, theme) {
+function convertTable(table, styleResolver, context) {
 	const rowSpanMap = calculateRowSpans(table);
 	const columnWidths = table.columnWidths;
 	const totalWidth = columnWidths?.reduce((sum, w) => sum + w, 0) ?? 0;
@@ -604,7 +607,7 @@ function convertTable(table, styleResolver, theme) {
 			})();
 		})();
 		if (bandingEnabledH && !isFirstRowStyled && !isLastRow) dataRowIndex++;
-		return convertTableRow(row, styleResolver, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr, theme);
+		return convertTableRow(row, styleResolver, context, isFirstRowStyled, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, look, resolvedTableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, cellMarginsAttr);
 	});
 	return schema.node("table", attrs, rows);
 }
@@ -620,7 +623,7 @@ function countTableColumns(rows) {
 /**
 * Convert a TableRow to a ProseMirror table row node
 */
-function convertTableRow(row, styleResolver, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins, theme) {
+function convertTableRow(row, styleResolver, context, isHeaderRow, columnWidths, totalWidth, conditionalStyles, rowBandStyle, bandingEnabledV, tableLook, tableBorders, rowIndex, totalRows, totalColumns, rowSpanMap, defaultCellMargins) {
 	const attrs = { isHeader: !!row.formatting?.header };
 	if (row.formatting?.height?.value !== void 0) attrs.height = row.formatting.height.value;
 	if (row.formatting?.heightRule) attrs.heightRule = row.formatting.heightRule;
@@ -695,7 +698,7 @@ function convertTableRow(row, styleResolver, isHeaderRow, columnWidths, totalWid
 		if (cellIsFirstRow && cellIsLastCol && (tableLook?.firstRow || rowCnf?.firstRow || cellCnf?.firstRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.neCell);
 		if (cellIsLastRow && cellIsFirstCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.firstColumn || rowCnf?.firstColumn || cellCnf?.firstColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.swCell);
 		if (cellIsLastRow && cellIsLastCol && (tableLook?.lastRow || rowCnf?.lastRow || cellCnf?.lastRow) && (tableLook?.lastColumn || rowCnf?.lastColumn || cellCnf?.lastColumn)) cellConditionalStyle = mergeConditionalStyles(cellConditionalStyle, conditionalStyles?.seCell);
-		cells.push(convertTableCell(cell, styleResolver, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins, theme));
+		cells.push(convertTableCell(cell, styleResolver, context, isHeaderRow, gridWidth, cellConditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, rowSpanInfo?.continuationCells, defaultCellMargins));
 	}
 	return schema.node("tableRow", attrs, cells);
 }
@@ -724,7 +727,8 @@ function resolveThemedBorderColors(borders, theme) {
 /**
 * Convert a TableCell to a ProseMirror table cell node
 */
-function convertTableCell(cell, styleResolver, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins, theme) {
+function convertTableCell(cell, styleResolver, context, isHeader, gridWidthPercent, conditionalStyle, tableBorders, isFirstRow, isLastRow, isFirstCol, isLastCol, calculatedRowSpan, preserveVMergeRestart, vMergeContinuationCells, defaultCellMargins) {
+	const { theme } = context;
 	const formatting = cell.formatting;
 	const rowspan = calculatedRowSpan ?? 1;
 	let width = formatting?.width?.value;
@@ -776,8 +780,12 @@ function convertTableCell(cell, styleResolver, isHeader, gridWidthPercent, condi
 	if (preserveVMergeRestart) attrs._preserveVMergeRestart = true;
 	if (vMergeContinuationCells && vMergeContinuationCells.length > 0) attrs._docxVMergeContinuationCells = vMergeContinuationCells;
 	const contentNodes = [];
-	for (const content of cell.content) if (content.type === "paragraph") contentNodes.push(convertParagraph(content, styleResolver, void 0, conditionalStyle?.rPr, conditionalStyle?.pPr));
-	else contentNodes.push(convertTable(content, styleResolver, theme));
+	for (const content of cell.content) if (content.type === "paragraph") contentNodes.push(...convertParagraphWithTextBoxes(content, styleResolver, {
+		textBoxGroupId: context.nextTextBoxGroupId(),
+		...conditionalStyle?.rPr !== void 0 ? { extraRunFormatting: conditionalStyle.rPr } : {},
+		...conditionalStyle?.pPr !== void 0 ? { tableParagraphOverlay: conditionalStyle.pPr } : {}
+	}));
+	else contentNodes.push(convertTable(content, styleResolver, context));
 	if (contentNodes.length === 0) contentNodes.push(schema.node("paragraph", {}, []));
 	const nodeType = isHeader ? "tableHeader" : "tableCell";
 	return schema.node(nodeType, attrs, contentNodes);
@@ -1214,13 +1222,9 @@ function convertShape(shape) {
 		position
 	});
 }
-/**
-* Convert a paragraph block to PM nodes, extracting text boxes as sibling nodes.
-* Skips ghost empty paragraphs that only contained text box drawings.
-*/
-function convertParagraphWithTextBoxes(block, styleResolver, textBoxGroupId) {
+function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, extraRunFormatting, tableParagraphOverlay }) {
 	const textBoxes = extractTextBoxesFromParagraph(block);
-	const pmParagraph = convertParagraph(block, styleResolver);
+	const pmParagraph = convertParagraph(block, styleResolver, void 0, extraRunFormatting, tableParagraphOverlay);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && pmParagraph.content.size === 0;
 	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
@@ -1361,12 +1365,14 @@ function headerFooterToProseDoc(content, options) {
 	const styleResolver = options?.styles ? createStyleEngine(options.styles) : null;
 	const theme = options?.theme ?? null;
 	let textBoxGroupIndex = 0;
+	const nextTextBoxGroupId = () => String(textBoxGroupIndex++);
 	const convertBlocks = (blocks) => {
 		const out = [];
-		for (const block of blocks) if (block.type === "paragraph") {
-			out.push(...convertParagraphWithTextBoxes(block, styleResolver, String(textBoxGroupIndex)));
-			textBoxGroupIndex += 1;
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, theme));
+		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId: nextTextBoxGroupId() }));
+		else if (block.type === "table") out.push(convertTable(block, styleResolver, {
+			theme,
+			nextTextBoxGroupId
+		}));
 		else out.push(convertBlockSdt(block, convertBlocks));
 		return out;
 	};

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

@@ -298,7 +298,7 @@ function buildCellWidthStyles(attrs) {
 	return styles;
 }
 const tableCellSpec = {
-	content: "(paragraph | table)+",
+	content: "(paragraph | table | textBox)+",
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
@@ -351,7 +351,7 @@ const tableCellSpec = {
 	}
 };
 const tableHeaderSpec = {
-	content: "(paragraph | table)+",
+	content: "(paragraph | table | textBox)+",
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {

package/dist/prosemirror/index.js

@@ -11,10 +11,10 @@ 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 { 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";
 import { addTabStop, alignCenter, alignJustify, alignLeft, alignRight, applyStyle, clearStyle, decreaseIndent, decreaseListLevel, generateTOC, increaseIndent, increaseListLevel, removeList, removeTabStop, setAlignment, setIndentFirstLine, setIndentLeft, setIndentRight, setLineSpacing, setLtr, setRtl, toggleBidi, toggleBulletList, toggleNumberedList } from "./commands/paragraph.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 { PAINTABLE_MARK_NAMES, applyFormatMarks, captureFormatMarks } from "./commands/formatPainter.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
 import { insertImageFromFile } from "./commands/image.js";

package/dist/prosemirror/insertOperations.js

@@ -1,5 +1,5 @@
-import { generateTOC } from "./commands/paragraph.js";
 import { insertTable } from "./commands/table.js";
+import { generateTOC } from "./commands/paragraph.js";
 import { insertPageBreak } from "./commands/pageBreak.js";
 import { insertImageFromFile } from "./commands/image.js";
 //#region src/prosemirror/insertOperations.ts

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { FolioAIBlock, FolioAIBlockAnchor, FolioAIBlockKind, FolioAIBlockPreviewRun, FolioAIComment, FolioAIEditApplyMode, FolioAIEditApplyResult, FolioAIEditOperation, FolioAIEditPrecondition, FolioAIEditSnapshot, FolioAIInlineFormatting, FolioAITextRangeHandle } from "./ai-edits/types.js";
-import { FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationStatus, FolioDocumentOperationType, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
+import { FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, FolioDocumentOperation, FolioDocumentOperationAffectedTarget, FolioDocumentOperationBatch, FolioDocumentOperationCapabilities, FolioDocumentOperationIssue, FolioDocumentOperationMode, FolioDocumentOperationPrecondition, FolioDocumentOperationReceipt, FolioDocumentOperationRecovery, FolioDocumentOperationResult, FolioDocumentOperationStatus, FolioDocumentOperationType, FolioDocumentOperationUndoFailureReason, FolioDocumentOperationUndoHandle, FolioDocumentOperationUndoResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, assertSupportedFolioDocumentOperationVersion, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, isFolioDocumentOperationModeSupported, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch } from "./document-operations.js";
 import { FolioReviewChange, FolioReviewChangeKind } from "./ai-edits/read.js";
 import { ApplyFolioAIEditsToBufferOptions, ApplyFolioAIEditsToBufferResult, FolioApplyDocumentOperationsOptions, FolioApplyOperationsOptions, FolioDocumentStory, FolioDocumentStoryHandle, FolioDocxReviewer, FolioDocxReviewerOptions, FolioReviewChangeFilter, FolioReviewComment, FolioReviewCommentFilter, FolioReviewCommentReply, FolioReviewReplyInput, applyFolioAIEditsToBuffer } from "./ai-edits/headless.js";
 import { createFolioAITextRangeHandle } from "./ai-edits/snapshot.js";
@@ -9,4 +9,4 @@ import { createDocx } from "./docx/rezip.js";
 import { CreateCommentReplyInput, replyToComment } from "./docx/replyToComment.js";
 import { GenerateRedlineDocxOptions, GenerateRedlineDocxResult, generateRedlineDocx } from "./redline.js";
 import { FolioBlockDiff, FolioFormatProperty, FolioVersionDiff, FolioVersionDiffSegment, compareDocxVersions } from "./version-comparison.js";
-export { type ApplyFolioAIEditsToBufferOptions, type ApplyFolioAIEditsToBufferResult, type CreateCommentReplyInput, type CreateEmptyDocumentOptions, type DeriveBlockIdInput, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditSnapshot, type FolioAIInlineFormatting, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsOptions, type FolioApplyOperationsOptions, type FolioBlockDiff, type FolioBlockId, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationStatus, type FolioDocumentOperationType, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocxReviewer, type FolioDocxReviewerOptions, type FolioFormatProperty, type FolioReviewChange, type FolioReviewChangeFilter, type FolioReviewChangeKind, type FolioReviewComment, type FolioReviewCommentFilter, type FolioReviewCommentReply, type FolioReviewReplyInput, type FolioVersionDiff, type FolioVersionDiffSegment, type GenerateRedlineDocxOptions, type GenerateRedlineDocxResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioAIEditsToBuffer, assertSupportedFolioDocumentOperationVersion, compareDocxVersions, createDocx, createEmptyDocument, createFolioAITextRangeHandle, deriveBlockId, generateRedlineDocx, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch, replyToComment };
+export { type ApplyFolioAIEditsToBufferOptions, type ApplyFolioAIEditsToBufferResult, type CreateCommentReplyInput, type CreateEmptyDocumentOptions, type DeriveBlockIdInput, FOLIO_DOCUMENT_OPERATION_BATCH_MODES, FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION, FOLIO_DOCUMENT_OPERATION_MODES, FOLIO_DOCUMENT_OPERATION_MODES_BY_TYPE, FOLIO_DOCUMENT_OPERATION_PRECONDITIONS, FOLIO_DOCUMENT_OPERATION_STORIES, FOLIO_DOCUMENT_OPERATION_TYPES, type FolioAIBlock, type FolioAIBlockAnchor, type FolioAIBlockKind, type FolioAIBlockPreviewRun, type FolioAIComment, type FolioAIEditApplyMode, type FolioAIEditApplyResult, type FolioAIEditOperation, type FolioAIEditPrecondition, type FolioAIEditSnapshot, type FolioAIInlineFormatting, type FolioAITextRangeHandle, type FolioApplyDocumentOperationsOptions, type FolioApplyOperationsOptions, type FolioBlockDiff, type FolioBlockId, type FolioDocumentOperation, type FolioDocumentOperationAffectedTarget, type FolioDocumentOperationBatch, type FolioDocumentOperationCapabilities, type FolioDocumentOperationIssue, type FolioDocumentOperationMode, type FolioDocumentOperationPrecondition, type FolioDocumentOperationReceipt, type FolioDocumentOperationRecovery, type FolioDocumentOperationResult, type FolioDocumentOperationStatus, type FolioDocumentOperationType, type FolioDocumentOperationUndoFailureReason, type FolioDocumentOperationUndoHandle, type FolioDocumentOperationUndoResult, type FolioDocumentStory, type FolioDocumentStoryHandle, FolioDocxReviewer, type FolioDocxReviewerOptions, type FolioFormatProperty, type FolioReviewChange, type FolioReviewChangeFilter, type FolioReviewChangeKind, type FolioReviewComment, type FolioReviewCommentFilter, type FolioReviewCommentReply, type FolioReviewReplyInput, type FolioVersionDiff, type FolioVersionDiffSegment, type GenerateRedlineDocxOptions, type GenerateRedlineDocxResult, InvalidFolioDocumentOperationBatchError, UnsupportedFolioDocumentOperationVersionError, applyFolioAIEditsToBuffer, assertSupportedFolioDocumentOperationVersion, compareDocxVersions, createDocx, createEmptyDocument, createFolioAITextRangeHandle, deriveBlockId, generateRedlineDocx, getFolioDocumentOperationCapabilities, getFolioDocumentOperationIssues, getFolioDocumentOperationReceipts, getFolioParaIdFromBlockId, isFolioBlockId, isFolioDocumentOperationModeSupported, isSequentialFolioBlockId, isSupportedFolioDocumentOperationVersion, parseFolioDocumentOperationBatch, replyToComment };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",