react-x11 2.22.6 → 2.22.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.22.6",
+  "version": "2.22.8",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [
@@ -108,7 +108,7 @@
     "yoga-layout": "^3.2.1"
   },
   "optionalDependencies": {
-    "@windowkit/appkit": "^0.13.0",
+    "@windowkit/appkit": "^0.15.0",
     "@windowkit/wayland": "^3.1.1",
     "@windowkit/win32": "^0.0.5",
     "dbus-native": "^0.15.1",

package/src/cocoa/fonts.js

@@ -102,11 +102,62 @@ function parseColor(color) {
 }
 
 /** UTF-16 offset of each code point boundary, plus the end. */
+/** Where each code point of `text` starts, in code units — or null when
+ *  the two are the same index, which is all text with no surrogate pair in
+ *  it. A table per paragraph was a walk of every character of a document,
+ *  every time it was laid out. */
 function codeUnitOffsets(text) {
+  if (!SURROGATE.test(text)) return null;
   const offsets = [0];
   for (const ch of text) offsets.push(offsets[offsets.length - 1] + ch.length);
   return offsets;
 }
+const SURROGATE = /[\uD800-\uDFFF]/;
+const NO_GEOMETRY = new Float64Array(0);
+
+/**
+ * A layout's lines from the bridge's packed geometry (`createLayout`'s
+ * `packed`): ten numbers a line, five a run, into the objects the
+ * unpacked form has, key for key. A bridge that answered neither form
+ * laid out no lines.
+ */
+function unpackLines(lineData = NO_GEOMETRY, runData = NO_GEOMETRY) {
+  const lines = new Array(lineData.length / 10);
+  for (let i = 0, l = 0, r = 0; i < lineData.length; i += 10, l++) {
+    const runs = new Array(lineData[i + 9]);
+    for (let k = 0; k < runs.length; k++, r += 5) {
+      runs[k] = {
+        x: runData[r],
+        width: runData[r + 1],
+        start: runData[r + 2],
+        end: runData[r + 3],
+        rtl: runData[r + 4] === 1,
+      };
+    }
+    lines[l] = {
+      x: lineData[i],
+      y: lineData[i + 1],
+      width: lineData[i + 2],
+      height: lineData[i + 3],
+      baseline: lineData[i + 4],
+      ascent: lineData[i + 5],
+      descent: lineData[i + 6],
+      start: lineData[i + 7],
+      end: lineData[i + 8],
+      runs,
+    };
+  }
+  return lines;
+}
+
+/** Whether two spans read the same, field for field. */
+function sameSpan(a, b) {
+  if (a === b) return true;
+  const keys = Object.keys(a);
+  if (keys.length !== Object.keys(b).length) return false;
+  for (const key of keys) if (a[key] !== b[key]) return false;
+  return true;
+}
 
 class CocoaTextLayout {
   constructor(native, raw, text) {
@@ -116,21 +167,137 @@ class CocoaTextLayout {
     this._cpToCu = codeUnitOffsets(text);
     this.width = raw.width;
     this.height = raw.height;
-    this.lines = raw.lines;
+    this.lines = raw.lines ?? unpackLines(raw.lineData, raw.runData);
   }
 
   _cuOf(cp) {
     const t = this._cpToCu;
+    if (t === null) return Math.max(0, Math.min(cp, this._text.length));
     return t[Math.max(0, Math.min(cp, t.length - 1))];
   }
 
   _cpOf(cu) {
     const t = this._cpToCu;
+    if (t === null) {
+      return cu <= 0 ? 0 : Math.min(Math.ceil(cu), this._text.length);
+    }
     // t is sorted; layouts are short, a linear walk is fine
     for (let i = 0; i < t.length; i++) if (t[i] >= cu) return i;
     return t.length - 1;
   }
 
+  /**
+   * Hang each run off the span it was laid out from, as ntk's runs hang:
+   * `span` is the caller's own object, markers and all — what a painter
+   * reads a link's underline or a code chip's background off — and `run`
+   * the face and size it was set in, and its direction. CoreText makes one
+   * run of two neighbouring spans with the same attributes, a link beside
+   * plain text of the same colour, so such a run is cut where the spans
+   * meet, at the offset the native gives for that index.
+   */
+  _hangRuns(sources, runOf) {
+    this._sources = sources;
+    const starts = [];
+    let at = 0;
+    for (const source of sources) {
+      starts.push(at);
+      at += String(source.text).length;
+    }
+    for (const line of this.lines) {
+      const runs = [];
+      for (const r of line.runs) this._cutRun(r, line, starts, runOf, runs);
+      line.runs = runs;
+    }
+  }
+
+  _cutRun(r, line, starts, runOf, out) {
+    // the span holding the run's first unit
+    let lo = 0;
+    let hi = starts.length - 1;
+    while (lo < hi) {
+      const mid = (lo + hi + 1) >> 1;
+      if (starts[mid] <= r.start) lo = mid;
+      else hi = mid - 1;
+    }
+    const hang = (run, source) => {
+      run.span = this._sources[source];
+      run.run = runOf(source, run.rtl);
+      // which span, for a layout found again with another call's spans; out
+      // of sight, so a run is ntk's shape to anything that reads it whole
+      Object.defineProperty(run, '_source', { value: source });
+      return run;
+    };
+    let next = lo + 1;
+    if (next >= starts.length || starts[next] >= r.end) {
+      out.push(hang(r, lo));
+      return;
+    }
+    // where each span that starts inside the run begins, from the line's
+    // origin, as the run's own `x` is measured
+    const edges = [r.start];
+    const at = [r.rtl ? r.x + r.width : r.x];
+    const sources = [lo];
+    for (; next < starts.length && starts[next] < r.end; next += 1) {
+      edges.push(starts[next]);
+      at.push(this._native.layoutCaret(this._handle, starts[next]).x - line.x);
+      sources.push(next);
+    }
+    edges.push(r.end);
+    at.push(r.rtl ? r.x : r.x + r.width);
+    const pieces = [];
+    for (let i = 0; i < sources.length; i += 1) {
+      const a = at[i];
+      const b = at[i + 1];
+      pieces.push(
+        hang(
+          {
+            ...r,
+            start: edges[i],
+            end: edges[i + 1],
+            x: Math.min(a, b),
+            width: Math.abs(b - a),
+          },
+          sources[i],
+        ),
+      );
+    }
+    // a line's runs go left to right, and a right-to-left run's first span
+    // is its rightmost piece
+    if (r.rtl) pieces.reverse();
+    out.push(...pieces);
+  }
+
+  /**
+   * This layout for another call's spans: the same text set the same way,
+   * which is what found it in the cache. Spans that are the same, or read
+   * the same field for field, are the same layout — an immediate-mode caller
+   * that builds its spans afresh every paint is answered with the object it
+   * had. A caller whose markers differ — a link here, plain text there — has
+   * the runs pointed at its own spans, in a copy.
+   */
+  _forSources(sources) {
+    const mine = this._sources;
+    if (
+      !mine ||
+      (mine.length === sources.length &&
+        mine.every((source, i) => sameSpan(source, sources[i])))
+    ) {
+      return this;
+    }
+    const copy = Object.create(CocoaTextLayout.prototype);
+    Object.assign(copy, this);
+    copy._sources = sources;
+    copy.lines = this.lines.map((line) => ({
+      ...line,
+      runs: line.runs.map((r) => {
+        const run = { ...r, span: sources[r._source] };
+        Object.defineProperty(run, '_source', { value: r._source });
+        return run;
+      }),
+    }));
+    return copy;
+  }
+
   draw(ctx, x, y) {
     ctx._drawLayout(this, x, y);
   }
@@ -500,6 +667,10 @@ function spacedFeatures(features, spacing) {
     : OPTIONAL_LIGATURES_OFF;
 }
 
+/** The text the kept typesetters may hold, in UTF-16 units: a document of
+ *  about a megabyte, at 25 bytes a unit in CoreText. */
+const KEPT_TYPESETTER_UNITS = 1 << 20;
+
 export class CocoaFontManager {
   /** @param native the @windowkit/appkit module; the tests hand in a fake */
   constructor(native = loadNative()) {
@@ -513,6 +684,50 @@ export class CocoaFontManager {
     this._sized = new Map(); // face key|size|variations -> CTFont handle
     this._layouts = new Map(); // layout signature -> CocoaTextLayout (LRU)
     this._faceByPs = new Map(); // PostScript name -> face CoreText chose itself
+    // paragraph -> its typesetter, kept to lay it out at another width
+    // (`_keptTypesetter`); LRU, bounded by the UTF-16 units they hold. Only
+    // a bridge that keeps them (`@windowkit/appkit` 0.14) has the verb.
+    this._keeps = typeof native.releaseTypesetter === 'function';
+    this._typesetters = new Map();
+    this._typesetterUnits = 0;
+  }
+
+  /**
+   * A paragraph's typesetter, kept from a layout of the same text at any
+   * width. Two thirds of a layout is the text becoming glyphs — the
+   * attributed string, then CoreText's shaping — and a paragraph laid out
+   * at another width breaks the same glyphs into other lines: a window
+   * resize lays a document out at every width it passes through, and a
+   * paragraph's max-content and wrapped measurements are two layouts of
+   * one text. The cache holds `KEPT_TYPESETTER_UNITS` of text, about
+   * 25 MB, which is a long document; past that the paragraph laid out
+   * least recently is let go.
+   */
+  _keptTypesetter(key) {
+    const kept = this._typesetters.get(key);
+    if (kept === undefined) return null;
+    this._typesetters.delete(key);
+    this._typesetters.set(key, kept);
+    return kept.handle;
+  }
+
+  _keepTypesetter(key, handle, units) {
+    this._typesetters.set(key, { handle, units });
+    this._typesetterUnits += units;
+    while (this._typesetterUnits > KEPT_TYPESETTER_UNITS) {
+      const [oldest, entry] = this._typesetters.entries().next().value;
+      this._typesetters.delete(oldest);
+      this._typesetterUnits -= entry.units;
+      this._native.releaseTypesetter(entry.handle);
+    }
+  }
+
+  _forgetTypesetters() {
+    for (const { handle } of this._typesetters.values()) {
+      this._native.releaseTypesetter(handle);
+    }
+    this._typesetters.clear();
+    this._typesetterUnits = 0;
   }
 
   /** A face the app loaded joins every fallback chain: what the faces that
@@ -941,6 +1156,7 @@ export class CocoaFontManager {
     this._faces.clear();
     this._sized.clear();
     this._layouts.clear();
+    if (this._keeps) this._forgetTypesetters();
     this._forgetCovers();
     // `null` on purpose: src/fonts.js keeps the fontkit face it already
     // opened as the handle, which is the one whose metrics apps can read;
@@ -957,8 +1173,10 @@ export class CocoaFontManager {
     // Memoized: an immediate-mode caller (the fonts app's specimen canvas,
     // a hover pass) lays the same paragraph out every repaint, and a
     // CTFramesetter per pointer move is what sluggish feels like. The key
-    // is everything shaping reads; ~64 entries covers a screenful.
-    const signature = JSON.stringify([
+    // is everything shaping reads — the paragraph, `shape`, which is also
+    // what its kept typesetter is found by — and then everything breaking
+    // it into lines reads; ~64 entries covers a screenful.
+    const shape = JSON.stringify([
       spans.map((sp) => [
         sp.text,
         sp.family ?? base.family,
@@ -971,29 +1189,36 @@ export class CocoaFontManager {
         sp.features ?? base.features ?? null,
         sp.letterSpacing ?? base.letterSpacing ?? 0,
       ]),
-      options.maxWidth,
-      options.align,
-      options.lineHeight,
-      options.maxLines,
-      options.overflow,
       options.direction,
     ]);
+    const signature =
+      shape +
+      JSON.stringify([
+        options.maxWidth,
+        options.align,
+        options.lineHeight,
+        options.maxLines,
+        options.overflow,
+      ]);
     const hit = this._layouts.get(signature);
     if (hit) {
       // refresh LRU position
       this._layouts.delete(signature);
       this._layouts.set(signature, hit);
-      return hit;
+      return hit._forSources(spans.filter((span) => String(span.text ?? '')));
     }
     const { maxWidth, align, lineHeight, maxLines, overflow, direction } =
       options;
     const nativeSpans = [];
+    // the caller's spans with text, which the runs hang off (`_hangRuns`)
+    const sources = [];
     let text = '';
     let contextInk = false;
     for (const span of spans) {
       const t = String(span.text ?? '');
       if (!t) continue;
       text += t;
+      sources.push(span);
       const size = span.size ?? base.size ?? 14;
       const variations = span.variations ?? base.variations;
       // A span may carry the face itself — an ntk Font from openFont(),
@@ -1054,8 +1279,17 @@ export class CocoaFontManager {
       : minContent
         ? brokenAtEveryOpportunity(nativeSpans)
         : nativeSpans;
+    // The paragraph's kept typesetter, where it has one. A min-content
+    // measurement lays out other text — the paragraph broken at every
+    // opportunity, and capped for an eliding one — and keeps its own.
+    const shapeKey = probe
+      ? `${shape}|${maxLines}`
+      : minContent
+        ? `${shape}|min`
+        : shape;
+    const typesetter = this._keeps ? this._keptTypesetter(shapeKey) : null;
     const raw = this._native.createLayout({
-      spans: laid,
+      ...(typesetter ? { typesetter } : { spans: laid }),
       maxWidth:
         Number.isFinite(maxWidth) && maxWidth > 0 ? maxWidth : undefined,
       align: flushFor(align, direction),
@@ -1063,7 +1297,15 @@ export class CocoaFontManager {
       maxLines: probe || !Number.isFinite(maxLines) ? undefined : maxLines,
       ellipsis: !probe && overflow === 'ellipsis',
       rtl: direction === 'rtl',
+      // the geometry as two arrays rather than an object a line and a run:
+      // a tenth of the calls across the bridge (`unpackLines`)
+      ...(this._keeps ? { keep: typesetter === null, packed: true } : null),
     });
+    if (raw.typesetter) {
+      let units = 0;
+      for (const span of laid) units += span.text.length;
+      this._keepTypesetter(shapeKey, raw.typesetter, units);
+    }
     // the text the native actually laid out: a min-content measurement's
     // line and run ranges are indices into the broken text, and the two have
     // to agree for `indexAt`/`caretPosition` to mean anything at all
@@ -1073,6 +1315,40 @@ export class CocoaFontManager {
       minContent ? laid.map((span) => span.text).join('') : text,
     );
     layout._contextInk = contextInk;
+    if (!minContent) {
+      const runs = new Map();
+      layout._hangRuns(sources, (i, rtl) => {
+        const key = `${i}|${rtl ? 1 : 0}`;
+        let run = runs.get(key);
+        if (!run) {
+          const span = sources[i];
+          const given = span.font ?? base.font;
+          run = {
+            font:
+              typeof given?.metrics === 'function'
+                ? given
+                : this.match(span.family ?? base.family, {
+                    weight: span.weight ?? base.weight,
+                    style: span.style ?? base.style,
+                  }),
+            size: span.size ?? base.size ?? 14,
+            direction: rtl ? 'rtl' : 'ltr',
+          };
+          runs.set(key, run);
+        }
+        return run;
+      });
+      // ntk's `truncated`: whether a line cap dropped anything. An eliding
+      // layout does not say — its last line is cut to the mark, and where
+      // the cut fell is the native's — so a caller asks the line ends.
+      if (!elides) {
+        const last = layout.lines[layout.lines.length - 1];
+        layout.truncated =
+          Number.isFinite(maxLines) &&
+          !!last &&
+          /\S/.test(text.slice(last.end));
+      }
+    }
     this._layouts.set(signature, layout);
     if (this._layouts.size > 64) {
       this._layouts.delete(this._layouts.keys().next().value);

package/src/cocoa/window.js

@@ -50,6 +50,50 @@ function owe(owed, damage) {
   return rects.length > OWED_RECTS_MAX ? 'full' : rects;
 }
 
+/** The band `scrollSurface` would write for a shift of `scroll` inside a
+ * `width` x `height` bitmap, clamped the way the native clamps the rect:
+ * rect ∩ (rect + delta), or null when nothing survives the shift. */
+function survivingBand(scroll, width, height) {
+  const { x, y, dx, dy } = scroll;
+  if (!dx && !dy) return null;
+  const clamp = (v, hi) => (v < 0 ? 0 : v > hi ? hi : v);
+  const x0 = clamp(x, width);
+  const y0 = clamp(y, height);
+  const x1 = clamp(x + scroll.width, width);
+  const y1 = clamp(y + scroll.height, height);
+  const left = Math.max(x0, x0 + dx);
+  const top = Math.max(y0, y0 + dy);
+  const right = Math.min(x1, x1 + dx);
+  const bottom = Math.min(y1, y1 + dy);
+  if (right <= left || bottom <= top) return null;
+  return { x: left, y: top, width: right - left, height: bottom - top };
+}
+
+/** Flat `[x, y, w, h, …]` rects less the `[x, y, w, h]` hole: the rows above
+ * and below it full width, the pieces beside it its rows only. */
+function aroundHole(rects, [hx, hy, hw, hh]) {
+  const out = [];
+  for (let i = 0; i + 3 < rects.length; i += 4) {
+    const x = rects[i];
+    const y = rects[i + 1];
+    const right = x + rects[i + 2];
+    const bottom = y + rects[i + 3];
+    const top = Math.max(y, hy);
+    const under = Math.min(bottom, hy + hh);
+    const left = Math.max(x, hx);
+    const beside = Math.min(right, hx + hw);
+    if (beside <= left || under <= top) {
+      out.push(x, y, right - x, bottom - y);
+      continue;
+    }
+    if (top > y) out.push(x, y, right - x, top - y);
+    if (bottom > under) out.push(x, under, right - x, bottom - under);
+    if (left > x) out.push(x, top, left - x, under - top);
+    if (right > beside) out.push(beside, top, right - beside, under - top);
+  }
+  return out;
+}
+
 export class CocoaWindow {
   constructor(app, attributes = {}) {
     this.app = app;
@@ -599,8 +643,18 @@ export class CocoaWindow {
    * always drew into.
    *
    * Then what it missed, copied across from the frame on glass.
+   *
+   * When the frame's first draw is a scroll blit (`scrollRegion`), the band
+   * it moves comes across already moved: one copy from the frame on glass
+   * at the shift, where catching up and then shifting in place wrote the
+   * band twice — the catch-up owes it, since the frame before blitted too.
+   * The catch-up copies the rest. Every pixel ends as the two passes left
+   * it, the strips the shift exposes included, so what the frame repaints
+   * does not change. Answers whether the band moved, or undefined when
+   * there was no scroll to take or it has to move in place: a chain of
+   * one, a buffer that owes nothing, a bridge without `blitSurface`.
    */
-  _takeBack() {
+  _takeBack(scroll = null) {
     const chain = this._chain;
     let free = null;
     let oldest = null;
@@ -639,10 +693,9 @@ export class CocoaWindow {
     // re-syncs its sticky state off the generation
     this._surfaceGen++;
     this._native.surfaceLock(back.handle);
+    let moved;
     if (back.owed && back !== chain.front) {
-      this._native.copySurfaceRegion(
-        chain.front.handle,
-        back.handle,
+      let owed =
         back.owed === 'full'
           ? null
           : back.owed.flatMap((r) => [
@@ -650,10 +703,39 @@ export class CocoaWindow {
               Math.floor(r.y),
               Math.ceil(r.width) + 1,
               Math.ceil(r.height) + 1,
-            ]),
-      );
+            ]);
+      if (scroll && typeof this._native.blitSurface === 'function') {
+        const { width, height } = this._surfaceSize;
+        const band = survivingBand(scroll, width, height);
+        // the band and where it comes from are both inside the bitmap, so
+        // the copy is the whole band — anything else is a bridge that did
+        // not copy, and the band moves in place after the plain catch-up
+        const copied =
+          band &&
+          this._native.blitSurface(
+            chain.front.handle,
+            band.x - scroll.dx,
+            band.y - scroll.dy,
+            band.width,
+            band.height,
+            back.handle,
+            band.x,
+            band.y,
+          );
+        if (!band) {
+          moved = false;
+        } else if (Array.isArray(copied)) {
+          moved = true;
+          owed = aroundHole(owed ?? [0, 0, width, height], copied);
+        }
+      }
+      // (an empty list is the whole bitmap to the native, not nothing)
+      if (owed === null || owed.length > 0) {
+        this._native.copySurfaceRegion(chain.front.handle, back.handle, owed);
+      }
     }
     back.owed = null;
+    return moved;
   }
 
   /**
@@ -832,18 +914,30 @@ export class CocoaWindow {
       return false;
     }
     if (!Number.isInteger(dx) || !Number.isInteger(dy)) return false;
-    // The band moves in the buffer this frame draws into — taken, and
-    // caught up to the frame on glass, before anything moves in it.
-    const surface = this._ensureSurface();
-    const moved = this._native.scrollSurface(
-      surface,
-      Math.round(rect.x),
-      Math.round(rect.y),
-      Math.round(rect.width),
-      Math.round(rect.height),
-      dx,
-      dy,
-    );
+    const x = Math.round(rect.x);
+    const y = Math.round(rect.y);
+    const width = Math.round(rect.width);
+    const height = Math.round(rect.height);
+    // The band moves in the buffer this frame draws into. When this is the
+    // frame's first draw, taking that buffer moves it (`_takeBack`);
+    // otherwise, or where that cannot, it is taken and caught up to the
+    // frame on glass first, and the band moves in place.
+    const chain = this._chain;
+    let moved =
+      chain && !chain.back
+        ? this._takeBack({ x, y, width, height, dx, dy })
+        : undefined;
+    if (moved === undefined) {
+      moved = this._native.scrollSurface(
+        this._ensureSurface(),
+        x,
+        y,
+        width,
+        height,
+        dx,
+        dy,
+      );
+    }
     if (moved) {
       this._dirty = true;
       // The band moved inside the BACK buffer only. After the flip every
@@ -851,14 +945,7 @@ export class CocoaWindow {
       // is owed only covers what the flush painted — the strips the shift
       // exposed — so the next frame would blit a band one frame stale.
       // Record the shifted rect as painted, and the catch-up carries it.
-      this.noteFrameDamage([
-        {
-          x: Math.round(rect.x),
-          y: Math.round(rect.y),
-          width: Math.round(rect.width),
-          height: Math.round(rect.height),
-        },
-      ]);
+      this.noteFrameDamage([{ x, y, width, height }]);
     }
     return Boolean(moved);
   }

package/src/nodes/text.js

@@ -56,21 +56,6 @@ const textStripBelowFor = (app) =>
     ? textStripBelowEnv
     : TEXT_STRIP_BELOW);
 
-/**
- * Downward shift that recreates CSS "half-leading". ntk's TextLayout puts
- * the first baseline at exactly `ascent` and packs each line's leading
- * (font line gap + any lineHeight surplus) entirely *below* the glyphs, so
- * a layout drawn at the top of its measured box rides visually high —
- * most noticeable centered in buttons/inputs (fonts like Helvetica carry a
- * 0.5em line gap). CSS instead splits that leading evenly above and below
- * the ink (see seek-oss capsize for the metrics background).
- */
-function halfLeading(layout) {
-  const last = layout.lines?.[layout.lines.length - 1];
-  if (!last) return 0;
-  return Math.max(0, (layout.height - (last.baseline + last.descent)) / 2);
-}
-
 /** A selected line with nothing on it still shows, so a blank line inside a
  * selection does not read as the highlight having stopped. */
 const EMPTY_LINE_BAND = 4;
@@ -469,9 +454,10 @@ export class TextNode extends Node {
    * ever optically even by luck. `lineHeight` cannot fix it: it scales the
    * box and the leading still splits evenly, so it moves both edges alike.
    *
-   * Measured in the coordinates the layout is **drawn** in, not the ones it
-   * reports: `halfLeading` shifts it, and deriving the baseline from the
-   * metrics again would silently disagree the day that shift changes.
+   * Measured from the baselines the layout reports, which are where it
+   * draws them: the engine splits a line's leading above and below the
+   * glyphs, and deriving the baseline from the metrics again would silently
+   * disagree with it.
    *
    * The amounts are fractions of a pixel and stay that way — the glyphs are
    * placed from them (`_placedLayout`). What must not stay fractional is the
@@ -505,9 +491,8 @@ export class TextNode extends Node {
     // one backend and half-covers two rows on the other. Rounded, the
     // baseline sits on a pixel wherever the box does.
     const capHeight = Math.round(measured);
-    const shift = halfLeading(layout);
-    const firstBaseline = shift + lines[0].baseline;
-    const lastBaseline = shift + lines[lines.length - 1].baseline;
+    const firstBaseline = lines[0].baseline;
+    const lastBaseline = lines[lines.length - 1].baseline;
     return {
       top: Math.max(0, firstBaseline - capHeight),
       bottom: Math.max(0, Math.ceil(layout.height) - lastBaseline),
@@ -530,7 +515,7 @@ export class TextNode extends Node {
     return {
       layout,
       x: content.x,
-      y: content.y + halfLeading(layout) - (trim ? trim.top : 0),
+      y: content.y - (trim ? trim.top : 0),
     };
   }
 

package/src/nodes/textinput.js

@@ -618,15 +618,14 @@ export class TextInputNode extends Node {
    * it fills. Centred on the **capitals**, not on the line box and not on
    * the ink.
    *
-   * The layout box carries the line's leading entirely below the glyphs, so
-   * centring that pushes the text visually up (see `halfLeading`). Centring
-   * ascent + descent — what this did — fixes the leading but not the
-   * asymmetry underneath it: a font's ascent clears its capitals by
-   * `ascent - capHeight`, which is not its descent, so a single line of
-   * text sits off-centre by a number that belongs to the typeface. At 14px
-   * that is 0.7px of extra space above the capitals in SF NS and 2.5px the
-   * other way in Helvetica — visible in a field, where there is one short
-   * line and a border close on both sides to measure it against.
+   * Centring the line box centres its ascent + descent, because the engine
+   * splits the leading evenly round them, and that is not enough: a font's
+   * ascent clears its capitals by `ascent - capHeight`, which is not its
+   * descent, so a single line of text sits off-centre by a number that
+   * belongs to the typeface. At 14px that is 0.7px of extra space above the
+   * capitals in SF NS and 2.5px the other way in Helvetica — visible in a
+   * field, where there is one short line and a border close on both sides
+   * to measure it against.
    *
    * So: put the baseline where the space above the capitals equals the
    * space under it. A `<text>` says the same thing as `textBoxTrim`, but a

package/src/win32/fonts.js

@@ -486,9 +486,9 @@ export class Win32FontManager {
       );
     }
 
-    // `descent` is what halfLeading() in nodes/text.js subtracts to recreate
-    // CSS half-leading, and DirectWrite reports a baseline and a height per
-    // line rather than a descent.
+    // Every engine answers a descent per line — a field and the edit menu
+    // measure a line's ink as its ascent plus its descent — and DirectWrite
+    // reports a baseline and a height per line rather than a descent.
     const lines = (raw.lines ?? []).map((line) => ({
       ...line,
       descent: Math.max(0, line.height - line.baseline),