@stll/folio-core 0.8.0 → 0.9.0

package/dist/layout-engine/measure/measureContainer.js

@@ -1,4 +1,5 @@
 import { setMeasureProvider } from "./measureProvider.js";
+import { getFontKerningMode } from "./textMeasurementPolicy.js";
 import { buildFontString, getResolvedData, ptToPx } from "./measureHelpers.js";
 import { hasCjk, isCjkCodePoint, segmentByScript } from "../../utils/scriptSegments.js";
 import { getCachedFontMetrics, getCachedTextWidth, getTextWidthCacheGeneration, setCachedFontMetrics, setCachedTextWidth } from "./cache.js";
@@ -46,13 +47,14 @@ function getCanvasContext() {
 function resetCanvasContext() {
 	canvasContext = null;
 }
-function getWorkerFontFingerprintWidth(ctx, font) {
+function getWorkerFontFingerprintWidth(ctx, font, fontCacheKey, fontKerning) {
 	const generation = getTextWidthCacheGeneration();
-	const cached = workerFontFingerprintCache.get(font);
+	const cached = workerFontFingerprintCache.get(fontCacheKey);
 	if (cached?.generation === generation) return cached.width;
 	ctx.font = font;
+	ctx.fontKerning = fontKerning;
 	const width = ctx.measureText(WORKER_FONT_FINGERPRINT_TEXT).width;
-	workerFontFingerprintCache.set(font, {
+	workerFontFingerprintCache.set(fontCacheKey, {
 		generation,
 		width
 	});
@@ -86,6 +88,7 @@ function canvasGetFontMetrics(style) {
 	try {
 		const ctx = getCanvasContext();
 		ctx.font = buildFontString(style);
+		ctx.fontKerning = getFontKerningMode(style);
 		const metrics = ctx.measureText("Hg");
 		if (typeof metrics.actualBoundingBoxAscent === "number" && typeof metrics.actualBoundingBoxDescent === "number") {
 			ascent = metrics.actualBoundingBoxAscent;
@@ -120,10 +123,12 @@ function canvasMeasureTextWidth(text, style) {
 	const font = buildFontString(style);
 	const letterSpacing = style.letterSpacing ?? 0;
 	const horizontalScale = getHorizontalScaleFactor(style);
-	const fontCacheKey = `${font}|scale:${horizontalScale}`;
+	const fontKerning = getFontKerningMode(style);
+	const fontCacheKey = style.kerning ? `${font}|kerning:normal|scale:${horizontalScale}` : `${font}|scale:${horizontalScale}`;
 	const cached = getCachedTextWidth(measuredText, fontCacheKey, letterSpacing);
 	if (cached !== void 0) return cached;
 	ctx.font = font;
+	ctx.fontKerning = fontKerning;
 	let width = ctx.measureText(measuredText).width;
 	if (letterSpacing) {
 		const codePoints = countCodePoints(measuredText);
@@ -132,9 +137,17 @@ function canvasMeasureTextWidth(text, style) {
 	const scaledWidth = width * horizontalScale;
 	setCachedTextWidth(measuredText, fontCacheKey, letterSpacing, scaledWidth);
 	if (!canPrefetchMeasurement()) return scaledWidth;
-	const fontFingerprintWidth = getWorkerFontFingerprintWidth(ctx, font);
-	prefetchMeasurement(measuredText, font, letterSpacing, horizontalScale, fontCacheKey, fontFingerprintWidth);
-	prefetchBinarySearchProbes(measuredText, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale);
+	const fontFingerprintWidth = getWorkerFontFingerprintWidth(ctx, font, fontCacheKey, fontKerning);
+	prefetchMeasurement({
+		text: measuredText,
+		font,
+		letterSpacing,
+		horizontalScale,
+		fontCacheKey,
+		fontFingerprintWidth,
+		fontKerning
+	});
+	prefetchBinarySearchProbes(measuredText, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale, fontKerning);
 	return scaledWidth;
 }
 /**
@@ -150,6 +163,7 @@ function glyphAdvanceStyle(style, fontFamily) {
 	if (style.bold !== void 0) result.bold = style.bold;
 	if (style.italic !== void 0) result.italic = style.italic;
 	if (style.fontVariant !== void 0) result.fontVariant = style.fontVariant;
+	if (style.kerning !== void 0) result.kerning = style.kerning;
 	return result;
 }
 /**
@@ -186,12 +200,20 @@ function measureMixedScriptWidth(measuredText, style) {
 * pays the main-thread cost as usual. When the worker wins, that probe
 * lands on a hit.
 */
-function prefetchBinarySearchProbes(text, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale) {
+function prefetchBinarySearchProbes(text, font, fontCacheKey, fontFingerprintWidth, letterSpacing, horizontalScale, fontKerning) {
 	if (text.length < 4) return;
 	for (let denom = 2; denom <= 8; denom *= 2) {
 		const len = Math.floor(text.length / denom);
 		if (len < 2) break;
-		prefetchMeasurement(text.slice(0, len), font, letterSpacing, horizontalScale, fontCacheKey, fontFingerprintWidth);
+		prefetchMeasurement({
+			text: text.slice(0, len),
+			font,
+			letterSpacing,
+			horizontalScale,
+			fontCacheKey,
+			fontFingerprintWidth,
+			fontKerning
+		});
 	}
 }
 /**
@@ -224,6 +246,7 @@ function canvasMeasureRun(text, style) {
 	const ctx = getCanvasContext();
 	const baseFont = buildFontString(style);
 	ctx.font = baseFont;
+	ctx.fontKerning = style.kerning ? "normal" : "none";
 	const eastAsiaFont = style.eastAsiaFontFamily !== void 0 && !style.letterSpacing ? buildFontString({
 		...style,
 		fontFamily: style.eastAsiaFontFamily

package/dist/layout-engine/measure/measureHelpers.js

@@ -1,5 +1,6 @@
 import { resolveFontFamily } from "../../utils/fontResolver.js";
 import "../../utils/fontWeights.js";
+import { FONT_KERNING_MODE, getRunFontKerningMode } from "./textMeasurementPolicy.js";
 //#region src/layout-engine/measure/measureHelpers.ts
 /**
 * Pure measurement helpers — no canvas, no DOM, no worker.
@@ -23,16 +24,18 @@ const DEFAULT_FONT_FAMILY = "Calibri";
 * and size fallbacks for runs that declare neither.
 */
 function buildRunFontStyle(run, fallbackFontFamily, fallbackFontSize) {
+	const fontSize = run.fontSize ?? fallbackFontSize;
 	return {
 		fontFamily: run.fontFamily ?? fallbackFontFamily,
 		...run.eastAsiaFontFamily !== void 0 ? { eastAsiaFontFamily: run.eastAsiaFontFamily } : {},
-		fontSize: run.fontSize ?? fallbackFontSize,
+		fontSize,
 		...run.bold !== void 0 ? { bold: run.bold } : {},
 		...run.italic !== void 0 ? { italic: run.italic } : {},
 		...run.letterSpacing !== void 0 ? { letterSpacing: run.letterSpacing } : {},
 		...run.allCaps ? { textTransform: "uppercase" } : {},
 		...run.smallCaps ? { fontVariant: "small-caps" } : {},
-		...run.horizontalScale !== void 0 ? { horizontalScale: run.horizontalScale } : {}
+		...run.horizontalScale !== void 0 ? { horizontalScale: run.horizontalScale } : {},
+		kerning: getRunFontKerningMode(run, fallbackFontSize) === FONT_KERNING_MODE.enabled
 	};
 }
 /** Cache for resolved font data */