render-tag 0.1.31 → 0.1.33

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 import type { RenderConfig, RenderResult, LayoutConfig, LayoutResult, DrawConfig, LayoutLine, AnyCanvas } from './types.js';
 export type { RenderConfig, RenderResult, LayoutConfig, LayoutResult, DrawConfig, LayoutLine };
 export { setDOMParser, type DOMParserLike } from './dom.js';
-export { FLOORS_LINE_BASELINE } from './layout.js';
+export { lineBaselineOffset } from './layout.js';
 /**
  * Compute layout for an HTML string without rendering.
  * Returns a reusable LayoutResult that can be drawn onto multiple targets via drawLayout().

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,UAAU,EACtC,UAAU,EAAE,SAAS,EACtB,MAAM,YAAY,CAAC;AAMpB,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAWnD;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAgCzD;AAID;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CAsCpE;AAID;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA8BzD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,YAAY,EAAE,UAAU,EACtC,UAAU,EAAE,SAAS,EACtB,MAAM,YAAY,CAAC;AAMpB,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;AAC/F,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAWjD;;;GAGG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CAgCzD;AAID;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG;IAAE,MAAM,EAAE,SAAS,CAAA;CAAE,CAsCpE;AAID;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,CA8BzD"}

package/lib/index.js

@@ -3,7 +3,7 @@ import { resolveStylesFromCSS } from './css-resolver.js';
 import { buildLayoutTree } from './layout.js';
 import { renderNode } from './render.js';
 export { setDOMParser } from './dom.js';
-export { FLOORS_LINE_BASELINE } from './layout.js';
+export { lineBaselineOffset } from './layout.js';
 import { createFallbackMeasureCtx } from './dom.js';
 // Default measurement context, created lazily and reused across layout()
 // calls — safe because font/letterSpacing state is set before every

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/layout.d.ts

@@ -11,12 +11,25 @@ export declare function buildCanvasFont(style: ResolvedStyle): string;
  * exact half-leading out — measured over the whole 530-case corpus, giving
  * Safari the Blink branch cost 214 wins against 223 losses (avg 7.50% ->
  * 9.21%) where the exact value wins 48 against 3 (7.50% -> 6.52%).
- *
- * Public API: the parity suites expect per engine, and every renderer that has
- * to place a baseline beside a render-tag canvas (@polotno/svg-export) must
- * round the same way this does.
  */
 export declare const FLOORS_LINE_BASELINE: boolean;
+/**
+ * `super` and `sub` are engine constants, not CSS. Blink and WebKit share
+ * theirs (`fontSize/3 + 1`, `fontSize/5 + 1`); Gecko raises by 0.34em and
+ * lowers by 0.20em. A SEPARATE question from the rounding above — Safari
+ * rounds like nobody and shifts like Blink — so never gate one on the other.
+ */
+export declare const BLINK_SUPER_SUB: boolean;
+/**
+ * Baseline offset from the top of a line box, the way the engine places it:
+ * the half-leading `(lineHeight - (ascent + descent)) / 2` below the line top,
+ * plus the ascent, rounded as `FLOORS_LINE_BASELINE` says.
+ *
+ * Public API, because this is the ONE rule every renderer that places a
+ * baseline beside a render-tag canvas has to share (@polotno/svg-export, the
+ * editor's list marker). Call it rather than restate it, or the two drift.
+ */
+export declare function lineBaselineOffset(lineHeight: number, ascent: number, descent: number): number;
 export declare function isTransparent(color: string): boolean;
 export declare function getFontMetrics(ctx: CanvasRenderingContext2D, style: ResolvedStyle): {
     ascent: number;

package/lib/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAc,SAAS,EAAc,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA4C5H;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,wBAAwB,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAGnF;AAgBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAc5D;AAmHD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,SAAW,CAAC;AAmF7C,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpD;AAMD,wBAAgB,cAAc,CAAC,GAAG,EAAE,wBAAwB,EAAE,KAAK,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAWvH;AA0DD,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAiBlF;AA4CD;;kFAEkF;AAClF,wBAAgB,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAIzD;AA4tED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,wBAAwB,EAC7B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,UAAO,EACzB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,UAAU,KAAK,IAAI,GACvD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAA;CAAE,CAmD1D"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../src/layout.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAc,SAAS,EAAc,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA4C5H;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,wBAAwB,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI,CAGnF;AAgBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAc5D;AAkHD;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,SAA0B,CAAC;AAE5D;;;;;GAKG;AACH,eAAO,MAAM,eAAe,SAAY,CAAC;AAEzC;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG9F;AAuDD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpD;AAMD,wBAAgB,cAAc,CAAC,GAAG,EAAE,wBAAwB,EAAE,KAAK,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAkBvH;AA0DD,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEnD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAiBlF;AA4CD;;kFAEkF;AAClF,wBAAgB,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAIzD;AAwuED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,wBAAwB,EAC7B,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,MAAM,EACtB,kBAAkB,UAAO,EACzB,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,YAAY,EAAE,UAAU,KAAK,IAAI,GACvD;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,UAAU,EAAE,CAAA;CAAE,CAmD1D"}

package/lib/layout.js

@@ -174,7 +174,6 @@ function getLineHeight(ctx, style, useBulletProbe = false) {
 const UA = typeof navigator === 'undefined' ? '' : navigator.userAgent;
 const IS_GECKO = /\bGecko\/\d/.test(UA);
 const IS_SAFARI = /AppleWebKit/.test(UA) && !/Chrome\/\d/.test(UA) && !/\bjsdom\//.test(UA);
-const IS_BLINK = !IS_GECKO && !IS_SAFARI;
 /**
  * True where the engine floors a line's baseline onto a whole CSS pixel.
  *
@@ -182,35 +181,25 @@ const IS_BLINK = !IS_GECKO && !IS_SAFARI;
  * exact half-leading out — measured over the whole 530-case corpus, giving
  * Safari the Blink branch cost 214 wins against 223 losses (avg 7.50% ->
  * 9.21%) where the exact value wins 48 against 3 (7.50% -> 6.52%).
- *
- * Public API: the parity suites expect per engine, and every renderer that has
- * to place a baseline beside a render-tag canvas (@polotno/svg-export) must
- * round the same way this does.
  */
-export const FLOORS_LINE_BASELINE = IS_BLINK;
+export const FLOORS_LINE_BASELINE = !IS_GECKO && !IS_SAFARI;
 /**
  * `super` and `sub` are engine constants, not CSS. Blink and WebKit share
  * theirs (`fontSize/3 + 1`, `fontSize/5 + 1`); Gecko raises by 0.34em and
- * lowers by 0.20em. This is a separate question from the baseline rounding
- * above — Safari rounds like nobody and shifts like Blink.
+ * lowers by 0.20em. A SEPARATE question from the rounding above — Safari
+ * rounds like nobody and shifts like Blink — so never gate one on the other.
  */
-const BLINK_SUPER_SUB = !IS_GECKO;
+export const BLINK_SUPER_SUB = !IS_GECKO;
 /**
- * Baseline offset from the top of a line box, the way the engine places it.
- *
- * The CSS half-leading is `(lineHeight - (ascent + descent)) / 2`, and the
- * baseline sits that far below the line top, plus the ascent. Blink FLOORS that
- * sum to a whole CSS pixel (`FontHeight::AddLeading`), so its DOM text stands up
- * to 1px HIGHER than the exact value. Gecko lays the exact value out in app
- * units. WebKit floors on 80 of 90 measured size × line-height combinations and
- * has no exact rule we can state, so it takes the Blink branch — the one that
- * fits it best, not one it matches everywhere.
+ * Baseline offset from the top of a line box, the way the engine places it:
+ * the half-leading `(lineHeight - (ascent + descent)) / 2` below the line top,
+ * plus the ascent, rounded as `FLOORS_LINE_BASELINE` says.
  *
- * So the rounding is the engine's, not a style choice: each browser's canvas
- * lands on the baseline that browser's own DOM would use, which is what keeps a
- * canvas render and a contenteditable overlay of the same text on one line.
+ * Public API, because this is the ONE rule every renderer that places a
+ * baseline beside a render-tag canvas has to share (@polotno/svg-export, the
+ * editor's list marker). Call it rather than restate it, or the two drift.
  */
-function lineBaselineOffset(lineHeight, ascent, descent) {
+export function lineBaselineOffset(lineHeight, ascent, descent) {
     const exact = (lineHeight - (ascent + descent)) / 2 + ascent;
     return FLOORS_LINE_BASELINE ? Math.floor(exact) : exact;
 }
@@ -269,8 +258,15 @@ export function getFontMetrics(ctx, style) {
     const cached = _fontMetricsCache.get(font);
     if (cached)
         return cached;
+    // Restore what the caller had set: this measures with its OWN font, and a
+    // measurement must not move the ctx. Leaving it moved made the function
+    // behave differently on a cache miss than on a hit, so a caller that set a
+    // font and then measured through this was correct only while the cache was
+    // warm — `addListMarker` measured its marker on the li's face on a cold one.
+    const prev = ctx.font;
     ctx.font = font;
     const m = ctx.measureText('M');
+    ctx.font = prev;
     const ascent = m.fontBoundingBoxAscent ?? m.actualBoundingBoxAscent;
     const descent = m.fontBoundingBoxDescent ?? m.actualBoundingBoxDescent;
     const result = { ascent, descent };
@@ -1650,6 +1646,14 @@ function layoutInlineContent(ctx, node, x, y, contentWidth, useBulletProbe = fal
         const strutBox = leadedBox(ctx, node.style, useBulletProbe);
         let lineAscent = strutBox.ascent;
         let lineDescent = strutBox.descent;
+        // A shift moves the box, not the line's baseline: positive is downward, so
+        // it lifts the box's demand on the ascent side and adds to the descent one.
+        const grow = (b, shift) => {
+            if (b.ascent - shift > lineAscent)
+                lineAscent = b.ascent - shift;
+            if (b.descent + shift > lineDescent)
+                lineDescent = b.descent + shift;
+        };
         for (const word of line.words) {
             if (word.text === '')
                 continue;
@@ -1662,14 +1666,7 @@ function layoutInlineContent(ctx, node, x, y, contentWidth, useBulletProbe = fal
             // the DOM has 40). With the shift it is idempotent — a wrapper with
             // direct text contributes the identical box through its own run.
             if (word.parentStyle) {
-                const parentBox = leadedBox(ctx, word.parentStyle, useBulletProbe);
-                const parentShift = verticalAlignShift(word.parentStyle.verticalAlign, ctx, word.parentStyle, blockStyle, useBulletProbe);
-                if (parentBox.ascent - parentShift > lineAscent) {
-                    lineAscent = parentBox.ascent - parentShift;
-                }
-                if (parentBox.descent + parentShift > lineDescent) {
-                    lineDescent = parentBox.descent + parentShift;
-                }
+                grow(leadedBox(ctx, word.parentStyle, useBulletProbe), verticalAlignShift(word.parentStyle.verticalAlign, ctx, word.parentStyle, blockStyle, useBulletProbe));
             }
             const box = leadedBox(ctx, word.style, useBulletProbe);
             // An inline-block joins the line as an ATOMIC box: its own content
@@ -1683,15 +1680,7 @@ function layoutInlineContent(ctx, node, x, y, contentWidth, useBulletProbe = fal
                 box.ascent += extra.top;
                 box.descent += extra.bottom;
             }
-            // A shift moves the box, not the line's baseline: positive is downward,
-            // so it lifts the box's demand on the ascent side and adds to the descent
-            // side. The parent-size fallback is the one the emit pass uses, so a line
-            // whose only content is shifted still sizes around it.
-            const shift = atomic ? 0 : verticalAlignShift(word.style.verticalAlign, ctx, word.style, word.parentStyle ?? blockStyle, useBulletProbe);
-            if (box.ascent - shift > lineAscent)
-                lineAscent = box.ascent - shift;
-            if (box.descent + shift > lineDescent)
-                lineDescent = box.descent + shift;
+            grow(box, atomic ? 0 : verticalAlignShift(word.style.verticalAlign, ctx, word.style, word.parentStyle ?? blockStyle, useBulletProbe));
         }
         const lineBoxHeight = lineAscent + lineDescent;
         const lineBaselineY = curY + lineAscent;
@@ -1938,9 +1927,10 @@ function layoutInlineContent(ctx, node, x, y, contentWidth, useBulletProbe = fal
             text: line.words.map(w => w.text).join(''),
             bounds: {
                 x: lineLeftX,
-                // The line box starts at curY: shifted content grew the box through
-                // `lineAscent`/`lineDescent` above, so nothing on the line reaches
-                // outside it.
+                // The line box starts at curY — this is the CSS line box, which
+                // `lineAscent`/`lineDescent` grew to cover every box on the line. Ink
+                // can still overflow it (an ascender under `line-height: 1`), exactly
+                // as it does in the DOM; a caller that clips must allow for that.
                 y: curY,
                 width: lineWidth,
                 height: lineBoxHeight,
@@ -2038,6 +2028,23 @@ function isBlock(node) {
         d === 'table-row' || d === 'table-cell' || d === 'table-row-group' ||
         d === 'table-header-group' || d === 'table-footer-group';
 }
+function allowsMarginCollapseThrough(node) {
+    const display = node.style.display;
+    return (display === 'block' || display === 'list-item') &&
+        (node.tagName === 'li' || node.tagName === 'ul' || node.tagName === 'ol' ||
+            node.tagName === 'dd' || node.tagName === 'dt');
+}
+function collapsibleMarginTop(node) {
+    const marginTop = node.style.marginTop;
+    if (!allowsMarginCollapseThrough(node) || node.style.paddingTop !== 0 ||
+        node.style.borderTopWidth !== 0) {
+        return marginTop;
+    }
+    const firstChild = node.children[0];
+    return firstChild && isBlock(firstChild)
+        ? collapseMargins(marginTop, collapsibleMarginTop(firstChild))
+        : marginTop;
+}
 /**
  * Layout a block-level element and all its children.
  * Returns the LayoutBox and total height consumed (including margins).
@@ -2118,8 +2125,7 @@ function layoutBlock(ctx, node, x, y, availableWidth, clamp) {
         let prevMarginBottom = 0;
         let hasContent = false; // tracks whether we've placed any content
         // Margin collapsing through parent: only for list elements.
-        const allowCollapseThrough = node.tagName === 'li' || node.tagName === 'ul' || node.tagName === 'ol' ||
-            node.tagName === 'dd' || node.tagName === 'dt';
+        const allowCollapseThrough = allowsMarginCollapseThrough(node);
         for (let ci = 0; ci < node.children.length; ci++) {
             const child = node.children[ci];
             // Line-clamp budget exhausted — everything below the cut is dropped,
@@ -2143,10 +2149,8 @@ function layoutBlock(ctx, node, x, y, availableWidth, clamp) {
                     }
                 }
                 // Apply pending margin before inline content
-                if (prevMarginBottom > 0) {
-                    curY += prevMarginBottom;
-                    prevMarginBottom = 0;
-                }
+                curY += prevMarginBottom;
+                prevMarginBottom = 0;
                 const inlineGroup = {
                     element: null,
                     tagName: 'div',
@@ -2163,9 +2167,7 @@ function layoutBlock(ctx, node, x, y, availableWidth, clamp) {
                 continue;
             }
             // Block child — collapse margins
-            const childMarginTop = child.style.marginTop;
-            // First child margin-top collapses through parent if parent has no top border/padding
-            // Only for elements that don't establish a new BFC (not root, not flex, not overflow)
+            const childMarginTop = collapsibleMarginTop(child);
             // First child margin-top collapses through parent if parent has no
             // top padding/border and doesn't establish a new BFC.
             if (!hasContent && padTop === 0 && borderTop === 0 && allowCollapseThrough) {
@@ -2185,16 +2187,18 @@ function layoutBlock(ctx, node, x, y, availableWidth, clamp) {
         // Last child's margin-bottom collapses through parent if no bottom border/padding.
         // Root container does NOT collapse last-child margin (it defines the content height).
         let marginBottomOut = style.marginBottom;
-        const canCollapseThrough = padBottom === 0 && borderBottom === 0 && allowCollapseThrough;
-        if (canCollapseThrough && prevMarginBottom > 0) {
+        const canCollapseThrough = padBottom === 0 && borderBottom === 0 &&
+            style.minHeight === 0 && allowCollapseThrough;
+        if (canCollapseThrough) {
             // Last child's margin passes through to become parent's effective margin-bottom
-            marginBottomOut = Math.max(style.marginBottom, prevMarginBottom);
+            marginBottomOut = collapseMargins(style.marginBottom, prevMarginBottom);
         }
         // Include last child's margin-bottom in parent height when it can't collapse through
         let contentEnd = curY - contentStartY;
-        if (!canCollapseThrough && prevMarginBottom > 0) {
+        if (!canCollapseThrough) {
             contentEnd += prevMarginBottom;
         }
+        contentEnd = Math.max(0, contentEnd);
         box.height = borderTop + padTop + contentEnd + padBottom + borderBottom;
         if (style.minHeight > 0)
             box.height = Math.max(box.height, style.minHeight);