@stll/folio-core 0.25.3 → 0.25.4

package/dist/layout-engine/measure/cache.d.ts

@@ -54,10 +54,7 @@ declare function setFontCacheSize(size: number): void;
  * Get current font metrics cache size
  */
 declare function getFontCacheSize(): number;
-/**
- * Generate a simple hash for a paragraph block
- * Used as cache key to identify identical content
- */
+/** Serialize the complete paragraph measurement contract into a cache key. */
 declare function hashParagraphBlock(block: ParagraphBlock): string;
 /**
  * Get cached paragraph measurement or return undefined

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

@@ -1,4 +1,3 @@
-import { lineBreakPolicyCacheParts } from "./effectiveLineBreakPolicy.js";
 import { getLineBreakProviderGeneration } from "./lineBreakProvider.js";
 import { clearFontResolvedCache } from "./measureHelpers.js";
 //#region src/layout-engine/measure/cache.ts
@@ -164,40 +163,38 @@ let paragraphCacheMaxSize = 5e3;
 * Key format: block content hash
 */
 const paragraphMeasureCache = /* @__PURE__ */ new Map();
-/**
-* Generate a simple hash for a paragraph block
-* Used as cache key to identify identical content
-*/
-function hashParagraphBlock(block) {
-	const parts = [`lbp:${getLineBreakProviderGeneration()}`];
-	for (const run of block.runs) if (run.kind === "text") parts.push(`t:${run.text}|${run.fontFamily}|${run.eastAsiaFontFamily}|${run.complexScriptFontFamily}|${run.fontSize}|${run.complexScriptFontSize}|${run.bold}|${run.complexScriptBold}|${run.italic}|${run.complexScriptItalic}|${run.forceComplexScript}|${run.allCaps}|${run.smallCaps}|${run.horizontalScale}|${run.letterSpacing}|${run.language?.val}|${run.language?.eastAsia}|${run.language?.bidi}`);
-	else if (run.kind === "tab") parts.push(`tab:${run.width}`);
-	else if (run.kind === "image") parts.push(`img:${run.width}x${run.height}:${run.exactLineHeight === true ? "exact" : "text"}`);
-	else if (run.kind === "lineBreak") parts.push("br");
-	const attrs = block.attrs;
-	if (attrs) {
-		if (attrs.alignment) parts.push(`align:${attrs.alignment}`);
-		if (attrs.outlineLevel !== void 0) parts.push(`outline:${attrs.outlineLevel}`);
-		if (attrs.indent) parts.push(`indent:${attrs.indent.left}|${attrs.indent.right}|${attrs.indent.firstLine}|${attrs.indent.hanging}`);
-		if (attrs.spacing) parts.push(`spacing:${attrs.spacing.before}|${attrs.spacing.after}|${attrs.spacing.line}|${attrs.spacing.lineRule}`);
-		if (attrs.defaultFontSize != null) parts.push(`dfs:${attrs.defaultFontSize}`);
-		if (attrs.defaultFontFamily != null) parts.push(`dff:${attrs.defaultFontFamily}`);
-		if (attrs.suppressEmptyParagraphHeight) parts.push("sup");
-		if (attrs.reserveEmptyOutlineHeight) parts.push("outline-empty-reserve");
-		if (attrs.documentGridLinePitch !== void 0) parts.push(`documentGrid:${attrs.documentGridLinePitch}|${attrs.snapToGrid !== false}`);
-		if (attrs.justificationCompatibility) parts.push(`justify-compat:${attrs.justificationCompatibility.type}`);
-		if (attrs.listMarker !== void 0) {
-			const marker = attrs.listMarkerFormatting;
-			parts.push(`marker:${attrs.listMarker}|${attrs.listMarkerHidden}|${attrs.listMarkerAlignment}|${attrs.listMarkerSuffix}|${marker?.fontFamily}|${marker?.eastAsiaFontFamily}|${marker?.complexScriptFontFamily}|${marker?.fontSize}|${marker?.complexScriptFontSize}|${marker?.bold}|${marker?.complexScriptBold}|${marker?.italic}|${marker?.complexScriptItalic}|${marker?.rtl}|${marker?.forceComplexScript}`);
-		}
-		parts.push(...lineBreakPolicyCacheParts(attrs));
-		const borders = attrs.borders;
-		if (borders) {
-			const signature = (border) => border ? `${border.width ?? ""},${border.style ?? ""},${border.color ?? ""}` : "";
-			parts.push(`bdr:${signature(borders.top)}|${signature(borders.bottom)}|${signature(borders.left)}|${signature(borders.right)}`);
-		}
+/** Keep image payloads bounded while classifying every field as measured or intentionally ignored. */
+const imageMeasureCacheInput = (run) => ({
+	kind: run.kind,
+	width: run.width,
+	height: run.height,
+	transform: run.transform,
+	wrapType: run.wrapType,
+	displayMode: run.displayMode,
+	distTop: run.distTop,
+	distBottom: run.distBottom,
+	exactLineHeight: run.exactLineHeight,
+	positioned: run.position !== void 0
+});
+const runMeasureCacheInput = (run) => {
+	switch (run.kind) {
+		case "text":
+		case "tab":
+		case "lineBreak":
+		case "renderedPageBreak":
+		case "field":
+		case "math": return run;
+		case "image": return imageMeasureCacheInput(run);
+		default: return run;
 	}
-	return parts.join("||");
+};
+/** Serialize the complete paragraph measurement contract into a cache key. */
+function hashParagraphBlock(block) {
+	return JSON.stringify({
+		lineBreakProviderGeneration: getLineBreakProviderGeneration(),
+		attrs: block.attrs,
+		runs: block.runs.map(runMeasureCacheInput)
+	});
 }
 /**
 * Evict oldest entries if paragraph cache exceeds max size

package/dist/layout-painter/renderParagraph.js

@@ -1454,9 +1454,10 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 		});
 		const isFlexLine = lineEl.dataset["flexLine"] === "true";
 		const lineMarginLeft = Math.min(indentLeft, 0) + lineLeftOffset;
+		const lineMarginRight = Math.min(indentRight, 0) + lineRightOffset;
 		if (lineMarginLeft !== 0 || lineRightOffset > 0 || indentLeft < 0 || indentRight < 0) {
 			lineEl.style.marginLeft = `${lineMarginLeft}px`;
-			if (lineRightOffset > 0) lineEl.style.marginRight = `${lineRightOffset}px`;
+			if (lineMarginRight !== 0) lineEl.style.marginRight = `${lineMarginRight}px`;
 			const constrainedWidth = lineAvailableWidth - lineLeftOffset - lineRightOffset;
 			if (constrainedWidth > 0) lineEl.style.width = `${constrainedWidth}px`;
 		}
@@ -1476,27 +1477,33 @@ function renderParagraphFragment(fragment, block, measure, context, options = {}
 		if (isFirstLine && block.attrs?.listMarker && !block.attrs.listMarkerHidden) {
 			const hanging = indent?.hanging ?? 0;
 			const firstLine = indent?.firstLine ?? 0;
-			const markerStart = hanging > 0 ? indentLeft - hanging : indentLeft + firstLine;
-			lineEl.style.paddingLeft = `${Math.max(0, markerStart)}px`;
+			const markerPhysicalStart = isRtl ? "right" : "left";
+			const markerIndent = markerPhysicalStart === "right" ? indentRight : indentLeft;
+			const markerStart = hanging > 0 ? markerIndent - hanging : markerIndent + firstLine;
+			const logicalMarkerVisualOffset = getListMarkerVisualOffset(block);
+			if (markerPhysicalStart === "right") lineEl.style.paddingRight = `${Math.max(0, markerStart)}px`;
+			else lineEl.style.paddingLeft = `${Math.max(0, markerStart)}px`;
 			lineEl.style.textIndent = "0";
-			const marker = renderListMarker(block.attrs.listMarker, getListMarkerInlineWidth(block), getListMarkerVisualOffset(block), doc, resolveListMarkerFont(block), block.attrs.listMarkerRevision, block.attrs.listMarkerSecondSlotOffsetTwips);
-			const markerMarginLeft = markerStart - Math.min(indentLeft, 0);
-			if (markerMarginLeft < 0) marker.style.marginLeft = `${markerMarginLeft}px`;
+			const marker = renderListMarker({
+				marker: block.attrs.listMarker,
+				inlineWidth: getListMarkerInlineWidth(block),
+				visualOffset: markerPhysicalStart === "right" ? -logicalMarkerVisualOffset : logicalMarkerVisualOffset,
+				doc,
+				formatting: resolveListMarkerFont(block),
+				...block.attrs.listMarkerRevision === void 0 ? {} : { revision: block.attrs.listMarkerRevision },
+				...block.attrs.listMarkerSecondSlotOffsetTwips === void 0 ? {} : { secondSlotOffsetTwips: block.attrs.listMarkerSecondSlotOffsetTwips },
+				physicalStart: markerPhysicalStart
+			});
+			const markerMarginLeft = markerStart - (markerPhysicalStart === "right" ? Math.min(indentRight, 0) : Math.min(indentLeft, 0));
+			if (markerMarginLeft < 0) if (markerPhysicalStart === "right") marker.style.marginRight = `${markerMarginLeft}px`;
+			else marker.style.marginLeft = `${markerMarginLeft}px`;
 			lineEl.prepend(marker);
 		}
 		fragmentEl.append(lineEl);
 	}
 	return fragmentEl;
 }
-/**
-* Render a list marker element as an inline-block at the start of the first
-* body line. `inlineWidth` (from `getListMarkerInlineWidth`) sizes the marker
-* so the body text aligns at the next tab stop per ECMA-376 §17.9.25 —
-* this honours `w:suff` (`tab` / `space` / `nothing`) and the document's
-* tab grid. Long markers like "1.1.1." therefore grow to the next stop
-* instead of butting against the body text.
-*/
-function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, revision, secondSlotOffsetTwips) {
+function renderListMarker({ marker, inlineWidth, visualOffset, doc, formatting, revision, secondSlotOffsetTwips, physicalStart }) {
 	const span = doc.createElement("span");
 	span.className = "layout-list-marker";
 	span.style.display = "inline-block";
@@ -1505,8 +1512,8 @@ function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, re
 	if (formatting.bold !== void 0) span.style.fontWeight = formatting.bold ? "700" : "normal";
 	if (formatting.italic !== void 0) span.style.fontStyle = formatting.italic ? "italic" : "normal";
 	if (formatting.rtl !== void 0) span.dir = formatting.rtl ? "rtl" : "ltr";
-	span.style.textAlign = "left";
-	span.style.textAlignLast = "left";
+	span.style.textAlign = physicalStart;
+	span.style.textAlignLast = physicalStart;
 	span.style.boxSizing = "border-box";
 	span.style.width = `${inlineWidth}px`;
 	if (visualOffset !== 0) span.style.transform = `translateX(${visualOffset}px)`;
@@ -1540,7 +1547,8 @@ function renderListMarker(marker, inlineWidth, visualOffset, doc, formatting, re
 		secondSlot.style.display = "inline-block";
 		span.style.position = "relative";
 		secondSlot.style.position = "absolute";
-		secondSlot.style.left = `${secondSlotOffsetTwips / 15}px`;
+		if (physicalStart === "right") secondSlot.style.right = `${secondSlotOffsetTwips / 15}px`;
+		else secondSlot.style.left = `${secondSlotOffsetTwips / 15}px`;
 		secondSlot.style.top = "0";
 		span.append(firstSlot, secondSlot);
 		return span;

package/package.json

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