@stll/folio-core 0.62.0 → 0.63.0

package/dist/layout-bridge/engine/clickToPosition.d.ts

@@ -4,7 +4,7 @@ import { FragmentHit, TableCellHit } from "./hitTest.js";
 /**
  * Result of click-to-position mapping.
  */
-type PositionResult = {
+export type PositionResult = {
   /** ProseMirror document position. */
   pmPosition: number;
   /** Character offset within the line (for debugging). */
@@ -18,21 +18,21 @@ type PositionResult = {
  * trailing surrogate). Nudge such an offset forward to the code-point boundary
  * so ProseMirror never receives — or edits inside — a half-pair position.
  */
-declare function snapPastTrailingSurrogate(text: string, offset: number): number;
+export declare function snapPastTrailingSurrogate(text: string, offset: number): number;
 /**
  * Map a click within a paragraph fragment to a PM position.
  *
  * @param fragmentHit - The fragment hit result from hitTestFragment.
  * @returns Position result, or null if mapping fails.
  */
-declare function clickToPositionInParagraph(fragmentHit: FragmentHit): PositionResult | null;
+export declare function clickToPositionInParagraph(fragmentHit: FragmentHit): PositionResult | null;
 /**
  * Map a click within a table cell to a PM position.
  *
  * @param tableCellHit - The table cell hit result from hitTestTableCell.
  * @returns PM position, or null if mapping fails.
  */
-declare function clickToPositionInTableCell(tableCellHit: TableCellHit): number | null;
+export declare function clickToPositionInTableCell(tableCellHit: TableCellHit): number | null;
 /**
  * Main entry point: Map a click to a PM position.
  *
@@ -42,7 +42,7 @@ declare function clickToPositionInTableCell(tableCellHit: TableCellHit): number
  * @param tableCellHit - Optional table cell hit from hitTestTableCell.
  * @returns PM position, or null if mapping fails.
  */
-declare function clickToPosition(fragmentHit: FragmentHit | null, tableCellHit?: TableCellHit | null): number | null;
+export declare function clickToPosition(fragmentHit: FragmentHit | null, tableCellHit?: TableCellHit | null): number | null;
 /**
  * Map a PM position to X coordinates within a line (for caret positioning).
  *
@@ -52,17 +52,16 @@ declare function clickToPosition(fragmentHit: FragmentHit | null, tableCellHit?:
  * @param fragmentWidth - Width of the fragment.
  * @returns X coordinate relative to fragment start, or null if not found.
  */
-declare function positionToX(block: ParagraphBlock, measure: ParagraphMeasure, pmPosition: number, _fragmentWidth: number): {
+export declare function positionToX(block: ParagraphBlock, measure: ParagraphMeasure, pmPosition: number, _fragmentWidth: number): {
   x: number;
   lineIndex: number;
 } | null;
 /**
  * Get the bounding rect for a PM position (for caret rendering).
  */
-declare function getPositionRect(block: ParagraphBlock, measure: ParagraphMeasure, pmPosition: number, fragmentX: number, fragmentY: number, fragmentWidth: number, fromLine: number): {
+export declare function getPositionRect(block: ParagraphBlock, measure: ParagraphMeasure, pmPosition: number, fragmentX: number, fragmentY: number, fragmentWidth: number, fromLine: number): {
   x: number;
   y: number;
   height: number;
 } | null;
-//#endregion
-export { PositionResult, clickToPosition, clickToPositionInParagraph, clickToPositionInTableCell, getPositionRect, positionToX, snapPastTrailingSurrogate };
+//#endregion

package/dist/layout-bridge/engine/clickToPosition.js

@@ -1,8 +1,10 @@
 import { measuredLineAdvance, measuredLineContentOffset } from "../../layout-engine/lineFlow.js";
-import { buildRunFontStyle, findCharacterAtX } from "../../layout-engine/measure/measureHelpers.js";
-import { measureRun } from "../../layout-engine/measure/measureProvider.js";
-import { resolvePhysicalParagraphInlineLayout } from "../../utils/paragraphInlineLayout.js";
+import { automaticRunGap } from "../../layout-engine/measure/automaticTextSpacing.js";
+import { DEFAULT_FONT_FAMILY, buildRunFontStyle, findCharacterAtX } from "../../layout-engine/measure/measureHelpers.js";
+import { measurePositionedRun } from "../../layout-engine/measure/measureProvider.js";
+import { resolveParagraphLineGeometryForBlock, resolvePhysicalParagraphInlineLayout } from "../../utils/paragraphInlineLayout.js";
 import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
+import { computeLinePmRange } from "./linePmRange.js";
 //#region src/layout-bridge/engine/clickToPosition.ts
 /**
 * Click-to-Position Mapping
@@ -17,7 +19,7 @@ import { inlineImageBoundingBox } from "../../utils/rotationBoundingBox.js";
 * Extract FontStyle from a run for measurement.
 */
 function runToFontStyle(run) {
-	return buildRunFontStyle(run, "Arial", 12);
+	return buildRunFontStyle(run, DEFAULT_FONT_FAMILY, 11);
 }
 /**
 * A click in the second half of an astral glyph can resolve to the UTF-16
@@ -39,7 +41,7 @@ function sliceRunsForLine(block, line) {
 	for (let runIndex = line.fromRun; runIndex <= line.toRun && runIndex < block.runs.length; runIndex++) {
 		const run = block.runs[runIndex];
 		if (!run) continue;
-		if (run.kind === "tab" || run.kind === "image" || run.kind === "lineBreak") {
+		if (run.kind !== "text") {
 			result.push(run);
 			continue;
 		}
@@ -61,47 +63,6 @@ function sliceRunsForLine(block, line) {
 	return result;
 }
 /**
-* Calculate the PM position range for a line.
-*/
-function computeLinePmRange(block, line) {
-	let pmStart;
-	let pmEnd;
-	const blockPmStart = block.pmStart ?? 0;
-	let charOffset = 0;
-	for (let runIndex = 0; runIndex < block.runs.length && runIndex <= line.toRun; runIndex++) {
-		const run = block.runs[runIndex];
-		if (!run) continue;
-		if (runIndex < line.fromRun) {
-			if (run.kind === "text") charOffset += run.text.length;
-			else if (run.kind === "tab" || run.kind === "lineBreak" || run.kind === "renderedPageBreak") charOffset += 1;
-			else if (run.kind === "image") charOffset += 1;
-		} else if (runIndex === line.fromRun) {
-			charOffset += line.fromChar;
-			pmStart = blockPmStart + charOffset;
-			if (run.kind === "text") charOffset = line.fromChar;
-		}
-	}
-	if (pmStart !== void 0) {
-		let lineLength = 0;
-		for (let runIndex = line.fromRun; runIndex <= line.toRun && runIndex < block.runs.length; runIndex++) {
-			const run = block.runs[runIndex];
-			if (!run) continue;
-			if (run.kind === "text") {
-				const text = run.text;
-				const start = runIndex === line.fromRun ? line.fromChar : 0;
-				const end = runIndex === line.toRun ? line.toChar : text.length;
-				lineLength += end - start;
-			} else if (run.kind === "tab" || run.kind === "lineBreak" || run.kind === "renderedPageBreak") lineLength += 1;
-			else if (run.kind === "image") lineLength += 1;
-		}
-		pmEnd = pmStart + lineLength;
-	}
-	return {
-		pmStart,
-		pmEnd
-	};
-}
-/**
 * Find which line contains a Y coordinate within a fragment.
 *
 * @param measure - The paragraph measure with lines.
@@ -142,7 +103,9 @@ function findCharacterInLine({ block, line, x, availableWidth, alignment }) {
 	};
 	let currentX = 0;
 	let currentCharOffset = 0;
-	for (const run of runs) {
+	for (let runIndex = 0; runIndex < runs.length; runIndex += 1) {
+		const run = runs[runIndex];
+		if (run === void 0) continue;
 		if (run.kind === "tab") {
 			const tabWidth = run.width ?? 48;
 			const runEndX = currentX + tabWidth;
@@ -188,10 +151,16 @@ function findCharacterInLine({ block, line, x, availableWidth, alignment }) {
 		if (run.kind === "text") {
 			const text = run.text;
 			if (text.length === 0) continue;
-			const measurement = measureRun(text, runToFontStyle(run));
+			const style = runToFontStyle(run);
+			const measurement = measurePositionedRun({
+				text,
+				style,
+				trailingAutomaticSpacingPx: automaticRunGap(run, runs[runIndex + 1])
+			});
 			const runEndX = currentX + measurement.width;
 			if (adjustedX <= runEndX) {
-				const charInRun = snapPastTrailingSurrogate(text, findCharacterAtX(adjustedX - currentX, measurement.charWidths));
+				const localX = adjustedX - currentX;
+				const charInRun = snapPastTrailingSurrogate(text, findCharacterAtX(localX, measurement.charWidths));
 				const charOffset = currentCharOffset + charInRun;
 				return {
 					charOffset,
@@ -225,14 +194,20 @@ function clickToPositionInParagraph(fragmentHit) {
 	if (lineIndex === null) return null;
 	const line = paragraphMeasure.lines[lineIndex];
 	if (!line) return null;
-	const { alignment, indentLeft, indentRight } = resolvePhysicalParagraphInlineLayout(paragraphBlock);
-	const availableWidth = Math.max(0, fragment.width - indentLeft - indentRight);
+	const lineGeometry = resolveParagraphLineGeometryForBlock({
+		fragment: paragraphFragment,
+		block: paragraphBlock,
+		line,
+		lineTopYPx: 0,
+		isFirstLine: lineIndex === 0 && !paragraphFragment.continuesFromPrev
+	});
+	const availableWidth = Math.max(0, lineGeometry.layoutRightEdgeXPx - lineGeometry.layoutStartXPx);
 	const { charOffset, pmPosition } = findCharacterInLine({
 		block: paragraphBlock,
 		line,
-		x: localX - indentLeft,
+		x: localX - (lineGeometry.paintStartXPx - paragraphFragment.x),
 		availableWidth,
-		alignment
+		alignment: "left"
 	});
 	return {
 		pmPosition,
@@ -309,52 +284,60 @@ function positionToX(block, measure, pmPosition, _fragmentWidth) {
 			const runs = sliceRunsForLine(block, line);
 			let x = 0;
 			let charsProcessed = 0;
-			for (const run of runs) if (run.kind === "tab") {
-				if (offsetInLine <= charsProcessed + 1) {
-					if (offsetInLine <= charsProcessed) return {
-						x,
-						lineIndex
-					};
-					return {
-						x: x + (run.width ?? 48),
-						lineIndex
-					};
-				}
-				x += run.width ?? 48;
-				charsProcessed += 1;
-			} else if (run.kind === "image") {
-				if (offsetInLine <= charsProcessed + 1) {
+			for (let runIndex = 0; runIndex < runs.length; runIndex += 1) {
+				const run = runs[runIndex];
+				if (run === void 0) continue;
+				if (run.kind === "tab") {
+					if (offsetInLine <= charsProcessed + 1) {
+						if (offsetInLine <= charsProcessed) return {
+							x,
+							lineIndex
+						};
+						return {
+							x: x + (run.width ?? 48),
+							lineIndex
+						};
+					}
+					x += run.width ?? 48;
+					charsProcessed += 1;
+				} else if (run.kind === "image") {
+					if (offsetInLine <= charsProcessed + 1) {
+						if (offsetInLine <= charsProcessed) return {
+							x,
+							lineIndex
+						};
+						return {
+							x: x + run.width,
+							lineIndex
+						};
+					}
+					x += run.width;
+					charsProcessed += 1;
+				} else if (run.kind === "lineBreak") {
 					if (offsetInLine <= charsProcessed) return {
 						x,
 						lineIndex
 					};
-					return {
-						x: x + run.width,
-						lineIndex
-					};
-				}
-				x += run.width;
-				charsProcessed += 1;
-			} else if (run.kind === "lineBreak") {
-				if (offsetInLine <= charsProcessed) return {
-					x,
-					lineIndex
-				};
-				charsProcessed += 1;
-			} else if (run.kind === "text") {
-				const text = run.text;
-				if (offsetInLine <= charsProcessed + text.length) {
-					const charInRun = offsetInLine - charsProcessed;
-					const style = runToFontStyle(run);
-					const measurement = measureRun(text.slice(0, charInRun), style);
-					return {
-						x: x + measurement.width,
-						lineIndex
-					};
+					charsProcessed += 1;
+				} else if (run.kind === "text") {
+					const text = run.text;
+					const measurement = measurePositionedRun({
+						text,
+						style: runToFontStyle(run),
+						trailingAutomaticSpacingPx: automaticRunGap(run, runs[runIndex + 1])
+					});
+					if (offsetInLine <= charsProcessed + text.length) {
+						const charInRun = offsetInLine - charsProcessed;
+						let prefix = 0;
+						for (let index = 0; index < charInRun; index += 1) prefix += measurement.charWidths[index] ?? 0;
+						return {
+							x: x + prefix,
+							lineIndex
+						};
+					}
+					x += measurement.width;
+					charsProcessed += text.length;
 				}
-				const measurement = measureRun(text, runToFontStyle(run));
-				x += measurement.width;
-				charsProcessed += text.length;
 			}
 			return {
 				x,

package/dist/layout-bridge/engine/hitTest.d.ts

@@ -3,14 +3,14 @@ import { FlowBlock, Fragment, Layout, Measure, Page, ParagraphBlock, ParagraphMe
 /**
  * A 2D point in page coordinate space.
  */
-type Point = {
+export type Point = {
   x: number;
   y: number;
 };
 /**
  * Result of hit-testing to find which page contains a point.
  */
-type PageHit = {
+export type PageHit = {
   /** Index of the page (0-based). */
   pageIndex: number;
   /** The page that was hit. */
@@ -21,7 +21,7 @@ type PageHit = {
 /**
  * Result of hit-testing to find which fragment contains a point.
  */
-type FragmentHit = {
+export type FragmentHit = {
   /** The fragment that was hit. */
   fragment: Fragment;
   /** The corresponding flow block. */
@@ -38,7 +38,7 @@ type FragmentHit = {
 /**
  * Result of hit-testing a table to find the cell.
  */
-type TableCellHit = {
+export type TableCellHit = {
   /** The table fragment. */
   fragment: TableFragment;
   /** The table block. */
@@ -72,16 +72,16 @@ type TableCellHit = {
  * @param point - The point to test (only Y is used for page lookup).
  * @returns PageHit if a page was found, null otherwise.
  */
-declare function hitTestPage(layout: Layout, point: Point): PageHit | null;
+export declare function hitTestPage(layout: Layout, point: Point): PageHit | null;
 /**
  * Calculate the Y offset of a page from the top of the document.
  */
-declare function getPageTop(layout: Layout, pageIndex: number): number;
+export declare function getPageTop(layout: Layout, pageIndex: number): number;
 /**
  * Get the page index at a specific Y coordinate.
  * Returns null if the coordinate is outside all pages.
  */
-declare function getPageIndexAtY(layout: Layout, y: number): number | null;
+export declare function getPageIndexAtY(layout: Layout, y: number): number | null;
 /**
  * Hit-test fragments on a page to find which fragment contains a point.
  *
@@ -94,11 +94,11 @@ declare function getPageIndexAtY(layout: Layout, y: number): number | null;
  * @param pagePoint - Point in page-relative coordinates.
  * @returns FragmentHit if a fragment was found, null otherwise.
  */
-declare function hitTestFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
+export declare function hitTestFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
 /**
  * Hit-test to find image fragments (they may overlap other content).
  */
-declare function hitTestImageFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
+export declare function hitTestImageFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
 /**
  * Hit-test within a table fragment to find the specific cell.
  *
@@ -108,11 +108,11 @@ declare function hitTestImageFragment(pageHit: PageHit, blocks: FlowBlock[], mea
  * @param pagePoint - Point in page-relative coordinates.
  * @returns TableCellHit if a table cell was found, null otherwise.
  */
-declare function hitTestTableCell(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): TableCellHit | null;
+export declare function hitTestTableCell(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): TableCellHit | null;
 /**
  * Combined result of all hit testing.
  */
-type HitTestResult = {
+export type HitTestResult = {
   /** Page that was hit. */
   pageHit: PageHit | null;
   /** Fragment that was hit (if any). */
@@ -129,30 +129,29 @@ type HitTestResult = {
  * @param point - Point in document coordinates (Y is cumulative from document top).
  * @returns Complete hit test result.
  */
-declare function hitTest(layout: Layout, blocks: FlowBlock[], measures: Measure[], point: Point): HitTestResult;
+export declare function hitTest(layout: Layout, blocks: FlowBlock[], measures: Measure[], point: Point): HitTestResult;
 /**
  * Get the total document height (all pages + gaps).
  */
-declare function getTotalDocumentHeight(layout: Layout): number;
+export declare function getTotalDocumentHeight(layout: Layout): number;
 /**
  * Get Y coordinate to scroll to for a specific page.
  */
-declare function getScrollYForPage(layout: Layout, pageIndex: number): number;
+export declare function getScrollYForPage(layout: Layout, pageIndex: number): number;
 /**
  * Get page bounds (top and bottom Y coordinates).
  */
-declare function getPageBounds(layout: Layout, pageIndex: number): {
+export declare function getPageBounds(layout: Layout, pageIndex: number): {
   top: number;
   bottom: number;
 } | null;
 /**
  * Check if a point is within the content area of a page (inside margins).
  */
-declare function isPointInContentArea(_layout: Layout, pageHit: PageHit, pagePoint: Point): boolean;
+export declare function isPointInContentArea(_layout: Layout, pageHit: PageHit, pagePoint: Point): boolean;
 /**
  * Find the nearest fragment to a point on a page.
  * Useful when the click is in whitespace.
  */
-declare function findNearestFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
-//#endregion
-export { FragmentHit, HitTestResult, PageHit, Point, TableCellHit, findNearestFragment, getPageBounds, getPageIndexAtY, getPageTop, getScrollYForPage, getTotalDocumentHeight, hitTest, hitTestFragment, hitTestImageFragment, hitTestPage, hitTestTableCell, isPointInContentArea };
+export declare function findNearestFragment(pageHit: PageHit, blocks: FlowBlock[], measures: Measure[], pagePoint: Point): FragmentHit | null;
+//#endregion

package/dist/layout-bridge/engine/hitTest.js

@@ -219,8 +219,9 @@ function hitTestTableCell(pageHit, blocks, measures, pagePoint) {
 		let colIndex = -1;
 		let cellLeft = 0;
 		if (rowMeasure.cells.length === 0 || row.cells.length === 0) continue;
+		const cellGrid = buildTableCellGrid(tableBlock.rows, tableMeasure.columnWidths.length);
 		const cellPlacements = buildTableCellPlacements({
-			grid: buildTableCellGrid(tableBlock.rows, tableMeasure.columnWidths.length),
+			grid: cellGrid,
 			columnWidths: tableMeasure.columnWidths,
 			bidi: tableBlock.bidi === true,
 			cellSpacing: tableBlock.cellSpacing

package/dist/layout-bridge/engine/linePmRange.d.ts

@@ -0,0 +1,7 @@
+import { MeasuredLine, ParagraphBlock } from "../../layout-engine/types.js";
+//#region src/layout-bridge/engine/linePmRange.d.ts
+export declare const computeLinePmRange: (block: ParagraphBlock, line: MeasuredLine) => {
+  pmStart: number;
+  pmEnd: number;
+};
+//#endregion

package/dist/layout-bridge/engine/linePmRange.js

@@ -0,0 +1,34 @@
+//#region src/layout-bridge/engine/linePmRange.ts
+const clampToRunPmEnd = (run, position) => run.pmEnd === void 0 ? position : Math.min(position, run.pmEnd);
+const computeLinePmRange = (block, line) => {
+	const fromRun = block.runs[line.fromRun];
+	const toRun = block.runs[line.toRun];
+	if (fromRun?.pmStart !== void 0 && toRun?.pmStart !== void 0) return {
+		pmStart: fromRun.kind === "text" ? clampToRunPmEnd(fromRun, fromRun.pmStart + line.fromChar) : fromRun.pmStart,
+		pmEnd: toRun.kind === "text" ? clampToRunPmEnd(toRun, toRun.pmStart + line.toChar) : toRun.pmEnd ?? toRun.pmStart + 1
+	};
+	let pmStart = (block.pmStart ?? 0) + 1;
+	let lineLength = 0;
+	for (let runIndex = 0; runIndex <= line.toRun && runIndex < block.runs.length; runIndex += 1) {
+		const run = block.runs[runIndex];
+		if (run === void 0) continue;
+		if (runIndex < line.fromRun) {
+			pmStart += run.kind === "text" ? run.text.length : 1;
+			continue;
+		}
+		if (runIndex === line.fromRun) pmStart += line.fromChar;
+		if (run.kind !== "text") {
+			lineLength += 1;
+			continue;
+		}
+		const start = runIndex === line.fromRun ? line.fromChar : 0;
+		const end = runIndex === line.toRun ? line.toChar : run.text.length;
+		lineLength += end - start;
+	}
+	return {
+		pmStart,
+		pmEnd: pmStart + lineLength
+	};
+};
+//#endregion
+export { computeLinePmRange };

package/dist/layout-bridge/engine/selectionRects.d.ts

@@ -3,7 +3,7 @@ import { FlowBlock, Layout, Measure } from "../../layout-engine/types.js";
 /**
  * A rectangle representing part of a selection.
  */
-type SelectionRect = {
+export type SelectionRect = {
   /** X coordinate in container space. */
   x: number;
   /** Y coordinate in container space. */
@@ -18,7 +18,7 @@ type SelectionRect = {
 /**
  * Caret position for collapsed selection.
  */
-type CaretPosition = {
+export type CaretPosition = {
   /** X coordinate in container space. */
   x: number;
   /** Y coordinate in container space. */
@@ -38,7 +38,7 @@ type CaretPosition = {
  * @param to - End PM position.
  * @returns Array of rectangles covering the selection.
  */
-declare function selectionToRects(layout: Layout, blocks: FlowBlock[], measures: Measure[], from: number, to: number): SelectionRect[];
+export declare function selectionToRects(layout: Layout, blocks: FlowBlock[], measures: Measure[], from: number, to: number): SelectionRect[];
 /**
  * Get caret position for a collapsed selection.
  *
@@ -48,20 +48,19 @@ declare function selectionToRects(layout: Layout, blocks: FlowBlock[], measures:
  * @param pmPosition - The PM position.
  * @returns Caret position, or null if not found.
  */
-declare function getCaretPosition(layout: Layout, blocks: FlowBlock[], measures: Measure[], pmPosition: number): CaretPosition | null;
+export declare function getCaretPosition(layout: Layout, blocks: FlowBlock[], measures: Measure[], pmPosition: number): CaretPosition | null;
 /**
  * Check if a selection spans multiple pages.
  *
  * @param rects - Selection rectangles.
  * @returns True if selection spans multiple pages.
  */
-declare function isMultiPageSelection(rects: SelectionRect[]): boolean;
+export declare function isMultiPageSelection(rects: SelectionRect[]): boolean;
 /**
  * Get selection rectangles grouped by page.
  *
  * @param rects - Selection rectangles.
  * @returns Map of page index to rectangles on that page.
  */
-declare function groupRectsByPage(rects: SelectionRect[]): Map<number, SelectionRect[]>;
-//#endregion
-export { CaretPosition, SelectionRect, getCaretPosition, groupRectsByPage, isMultiPageSelection, selectionToRects };
+export declare function groupRectsByPage(rects: SelectionRect[]): Map<number, SelectionRect[]>;
+//#endregion