@stll/folio-core 0.3.1 → 0.5.0

package/dist/layout-painter/renderPage.d.ts

@@ -42,6 +42,20 @@ type PageFloatingImage = {
    */
   behindDoc: boolean;
 };
+type FloatingTableBandOptions = {
+  contentX: number;
+  tableWidth: number;
+  contentWidth: number;
+  distLeft: number;
+  distRight: number;
+};
+declare const floatingTableReservesBand: ({
+  contentX,
+  tableWidth,
+  contentWidth,
+  distLeft,
+  distRight
+}: FloatingTableBandOptions) => boolean;
 /**
  * CSS class names for page elements
  */
@@ -276,4 +290,4 @@ declare function findPageShellForPmPos(container: HTMLElement, pmPos: number): {
   isExact: boolean;
 } | null;
 //#endregion
-export { AnchoredImagePosition, FootnoteRenderItem, type HeaderFooterContent, HeaderFooterLayoutInfo, PAGE_CLASS_NAMES, PAINTER_PAINTED_EVENT, PageFloatingImage, PageGeometry, PainterPaintedDetail, type RenderContext, RenderPageOptions, applySectionHeaderFooterOptions, calculateFootnoteAreaRenderHeight, computePageFingerprint, emuToPixels, findPageShellForPmPos, getDefaultPageFontFamily, isFloatingImageRun, renderAllPagesNow, renderFloatingImagesLayer, renderFootnoteArea, renderPage, renderPages, resolveAnchoredImagePosition, resolveHeaderFooterFloatLeft };
+export { AnchoredImagePosition, FootnoteRenderItem, type HeaderFooterContent, HeaderFooterLayoutInfo, PAGE_CLASS_NAMES, PAINTER_PAINTED_EVENT, PageFloatingImage, PageGeometry, PainterPaintedDetail, type RenderContext, RenderPageOptions, applySectionHeaderFooterOptions, calculateFootnoteAreaRenderHeight, computePageFingerprint, emuToPixels, findPageShellForPmPos, floatingTableReservesBand, getDefaultPageFontFamily, isFloatingImageRun, renderAllPagesNow, renderFloatingImagesLayer, renderFootnoteArea, renderPage, renderPages, resolveAnchoredImagePosition, resolveHeaderFooterFloatLeft };

package/dist/layout-painter/renderPage.js

@@ -19,6 +19,11 @@ import { panic } from "better-result";
 * Renders a single page from Layout data to DOM elements.
 * Each page contains positioned fragments within a content area.
 */
+const floatingTableReservesBand = ({ contentX, tableWidth, contentWidth, distLeft, distRight }) => {
+	const leftClearance = Math.max(0, contentX - distLeft);
+	const rightClearance = Math.max(0, contentWidth - contentX - tableWidth - distRight);
+	return Math.max(leftClearance, rightClearance) < 24;
+};
 /**
 * CSS class names for page elements
 */
@@ -874,7 +879,8 @@ function renderPage(page, context, options = {}) {
 			...img.wrapType !== void 0 ? { wrapType: img.wrapType } : {}
 		});
 	}
-	if (options.blockLookup) for (const fragment of page.fragments) {
+	if (options.blockLookup) for (let fragmentIndex = 0; fragmentIndex < page.fragments.length; fragmentIndex++) {
+		const fragment = page.fragments[fragmentIndex];
 		if (fragment.kind !== "table") continue;
 		const blockData = options.blockLookup.get(String(fragment.blockId));
 		if (blockData?.block.kind !== "table") continue;
@@ -886,9 +892,8 @@ function renderPage(page, context, options = {}) {
 		const distBottom = floating.bottomFromText ?? 0;
 		const distLeft = floating.leftFromText ?? 12;
 		const distRight = floating.rightFromText ?? 12;
-		const side = contentX < contentWidth / 2 ? "left" : "right";
-		floatingRects.push({
-			side,
+		const rect = {
+			side: contentX < contentWidth / 2 ? "left" : "right",
 			x: contentX,
 			y: contentY,
 			width: fragment.width,
@@ -897,7 +902,19 @@ function renderPage(page, context, options = {}) {
 			distBottom,
 			distLeft,
 			distRight
+		};
+		if (floatingTableReservesBand({
+			contentX,
+			tableWidth: fragment.width,
+			contentWidth,
+			distLeft,
+			distRight
+		})) rect.wrapType = "topAndBottom";
+		if (floating.vertAnchor === "text") scopedFloatingRects.push({
+			startsAtFragmentIndex: fragmentIndex,
+			rect
 		});
+		else floatingRects.push(rect);
 	}
 	if (options.blockLookup) for (let fragmentIndex = 0; fragmentIndex < page.fragments.length; fragmentIndex++) {
 		const fragment = page.fragments[fragmentIndex];
@@ -1162,7 +1179,8 @@ function applySectionHeaderFooterOptions(page, pageOptions, options) {
 	if (!refs) return false;
 	const isFirstSectionPage = page.sectionPageNumber === 1;
 	const useFirst = refs.titlePg === true && isFirstSectionPage;
-	const useEven = (page.sectionPageNumber ?? page.number) % 2 === 0;
+	const sectionPageNumber = page.sectionPageNumber ?? page.number;
+	const useEven = refs.evenAndOddHeaders === true && sectionPageNumber % 2 === 0;
 	const headerRId = (() => {
 		if (useFirst) return refs.headerFirst;
 		if (useEven && refs.headerEven) return refs.headerEven;
@@ -1556,22 +1574,21 @@ function renderPages(pages, container, options = {}) {
 	const pageShells = [];
 	for (let i = 0; i < pages.length; i++) {
 		const page = pages[i];
+		let pageEl;
 		if (!useVirtualization) {
 			const { context, pageOptions } = buildPageRenderArgs(page, totalPages, options);
-			const pageEl = renderPage(page, context, pageOptions);
-			container.insertBefore(pageEl, overlayBefore);
-			pageShells.push(pageEl);
+			pageEl = renderPage(page, context, pageOptions);
 		} else {
 			const doc = options.document ?? document;
-			const pageEl = doc.createElement("div");
+			pageEl = doc.createElement("div");
 			pageEl.className = options.pageClassName ?? PAGE_CLASS_NAMES.page;
 			pageEl.dataset["pageNumber"] = String(page.number);
 			pageEl.dataset["pageIndex"] = String(i);
 			applyPageStyles(pageEl, page.size.w, page.size.h, options);
 			syncPageBorderOverlay(pageEl, page, options, doc);
-			container.insertBefore(pageEl, overlayBefore);
-			pageShells.push(pageEl);
 		}
+		container.insertBefore(pageEl, overlayBefore);
+		pageShells.push(pageEl);
 	}
 	if (!useVirtualization) {
 		emitPainterPainted(container);
@@ -1819,4 +1836,4 @@ function depopulatePageShell(shell, pageDataMap) {
 	}
 }
 //#endregion
-export { PAGE_CLASS_NAMES, PAINTER_PAINTED_EVENT, applySectionHeaderFooterOptions, calculateFootnoteAreaRenderHeight, computePageFingerprint, emuToPixels, findPageShellForPmPos, getDefaultPageFontFamily, isFloatingImageRun, renderAllPagesNow, renderFloatingImagesLayer, renderFootnoteArea, renderPage, renderPages, resolveAnchoredImagePosition, resolveHeaderFooterFloatLeft };
+export { PAGE_CLASS_NAMES, PAINTER_PAINTED_EVENT, applySectionHeaderFooterOptions, calculateFootnoteAreaRenderHeight, computePageFingerprint, emuToPixels, findPageShellForPmPos, floatingTableReservesBand, getDefaultPageFontFamily, isFloatingImageRun, renderAllPagesNow, renderFloatingImagesLayer, renderFootnoteArea, renderPage, renderPages, resolveAnchoredImagePosition, resolveHeaderFooterFloatLeft };

package/dist/layout-painter/renderParagraph.js

@@ -330,6 +330,10 @@ function renderTabRun(run, doc, width, leader) {
 	} else span.textContent = "\xA0";
 	return span;
 }
+function canClampTabToRightEdge(alignment, hasPriorRenderedContent, hasPriorTab, isLastLine) {
+	if (alignment === "start" || alignment === "default") return hasPriorRenderedContent && (hasPriorTab || isLastLine);
+	return true;
+}
 function applyTabUnderline(element, run) {
 	if (!run.underline) return;
 	removeUnderlineTextDecoration(element);
@@ -529,7 +533,9 @@ const EMPTY_SEQ_VALUES = /* @__PURE__ */ new Map();
 * Returns the cached fallback when no render context is available.
 */
 function resolveFieldText(run, context) {
-	if (!context) return run.fallback ?? "";
+	const fallback = run.fallback ?? "";
+	if (run.fieldType === "OTHER" && run.pmStart === void 0) return fallback;
+	if (!context) return fallback;
 	const fieldContext = {
 		pageNumber: context.pageNumber,
 		totalPages: context.totalPages,
@@ -540,7 +546,7 @@ function resolveFieldText(run, context) {
 		...context.sectionPages === void 0 ? {} : { sectionPages: context.sectionPages }
 	};
 	return evaluateFieldInstruction(run.instruction || run.fieldType, fieldContext, {
-		fallback: run.fallback ?? "",
+		fallback,
 		...run.pmStart === void 0 ? {} : { instanceId: run.pmStart },
 		...run.fldLock ? { locked: true } : {}
 	});
@@ -710,6 +716,17 @@ function splitTextRunsByEastAsia(runs) {
 * must trigger within this slack.
 */
 const RIGHT_EDGE_EPSILON_PX = .5;
+function countShrinkableSpaces(runs) {
+	let count = 0;
+	for (const run of runs) if (isTextRun(run)) {
+		for (const char of run.text ?? "") if (char === " ") count++;
+	} else if (isFieldRun(run)) {
+		for (const char of run.fallback ?? "") if (char === " ") count++;
+	} else if (isMathRun(run)) {
+		for (const char of run.plainText ?? "") if (char === " ") count++;
+	}
+	return count;
+}
 /**
 * Build a TextMeasureStyle from a TextRun or FieldRun's relevant fields.
 */
@@ -888,16 +905,32 @@ function renderLine(block, line, alignment, doc, options) {
 		lineEl.append(emptySpan);
 		return lineEl;
 	}
+	const hasTabRuns = runsForLine.some(isTabRun);
 	if (alignment === "justify" && options) {
 		if (!options.isLastLine || options.paragraphEndsWithLineBreak) {
-			lineEl.style.textAlign = "justify";
-			lineEl.style.textAlignLast = "justify";
-			lineEl.style.width = `${options.availableWidth}px`;
+			const firstLineIndentPx = options.isFirstLine ? options.firstLineIndentPx ?? 0 : 0;
+			const firstLineHangingPx = Math.max(0, -firstLineIndentPx);
+			const justifyCapacityPx = options.availableWidth + firstLineHangingPx;
+			const overfullPx = line.width - justifyCapacityPx;
+			const shrinkableSpaces = countShrinkableSpaces(runsForLine);
+			if (overfullPx > RIGHT_EDGE_EPSILON_PX && shrinkableSpaces > 0) {
+				lineEl.style.textAlign = "left";
+				lineEl.style.textAlignLast = "auto";
+				lineEl.style.wordSpacing = `${-overfullPx / shrinkableSpaces}px`;
+			} else if (hasTabRuns && shrinkableSpaces > 0 && -overfullPx > RIGHT_EDGE_EPSILON_PX) {
+				lineEl.style.textAlign = "left";
+				lineEl.style.textAlignLast = "auto";
+				lineEl.style.wordSpacing = `${-overfullPx / shrinkableSpaces}px`;
+			} else {
+				lineEl.style.textAlign = "justify";
+				lineEl.style.textAlignLast = "justify";
+			}
+			const listFirstLineOffset = options.isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden ? options.firstLineIndentPx ?? 0 : 0;
+			lineEl.style.width = `${options.availableWidth - listFirstLineOffset}px`;
 		}
 	}
 	lineEl.style.whiteSpace = "pre";
 	lineEl.style.overflow = "visible";
-	const hasTabRuns = runsForLine.some(isTabRun);
 	let tabContext;
 	const measureText = createTextMeasurer(doc);
 	if (hasTabRuns) {
@@ -905,6 +938,7 @@ function renderLine(block, line, alignment, doc, options) {
 		const leftIndentTwips = options?.leftIndentPx ? Math.round(options.leftIndentPx * 15) : 0;
 		tabContext = {
 			...explicitStops !== void 0 ? { explicitStops } : {},
+			...block.attrs?.defaultTabStopTwips !== void 0 ? { defaultTabInterval: block.attrs.defaultTabStopTwips } : {},
 			leftIndent: leftIndentTwips
 		};
 	}
@@ -967,7 +1001,7 @@ function renderLine(block, line, alignment, doc, options) {
 				break;
 			}
 			let tabWidth = tabResult.width;
-			if (lineRightEdgeX !== void 0 && currentX + tabWidth + followingWidthForCheck > lineRightEdgeX) tabWidth = Math.max(1, lineRightEdgeX - currentX - followingWidthForCheck);
+			if (lineRightEdgeX !== void 0 && canClampTabToRightEdge(tabResult.alignment, i > 0, runsForLine.slice(0, i).some(isTabRun), options?.isLastLine === true) && currentX + tabWidth + followingWidthForCheck > lineRightEdgeX) tabWidth = Math.max(1, lineRightEdgeX - currentX - followingWidthForCheck);
 			const tabEl = renderTabRun(run, doc, tabWidth, tabResult.leader);
 			lineEl.append(tabEl);
 			currentX += tabWidth;
@@ -1215,7 +1249,7 @@ 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) lineEl.style.paddingLeft = `${indent.hanging ?? 0}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;
@@ -1234,7 +1268,8 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 			const markerFontFamily = block.attrs.listMarkerFontFamily ?? firstTextRun?.fontFamily ?? block.attrs.defaultFontFamily;
 			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);
-			if (markerStart < 0 && indentLeft > 0) marker.style.marginLeft = `${markerStart}px`;
+			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
+			if (markerMarginLeft < 0 && indentLeft !== 0) marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
 		}
 		fragmentEl.append(lineEl);

package/dist/layout-painter/renderTable.js

@@ -1,3 +1,4 @@
+import { tableColumnsArePinned } from "../layout-engine/types.js";
 import { measureParagraph } from "../layout-engine/measure/measureParagraph.js";
 import { getAutomaticTextColorForBackground } from "./documentColors.js";
 import { renderParagraphFragment } from "./renderParagraph.js";
@@ -97,6 +98,10 @@ function renderCellContent(cell, cellMeasure, context, doc) {
 			};
 			const fragEl = renderParagraphFragment(syntheticFragment, paragraphBlock, paragraphMeasure, cellContext, { document: doc });
 			fragEl.style.position = "relative";
+			fragEl.style.boxSizing = "border-box";
+			fragEl.style.height = `${paragraphMeasure.totalHeight}px`;
+			const spaceBefore = paragraphBlock.attrs?.spacing?.before ?? 0;
+			if (spaceBefore > 0) fragEl.style.paddingTop = `${spaceBefore}px`;
 			contentEl.append(fragEl);
 			cumulativeY += paragraphMeasure.totalHeight;
 		} else if (block?.kind === "table" && measure?.kind === "table") {
@@ -133,12 +138,17 @@ function renderNestedTable(block, measure, context, doc) {
 	}
 	rowYPositions.push(yPos);
 	const spanningCells = /* @__PURE__ */ new Map();
+	const columnsPinned = tableColumnsArePinned(block);
 	let y = 0;
 	for (let rowIndex = 0; rowIndex < block.rows.length; rowIndex++) {
 		const row = block.rows[rowIndex];
 		const rowMeasure = measure.rows[rowIndex];
 		if (!row || !rowMeasure) continue;
-		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, void 0, block.bidi);
+		if (row.hidden) {
+			y += rowMeasure.height;
+			continue;
+		}
+		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, void 0, block.bidi, columnsPinned);
 		tableEl.append(rowEl);
 		y += rowMeasure.height;
 	}
@@ -161,7 +171,7 @@ function applyBorder(el, side, border) {
 /**
 * Render a single table cell
 */
-function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, context, doc) {
+function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, columnsPinned, context, doc) {
 	const cellEl = doc.createElement("div");
 	cellEl.className = TABLE_CLASS_NAMES.cell;
 	cellEl.style.position = "absolute";
@@ -187,7 +197,7 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, context,
 		const automaticTextColor = getAutomaticTextColorForBackground(cell.background);
 		if (automaticTextColor) cellEl.style.color = automaticTextColor;
 	}
-	if (cell.noWrap) cellEl.style.whiteSpace = "nowrap";
+	if (cell.noWrap && !columnsPinned) cellEl.style.whiteSpace = "nowrap";
 	if (cell.verticalAlign) {
 		cellEl.style.display = "flex";
 		cellEl.style.flexDirection = "column";
@@ -218,7 +228,7 @@ function renderTableCell(cell, cellMeasure, x, rowHeight, borderFlags, context,
 /**
 * Render a table row with rowSpan support
 */
-function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, bidi = false) {
+function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, bidi = false, columnsPinned = false) {
 	const rowEl = doc.createElement("div");
 	rowEl.className = TABLE_CLASS_NAMES.row;
 	const tableWidth = bidi ? columnWidths.reduce((sum, columnWidth) => sum + columnWidth, 0) : 0;
@@ -262,7 +272,7 @@ function renderTableRow(row, rowMeasure, rowIndex, y, columnWidths, totalRows, c
 			isLastRow,
 			isFirstCol: bidi ? atLogicalEnd : atLogicalStart,
 			isLastCol: bidi ? atLogicalStart : atLogicalEnd
-		}, context, doc);
+		}, columnsPinned, context, doc);
 		cellEl.dataset["cellIndex"] = String(cellIndex);
 		cellEl.dataset["columnIndex"] = String(columnIndex);
 		if (rowSpan > 1) cellEl.dataset["rowSpan"] = String(rowSpan);
@@ -340,13 +350,18 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 	}
 	rowYPositions.push(yPos);
 	const spanningCells = /* @__PURE__ */ new Map();
+	const columnsPinned = tableColumnsArePinned(block);
 	const headerRowCount = fragment.headerRowCount ?? 0;
 	let y = 0;
 	if (headerRowCount > 0 && fragment.continuesFromPrev) for (let hdrIdx = 0; hdrIdx < headerRowCount; hdrIdx++) {
 		const hdrRow = block.rows[hdrIdx];
 		const hdrRowMeasure = measure.rows[hdrIdx];
 		if (!hdrRow || !hdrRowMeasure) continue;
-		const rowEl = renderTableRow(hdrRow, hdrRowMeasure, hdrIdx, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, hdrIdx === 0, block.bidi);
+		if (hdrRow.hidden) {
+			y += hdrRowMeasure.height;
+			continue;
+		}
+		const rowEl = renderTableRow(hdrRow, hdrRowMeasure, hdrIdx, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, hdrIdx === 0, block.bidi, columnsPinned);
 		rowEl.dataset["repeatedHeader"] = "true";
 		tableEl.append(rowEl);
 		y += hdrRowMeasure.height;
@@ -369,13 +384,18 @@ function renderTableFragment(fragment, block, measure, context, options = {}) {
 		const row = block.rows[rowIndex];
 		const rowMeasure = measure.rows[rowIndex];
 		if (!row || !rowMeasure) continue;
+		if (row.hidden) {
+			y += rowMeasure.height;
+			continue;
+		}
 		const isFirstRowInFragment = headerRowCount > 0 && fragment.continuesFromPrev ? false : fragment.continuesFromPrev && rowIndex === fragment.fromRow;
-		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, block.bidi);
+		const rowEl = renderTableRow(row, rowMeasure, rowIndex, y, measure.columnWidths, block.rows.length, context, doc, spanningCells, rowYPositions, isFirstRowInFragment, block.bidi, columnsPinned);
 		contentParent.append(rowEl);
 		y += rowMeasure.height;
 	}
 	let handleY = 0;
 	for (let rowIdx = fragment.fromRow; rowIdx < fragment.toRow; rowIdx++) {
+		if (block.rows[rowIdx]?.hidden) continue;
 		handleY += measure.rows[rowIdx]?.height ?? 0;
 		if (rowIdx < fragment.toRow - 1) {
 			const rowHandle = doc.createElement("div");

package/dist/managers/DocumentLoaderManager.d.ts

@@ -41,7 +41,9 @@ declare class DocumentLoaderManager {
    * the result (and any error) when a newer load started while this one was in
    * flight.
    */
-  loadBuffer(buffer: DocxInput): Promise<void>;
+  loadBuffer(buffer: DocxInput, options?: {
+    password?: string | undefined;
+  }): Promise<void>;
 }
 //#endregion
 export { DocumentLoadState, DocumentLoaderCallbacks, DocumentLoaderHistory, DocumentLoaderManager };

package/dist/managers/DocumentLoaderManager.js

@@ -1,6 +1,7 @@
 import { resetAuthorColors } from "../utils/authorColors.js";
 import { loadFontsWithMapping } from "../utils/fontLoader.js";
 import { parseDocx } from "../docx/parser.js";
+import { recordDocumentLoadPhase } from "../layout-engine/layoutInstrumentation.js";
 import { inspectDocxCompatibility } from "../docx/compatibility.js";
 //#region src/managers/DocumentLoaderManager.ts
 /**
@@ -43,15 +44,22 @@ var DocumentLoaderManager = class {
 	* the result (and any error) when a newer load started while this one was in
 	* flight.
 	*/
-	async loadBuffer(buffer) {
+	async loadBuffer(buffer, options = {}) {
 		const { history, onError, setDocumentLoadState } = this.callbacks;
 		const generation = ++this.loadGeneration;
 		if (!(history.state !== null)) setDocumentLoadState({ status: "loading" });
 		try {
-			const doc = await parseDocx(buffer, {
-				detectVariables: false,
-				preloadFonts: false
-			});
+			const parseStartedAt = performance.now();
+			let doc;
+			try {
+				doc = await parseDocx(buffer, {
+					detectVariables: false,
+					preloadFonts: false,
+					password: options.password
+				});
+			} finally {
+				recordDocumentLoadPhase("docx-parse", performance.now() - parseStartedAt);
+			}
 			if (this.loadGeneration !== generation) return;
 			this.loadParsedDocument(doc);
 		} catch (error) {

package/dist/managers/TableSelectionManager.js

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

package/dist/model.js

@@ -1,4 +1,4 @@
-import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "./types/documentEnumValues.js";
 import { deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId } from "./types/block-id.js";
+import { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES } from "./types/documentEnumValues.js";
 import { types_exports } from "./layout-engine/types.js";
 export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, types_exports as Layout, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, deriveBlockId, getFolioParaIdFromBlockId, getSequentialFolioBlockIdIndex, isFolioBlockId, isSequentialFolioBlockId };

package/dist/paged-layout/pageText.d.ts

@@ -0,0 +1,14 @@
+import { Layout } from "../layout-engine/types.js";
+import { Node } from "prosemirror-model";
+
+//#region src/paged-layout/pageText.d.ts
+/**
+ * The plain text of a single rendered page (1-based), read by joining each of
+ * the page's layout fragments' `[pmStart, pmEnd)` document text with a
+ * newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+ * are skipped. Returns `null` when the layout hasn't been computed yet or the
+ * page number is out of range.
+ */
+declare const getPageTextFromLayout: (layout: Layout | null, doc: Node, page: number) => string | null;
+//#endregion
+export { getPageTextFromLayout };

package/dist/paged-layout/pageText.js

@@ -0,0 +1,21 @@
+//#region src/paged-layout/pageText.ts
+/**
+* The plain text of a single rendered page (1-based), read by joining each of
+* the page's layout fragments' `[pmStart, pmEnd)` document text with a
+* newline. Fragments with no `pmStart`/`pmEnd` (e.g. a page-shell placeholder)
+* are skipped. Returns `null` when the layout hasn't been computed yet or the
+* page number is out of range.
+*/
+const getPageTextFromLayout = (layout, doc, page) => {
+	if (!layout || !Number.isInteger(page) || page < 1) return null;
+	const layoutPage = layout.pages[page - 1];
+	if (!layoutPage) return null;
+	const fragmentTexts = [];
+	for (const fragment of layoutPage.fragments) {
+		if (typeof fragment.pmStart !== "number" || typeof fragment.pmEnd !== "number") continue;
+		fragmentTexts.push(doc.textBetween(fragment.pmStart, fragment.pmEnd, "\n"));
+	}
+	return fragmentTexts.join("\n");
+};
+//#endregion
+export { getPageTextFromLayout };

package/dist/prosemirror/attrs/index.js

@@ -174,6 +174,7 @@ const readParagraphAttrs = (node) => {
 	});
 	optionalOneOf(attrs, "sectionBreakType", "paragraph.attrs.sectionBreakType", issues, SECTION_BREAK_TYPES);
 	optionalStringArray(attrs, "listLevelNumFmts", "paragraph.attrs.listLevelNumFmts", issues);
+	optionalNumberArray(attrs, "listLevelStarts", "paragraph.attrs.listLevelStarts", issues);
 	optionalNumber(attrs, "listAbstractNumId", "paragraph.attrs.listAbstractNumId", issues);
 	optionalBorderMap(attrs, "borders", "paragraph.attrs.borders", issues, [
 		"top",
@@ -186,6 +187,7 @@ const readParagraphAttrs = (node) => {
 	optionalShading(attrs, "shading", "paragraph.attrs.shading", issues);
 	optionalTabStops(attrs, "tabs", "paragraph.attrs.tabs", issues);
 	optionalRecord(attrs, "spacingExplicit", "paragraph.attrs.spacingExplicit", issues);
+	optionalRecord(attrs, "spacingFromDocDefaults", "paragraph.attrs.spacingFromDocDefaults", issues);
 	optionalTextFormatting(attrs, "defaultTextFormatting", "paragraph.attrs.defaultTextFormatting", issues);
 	optionalRecord(attrs, "numPr", "paragraph.attrs.numPr", issues);
 	validateNumPr(attrs["numPr"], issues);
@@ -236,6 +238,7 @@ const readTableRowAttrs = (node) => {
 	optionalNumber(attrs, "height", "tableRow.attrs.height", issues);
 	optionalOneOf(attrs, "heightRule", "tableRow.attrs.heightRule", issues, TABLE_ROW_HEIGHT_RULE_VALUES);
 	optionalBoolean(attrs, "isHeader", "tableRow.attrs.isHeader", issues);
+	optionalBoolean(attrs, "hidden", "tableRow.attrs.hidden", issues);
 	optionalRecord(attrs, "_originalFormatting", "tableRow.attrs._originalFormatting", issues);
 	return attrsResult(attrs, issues);
 };

package/dist/prosemirror/commands/comments.js

@@ -1,3 +1,4 @@
+import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, sectionRejectProperties, tableCellRejectAttrPatch, tableRejectAttrPatch, tableRowRejectAttrPatch } from "./propertyChangeScope.js";
 //#region src/prosemirror/commands/comments.ts
 /**
 * Add a comment mark to the current selection.
@@ -59,21 +60,47 @@ function resolveChange(from, to, mode, revisionIds) {
 				if (node.type.name === "paragraph") {
 					const op = collectPPrMarkOp(node, pos, from, to, mode, revisionSet);
 					if (op) pPrMarkOps.push(op);
+					const boundaryCovered = rangeCoversParagraphBoundary(from, to, pos, node);
+					let nextAttrs = null;
 					const propertyChanges = node.attrs["_propertyChanges"];
-					if (Array.isArray(propertyChanges) && propertyChanges.length > 0 && rangeCoversParagraphBoundary(from, to, pos, node)) {
+					if (Array.isArray(propertyChanges) && propertyChanges.length > 0 && boundaryCovered) {
 						const matches = propertyChanges.filter((c) => revisionSet === null || c.info && revisionSet.has(c.info.id));
 						if (matches.length > 0) {
 							const remaining = propertyChanges.filter((c) => revisionSet !== null && (!c.info || !revisionSet.has(c.info.id)));
-							const nextAttrs = {
+							nextAttrs = {
 								...node.attrs,
 								_propertyChanges: remaining.length > 0 ? remaining : null
 							};
-							if (mode === "reject") {
-								for (const change of matches.toReversed()) if (change.previousFormatting) for (const [key, val] of Object.entries(change.previousFormatting)) nextAttrs[key] = val;
+							if (mode === "reject") for (const change of matches.toReversed()) {
+								Object.assign(nextAttrs, paragraphRejectAttrPatch(change.previousFormatting));
+								nextAttrs["_originalFormatting"] = paragraphRejectOriginalFormatting(change.previousFormatting, node.attrs["_originalFormatting"]);
 							}
-							tr.setNodeMarkup(pos, void 0, nextAttrs);
 						}
 					}
+					const sectionProperties = node.attrs["_sectionProperties"];
+					const sectionChanges = sectionProperties?.propertyChanges;
+					if (sectionProperties && Array.isArray(sectionChanges) && sectionChanges.length > 0 && boundaryCovered) {
+						const matches = sectionChanges.filter((c) => revisionSet === null || c.info && revisionSet.has(c.info.id));
+						if (matches.length > 0) {
+							const remaining = sectionChanges.filter((c) => revisionSet !== null && (!c.info || !revisionSet.has(c.info.id)));
+							let restored = { ...sectionProperties };
+							if (mode === "reject") for (const change of matches.toReversed()) restored = sectionRejectProperties(restored, change.previousProperties);
+							delete restored.propertyChanges;
+							if (remaining.length > 0) restored.propertyChanges = remaining;
+							nextAttrs = nextAttrs ?? { ...node.attrs };
+							nextAttrs["_sectionProperties"] = restored;
+							nextAttrs["sectionBreakType"] = sectionBreakTypeFromSectionStart(restored.sectionStart);
+						}
+					}
+					if (nextAttrs) tr.setNodeMarkup(pos, void 0, nextAttrs);
+					return true;
+				}
+				const tableChangeAttrName = TABLE_PROPERTY_CHANGE_ATTR_BY_NODE[node.type.name];
+				if (tableChangeAttrName !== void 0) {
+					if (rangeCoversNode(from, to, pos, node)) {
+						const nextAttrs = resolveTablePropertyChangeAttrs(node, tableChangeAttrName, mode, revisionSet);
+						if (nextAttrs) tr.setNodeMarkup(pos, void 0, nextAttrs);
+					}
 					return true;
 				}
 				if (!node.isInline) return true;
@@ -124,6 +151,49 @@ function rangeCoversParagraphBoundary(from, to, pos, node) {
 	const boundaryTo = pos + node.nodeSize;
 	return from <= boundaryFrom && to >= boundaryTo;
 }
+/** Whether [from, to] fully covers the node — the range property-change cards
+* and accept-all / reject-all sweeps supply for table-level records. */
+function rangeCoversNode(from, to, pos, node) {
+	return from <= pos && to >= pos + node.nodeSize;
+}
+const SECTION_BREAK_TYPE_VALUES = [
+	"nextPage",
+	"continuous",
+	"oddPage",
+	"evenPage"
+];
+function sectionBreakTypeFromSectionStart(sectionStart) {
+	return SECTION_BREAK_TYPE_VALUES.find((value) => value === sectionStart) ?? null;
+}
+/** PM node type name → the attr its tracked property-change records live on. */
+const TABLE_PROPERTY_CHANGE_ATTR_BY_NODE = {
+	table: "tblPrChange",
+	tableRow: "trPrChange",
+	tableCell: "tcPrChange",
+	tableHeader: "tcPrChange"
+};
+/**
+* Resolve the tracked property-change records on one table / row / cell node.
+* Accept keeps the live formatting and clears the matched records; reject
+* additionally restores the stored previous formatting wholesale (the change
+* element stores the complete old property set — see propertyChangeScope.ts).
+* Returns the next attrs, or `null` when no record matches.
+*/
+function resolveTablePropertyChangeAttrs(node, attrName, mode, revisionSet) {
+	const changes = node.attrs[attrName];
+	if (!Array.isArray(changes) || changes.length === 0) return null;
+	const matches = changes.filter((c) => revisionSet === null || c.info && revisionSet.has(c.info.id));
+	if (matches.length === 0) return null;
+	const remaining = changes.filter((c) => revisionSet !== null && (!c.info || !revisionSet.has(c.info.id)));
+	const nextAttrs = {
+		...node.attrs,
+		[attrName]: remaining.length > 0 ? remaining : null
+	};
+	if (mode === "reject") for (const change of matches.toReversed()) if (attrName === "tblPrChange") Object.assign(nextAttrs, tableRejectAttrPatch(change.previousFormatting));
+	else if (attrName === "trPrChange") Object.assign(nextAttrs, tableRowRejectAttrPatch(change.previousFormatting));
+	else Object.assign(nextAttrs, tableCellRejectAttrPatch(change.previousFormatting, node.attrs["_originalFormatting"]));
+	return nextAttrs;
+}
 function isPPrMarkAttr(value) {
 	if (typeof value !== "object" || value === null) return false;
 	const kind = value.kind;

package/dist/prosemirror/commands/hyperlink.js

@@ -39,7 +39,8 @@ const editHyperlinkAtCursor = (view, { displayText, href }) => {
 	const { $from } = view.state.selection;
 	const linkMark = $from.marks().find((m) => m.type === hlType);
 	if (!linkMark) return true;
-	const targetRange = rangeAtCursor(collectHyperlinkRanges($from.parent, $from.start(), hlType, hyperlinkHref(linkMark)), $from.pos);
+	const ranges = collectHyperlinkRanges($from.parent, $from.start(), hlType, hyperlinkHref(linkMark));
+	const targetRange = rangeAtCursor(ranges, $from.pos);
 	if (!targetRange) return false;
 	const { tooltip } = expectHyperlinkMarkAttrs(linkMark);
 	const newMark = hlType.create({
@@ -69,7 +70,8 @@ const removeHyperlinkAtCursor = (view, { popupHref }) => {
 		}
 	});
 	if (!linkMark) return false;
-	const targetRange = rangeAtCursor(collectHyperlinkRanges($from.parent, $from.start(), hlType, hyperlinkHref(linkMark)), $from.pos);
+	const ranges = collectHyperlinkRanges($from.parent, $from.start(), hlType, hyperlinkHref(linkMark));
+	const targetRange = rangeAtCursor(ranges, $from.pos);
 	if (!targetRange) return false;
 	const tr = view.state.tr.removeMark(targetRange.start, targetRange.end, hlType);
 	view.dispatch(tr.scrollIntoView());

package/dist/prosemirror/commands/image.js

@@ -124,7 +124,8 @@ const applyImageWrapType = (view, pos, wrapType) => {
 const applyImageTransform = (view, pos, action) => {
 	const node = imageNodeAt(view, pos);
 	if (!node) return false;
-	const transform = computeImageTransform(expectImageAttrs(node).transform ?? "", action);
+	const currentTransform = expectImageAttrs(node).transform ?? "";
+	const transform = computeImageTransform(currentTransform, action);
 	const tr = view.state.tr.setNodeMarkup(pos, void 0, mergeImageAttrs(node, { transform }));
 	view.dispatch(tr.scrollIntoView());
 	return true;

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 };