react-x11 2.22.7 → 2.22.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.22.7",
+  "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.14.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

@@ -150,6 +150,15 @@ function unpackLines(lineData = NO_GEOMETRY, runData = NO_GEOMETRY) {
   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) {
     this._native = native;
@@ -177,6 +186,118 @@ class CocoaTextLayout {
     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);
   }
@@ -1084,17 +1205,20 @@ export class CocoaFontManager {
       // 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(),
@@ -1191,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/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),