@react-x11/components 0.12.0 → 0.14.0

package/dist/richtext/runs.js

@@ -92,60 +92,203 @@ export function paintRunBackgrounds(ctx, line, dx, dy, scale = 1) {
  *  is one logical pixel thick — `scale` device pixels, so a link on a 2x
  *  panel is underlined as heavily as on a 1x one, not with a hairline —
  *  and an underline two below the baseline, where the run sets neither
- *  (`underlineThickness`, `underlineOffset`, in device pixels by now).
+ *  (`underlineThickness`, `underlineOffset`, in device pixels by now). A
+ *  line through is a logical pixel as well where the run names no
+ *  `strikeThickness`, and is drawn where its face puts it (`strikeTop`).
  *  `rules` picks a pass: CSS draws an underline under the glyphs and a
  *  line through over them (CSS 2.1 Appendix E), which is two passes around
- *  the glyphs'; drawn in one, both go over. */
+ *  the glyphs'; drawn in one, both go over.
+ *
+ *  A rule is drawn a stretch at a time and not a run: a layout hands
+ *  back a run a word, and a pattern begun again under each — dots spread
+ *  from one end of their rule to the other, above all — is a pattern with
+ *  a seam at every space. Runs that touch and draw the same rule share
+ *  one. */
 export function paintRunRules(ctx, line, dx, dy, scale = 1, rules = 'all') {
     const t = ruleThickness(scale);
+    if (rules !== 'over') {
+        // the stretch being gathered: the span whose rule it is, and its ends
+        let ruled = null;
+        let from = 0;
+        let to = 0;
+        for (const r of line.runs) {
+            const span = r.span;
+            if (!span?.underline)
+                continue;
+            const end = r.x + r.width;
+            if (ruled &&
+                // on either side: a right-to-left stretch's runs come last first
+                (Math.abs(r.x - to) <= 0.5 || Math.abs(end - from) <= 0.5) &&
+                sameRule(ruled, span)) {
+                from = Math.min(from, r.x);
+                to = Math.max(to, end);
+                continue;
+            }
+            if (ruled)
+                stretchRule(ctx, ruled, line, dx + from, dx + to, dy, t);
+            ruled = span;
+            from = r.x;
+            to = end;
+        }
+        if (ruled)
+            stretchRule(ctx, ruled, line, dx + from, dx + to, dy, t);
+    }
+    if (rules === 'under')
+        return;
+    // A line through, gathered the same way, and ended as well where the
+    // font size changes: it is drawn across each size where that size has
+    // it (`strikeTop`). The faces of one size are one stretch, at the height
+    // they have it between them — a word the face has no glyphs for is set
+    // in another, and the rule does not step for it.
+    let struck = null;
+    let size;
+    let from = 0;
+    let to = 0;
+    // the stretch's ascent: its first run's, and its runs' by how much of
+    // the stretch each sets, which is read only where they are not all the
+    // first's
+    let ascent = 0;
+    let summed = 0;
+    let widths = 0;
+    let mixed = false;
     for (const r of line.runs) {
         const span = r.span;
-        if (!span)
+        if (!span?.strike)
+            continue;
+        const own = inkExtent(r, line).ascent;
+        const end = r.x + r.width;
+        if (struck &&
+            r.run?.size === size &&
+            (Math.abs(r.x - to) <= 0.5 || Math.abs(end - from) <= 0.5) &&
+            sameStrike(struck, span)) {
+            from = Math.min(from, r.x);
+            to = Math.max(to, end);
+            summed += own * r.width;
+            widths += r.width;
+            if (own !== ascent)
+                mixed = true;
             continue;
-        const underline = rules !== 'over' ? span.underline : undefined;
-        const strike = rules !== 'under' ? span.strike : undefined;
-        if (underline) {
-            ctx.fillStyle = underline;
-            underlineRule(ctx, Math.round(dx + line.x + r.x), Math.round(dy + line.baseline + (span.underlineOffset ?? 2 * t)), Math.ceil(r.width), span.underlineStyle ?? 'single', span.underlineThickness === undefined
-                ? t
-                : Math.max(1, Math.round(span.underlineThickness)));
         }
-        if (strike) {
-            const m = inkExtent(r, line);
-            ctx.fillStyle = strike;
-            ctx.fillRect(Math.round(dx + line.x + r.x), Math.round(dy + line.baseline - m.ascent * 0.38), Math.ceil(r.width), t);
+        if (struck) {
+            const mean = mixed && widths > 0 ? summed / widths : ascent;
+            strikeRule(ctx, struck, line, dx + from, dx + to, dy, mean, t);
         }
+        struck = span;
+        size = r.run?.size;
+        from = r.x;
+        to = end;
+        ascent = own;
+        summed = own * r.width;
+        widths = r.width;
+        mixed = false;
+    }
+    if (struck) {
+        const mean = mixed && widths > 0 ? summed / widths : ascent;
+        strikeRule(ctx, struck, line, dx + from, dx + to, dy, mean, t);
+    }
+}
+/** The underline of a stretch of a line, from `from` to `to` of it, as
+ *  `span` has it; `t` is the thickness of a rule that names none. */
+function stretchRule(ctx, span, line, from, to, dy, t) {
+    const left = Math.round(line.x + from);
+    ctx.fillStyle = span.underline;
+    underlineRule(ctx, left, Math.round(dy + line.baseline + (span.underlineOffset ?? 2 * t)), Math.ceil(line.x + to - left), span.underlineStyle ?? 'single', span.underlineThickness === undefined
+        ? t
+        : Math.max(1, Math.round(span.underlineThickness)), t);
+}
+/** How thick a run's line through is: what it says, on whole pixels, or
+ *  `t`, a rule's own thickness. */
+function strikeThickness(span, t) {
+    return span.strikeThickness === undefined
+        ? t
+        : Math.max(1, Math.round(span.strikeThickness));
+}
+/**
+ * Where the top of a line through is, across text whose faces' ascent is
+ * `ascent`. Through the middle of the letters with no ascender, which a
+ * face does not say the height of in a way both text engines report: a
+ * third of its ascent above the baseline, where Blink has it, and the
+ * rule's middle there, so that a thick one grows both ways from where a
+ * thin one is. The ascent is the text's own, and not that of the font the
+ * rule was set in: a line through is worked out again across text of
+ * another font size, from the metrics of the fonts that size is set in,
+ * so that the text is still crossed out (CSS Text Decoration 4, 2.5), and
+ * is not held to the one position an underline is (2.9). Blink measures
+ * the ascent of the font the rule was set in from the top of the text it
+ * crosses, which puts it near the top of larger text and under smaller.
+ * The curl is two levels and straddles the middle; a double rule's first
+ * line is the single one's, and its second under it, as Blink draws it.
+ *
+ * A run that names no thickness keeps the pixel it always had: the rule's
+ * top 38% of the ascent up, which at a text size is the same place, and a
+ * pixel off it at some.
+ */
+function strikeTop(line, dy, span, ascent, t) {
+    if (span.strikeThickness === undefined) {
+        return Math.round(dy + line.baseline - ascent * 0.38);
     }
+    const thick = strikeThickness(span, t);
+    return Math.round(dy +
+        line.baseline -
+        ascent / 3 -
+        (span.strikeStyle === 'curly' ? thick : thick / 2));
+}
+/** The line through a stretch of a line, from `from` to `to` of it, as
+ *  `span` has it, over faces whose ascent is `ascent`. */
+function strikeRule(ctx, span, line, from, to, dy, ascent, t) {
+    const left = Math.round(line.x + from);
+    ctx.fillStyle = span.strike;
+    underlineRule(ctx, left, strikeTop(line, dy, span, ascent, t), Math.ceil(line.x + to - left), span.strikeStyle ?? 'single', strikeThickness(span, t), t);
+}
+/** Whether two spans are struck through with one rule: the same ink, style
+ *  and thickness. Where it is drawn is their faces' to say (`strikeTop`). */
+function sameStrike(a, b) {
+    return (a === b ||
+        (a.strike === b.strike &&
+            a.strikeStyle === b.strikeStyle &&
+            a.strikeThickness === b.strikeThickness));
+}
+/** Whether two spans are underlined with one rule: the same ink, style,
+ *  place and thickness. */
+function sameRule(a, b) {
+    return (a === b ||
+        (a.underline === b.underline &&
+            a.underlineStyle === b.underlineStyle &&
+            a.underlineOffset === b.underlineOffset &&
+            a.underlineThickness === b.underlineThickness));
 }
 /** One logical pixel on the device grid, never less than one device pixel. */
 function ruleThickness(scale) {
     return Math.max(1, Math.round(scale));
 }
 /**
- * The rule under a run, in one of SGR 4's five styles.
+ * The rule under a run, or through it, in one of SGR 4's five styles.
  *
  * All five are built from rectangles `t` pixels thick — one logical pixel —
  * rather than a stroked path: the mock backend has no path API, and a
  * hairline stroke on a text baseline is not worth an antialiased path even
  * where there is one. The curl is a two-level square wave — at a text size
  * it reads as a squiggle, which is the entire job. The dot pitch and the
- * dash length scale with the thickness, so the pattern is the pattern at
- * any display scale.
+ * dash length scale with the thickness (`dashedRule`), so the pattern is
+ * the pattern at any display scale. The one path is a thick dotted rule's
+ * (`dottedRule`): a square is a dot only while it is too small to be seen
+ * as a square.
+ *
+ * `gap` is what parts the two lines of a double rule: a logical pixel
+ * however thick they are, as Blink parts them, which for a rule of that
+ * thickness is the thickness between them it always was.
  */
-export function underlineRule(ctx, x, y, width, style, t = 1) {
+export function underlineRule(ctx, x, y, width, style, t = 1, gap = t) {
     switch (style) {
         case 'double':
             ctx.fillRect(x, y, width, t);
-            ctx.fillRect(x, y + 2 * t, width, t);
+            ctx.fillRect(x, y + t + gap, width, t);
             return;
         case 'dotted':
-            for (let i = 0; i < width; i += 2 * t) {
-                ctx.fillRect(x + i, y, Math.min(t, width - i), t);
-            }
+            dottedRule(ctx, x, y, width, t);
             return;
         case 'dashed':
-            for (let i = 0; i < width; i += 6 * t)
-                ctx.fillRect(x + i, y, Math.min(3 * t, width - i), t);
+            dashedRule(ctx, x, y, width, t);
             return;
         case 'curly':
             for (let i = 0; i < width; i += 2 * t) {
@@ -157,6 +300,79 @@ export function underlineRule(ctx, x, y, width, style, t = 1) {
             return;
     }
 }
+/** The thickness a dashed rule's dashes stop being the long ones of a thin
+ *  rule at. */
+const THIN_DASHES = 3;
+/**
+ * A dashed rule, its dashes the lengths Blink's are: three times the rule's
+ * thickness and two apart while it is thin, where a shorter dash reads as
+ * a dot and a nearer one as no gap, and twice and one from three pixels up.
+ * The first dash starts the rule and the last ends it, with as many between
+ * as leave the gaps nearest that: a rule that stopped where its length ran
+ * out ended on a sliver of a dash, or on nothing. One with room for two
+ * dashes and less than their gap is two, scaled to fit, and one too short
+ * for two is a line.
+ */
+function dashedRule(ctx, x, y, width, t) {
+    const thin = t < THIN_DASHES;
+    const dash = t * (thin ? 3 : 2);
+    const gap = t * (thin ? 2 : 1);
+    if (width <= 2 * dash) {
+        ctx.fillRect(x, y, width, t);
+        return;
+    }
+    if (width <= 2 * dash + gap) {
+        const each = Math.round((dash * width) / (2 * dash + gap));
+        ctx.fillRect(x, y, each, t);
+        ctx.fillRect(x + width - each, y, each, t);
+        return;
+    }
+    // the fewest dashes that gap fits between, and one more: whichever
+    // count's gap is nearer it
+    const few = Math.floor((width + gap) / (dash + gap));
+    const wide = (width - few * dash) / (few - 1);
+    const narrow = (width - (few + 1) * dash) / few;
+    const count = narrow <= 0 || Math.abs(wide - gap) < Math.abs(narrow - gap)
+        ? few
+        : few + 1;
+    const pitch = (width - dash) / (count - 1);
+    for (let i = 0; i < count; i += 1) {
+        ctx.fillRect(x + Math.round(i * pitch), y, dash, t);
+    }
+}
+/** The thickest a dotted rule's dots are squares at: past it a square
+ *  reads as one. Where Blink's dotted stroke turns its caps round. */
+const SQUARE_DOTS = 3;
+/**
+ * A dotted rule: squares a thickness apart while it is thin, and round dots
+ * once it is thick enough for the shape to show — under a title, where the
+ * thickness follows the font size. The round ones are spread over the
+ * width, the first at its start and the last at its end, as many as leave
+ * the gap between two nearest to a dot's own width; a rule with room for
+ * fewer than two is one dot. A context with no path draws the squares.
+ */
+function dottedRule(ctx, x, y, width, t) {
+    if (t <= SQUARE_DOTS || !ctx.beginPath || !ctx.roundRect || !ctx.fill) {
+        for (let i = 0; i < width; i += 2 * t) {
+            ctx.fillRect(x + i, y, Math.min(t, width - i), t);
+        }
+        return;
+    }
+    // the fewest dots a gap of their own width fits, and one more: whichever
+    // count's gap is nearer that width
+    const few = Math.max(1, Math.floor((width + t) / (2 * t)));
+    const wide = few > 1 ? (width - few * t) / (few - 1) : Infinity;
+    const narrow = (width - (few + 1) * t) / few;
+    const count = narrow <= 0 || Math.abs(wide - t) < Math.abs(narrow - t) ? few : few + 1;
+    const pitch = count > 1 ? (width - t) / (count - 1) : 0;
+    for (let i = 0; i < count; i += 1) {
+        // a path a dot: ntk knows a path that is one `roundRect` and fills it
+        // from its corners, where a path of them all is rasterized whole
+        ctx.beginPath();
+        ctx.roundRect(x + i * pitch, y, t, t, [t / 2]);
+        ctx.fill();
+    }
+}
 /** A selected empty line still shows as a sliver, so a selection spanning a
  *  blank line does not appear to skip it. Core's own width for the same. */
 export const EMPTY_LINE_BAND = 4;

package/dist/richtext/runs.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-x11/components",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "Components for react-x11 that do not belong in the core package",
   "keywords": [
     "react",
@@ -154,7 +154,7 @@
     "prebuild": "rm -rf dist",
     "build": "tsc -p tsconfig.build.json",
     "pretest": "npm run build",
-    "test": "tsx --test test/*.test.ts",
+    "test": "tsx --test test/*.test.ts test/html/*.test.ts",
     "pretypecheck": "npm run build",
     "typecheck": "tsc -p tsconfig.json",
     "lint": "eslint .",

package/src/html/controls.ts

@@ -22,10 +22,19 @@
 import type { Element } from 'domhandler';
 
 import { attr, tagOf } from './dom.js';
+import {
+  optionElements,
+  optionLabel,
+  optionValue,
+  selectedOptions,
+} from './form.js';
 import type { ComputedStyle } from './css/style.js';
+import { invert } from './css/transform.js';
 import { isTransparent } from './css/values.js';
+import { placedMatrix } from './layout/block.js';
 import type { Box, BoxTree, ReplacedKind } from './layout/boxes.js';
 import type { FontsLike } from './layout/inline.js';
+import { clipAround } from './paint.js';
 
 /** The palette numbers a control's box has to reserve room for. */
 export interface ControlChrome {
@@ -47,6 +56,14 @@ export interface ControlRect {
   y: number;
   width: number;
   height: number;
+  /**
+   * The element's computed face and size: what `measureControl` measured
+   * its box in, and so what the widget sets its text in. The palette's,
+   * from the UA sheet, unless the page set its own — `font: inherit`, which
+   * a CSS reset gives every control, for one.
+   */
+  fontFamily: string;
+  fontSize: number;
   /**
    * Set on a text field or a `<select>` whose own box the author styled —
    * gave it a border or a background (`styledField`). The document draws
@@ -63,6 +80,18 @@ export interface ControlRect {
    * invisible, over its label.
    */
   opacity?: number;
+  /**
+   * The part of the document the element shows through, where that is not
+   * all of its box: what its own `clip` and `clip-path` leave of it, and
+   * what the boxes that clip their overflow around it, and every
+   * `clip-path` above it, do (`clipAround`). The widget is cut to it, as
+   * the element's own drawing is. With no area, none of the element shows
+   * — a control a page hides for a screen reader alone, 1px square under
+   * `clip: rect(0, 0, 0, 0)` or `clip-path: inset(50%)`, beside the one it
+   * draws itself — and the widget is not seen and takes no press, and
+   * still takes the keyboard's focus, as the element does in a browser.
+   */
+  clip?: { x: number; y: number; width: number; height: number };
 }
 
 /** Where a styled field's widget goes, and how its text looks. */
@@ -72,7 +101,9 @@ export interface BareField {
   width: number;
   height: number;
   color: string;
+  /** @deprecated The rect's own `fontFamily`, which every rect carries. */
   fontFamily: string;
+  /** @deprecated The rect's own `fontSize`, which every rect carries. */
   fontSize: number;
   /**
    * A `<select>`'s: whether it draws its arrow. It does unless the page set
@@ -82,8 +113,9 @@ export interface BareField {
   chevron?: boolean;
 }
 
-/** The rectangles every control in a laid-out document landed on. */
-export function controlRectsOf(tree: BoxTree): ControlRect[] {
+/** The rectangles every control in a laid-out document landed on. `scale`
+ *  is the document's device pixels to a CSS one. */
+export function controlRectsOf(tree: BoxTree, scale = 1): ControlRect[] {
   const out: ControlRect[] = [];
   for (const box of tree.controls) {
     if (!box.el) continue;
@@ -97,12 +129,30 @@ export function controlRectsOf(tree: BoxTree): ControlRect[] {
       y: box.y,
       width: box.width,
       height: box.height,
+      fontFamily: box.style.fontFamily,
+      fontSize: box.style.fontSize,
     };
     let opacity = 1;
+    // A box scaled to nothing draws nothing of what it holds (CSS
+    // Transforms 1, 6), which is how a page keeps a menu it has not opened.
+    // A widget in it is not mounted; one in a box turned or scaled to
+    // anything else is mounted where the box was laid out, as it is — a
+    // widget is a node of its own, which no matrix of the document's reaches.
+    let flattened = false;
     for (let at: Box | null = box; at; at = at.parent) {
       opacity *= at.style.opacity;
+      const matrix = placedMatrix(at);
+      if (matrix && !invert(matrix)) flattened = true;
     }
+    if (flattened) continue;
     if (opacity < 1) rect.opacity = Math.max(0, opacity);
+    // cut by the clips around it where they do not leave it whole, and by
+    // its own box where it clips itself
+    const shown = pixelsOf(box);
+    const around = clipAround(box, scale);
+    if (clipsItself(box)) {
+      rect.clip = around ? between(around, shown) : shown;
+    } else if (around && !covers(around, shown)) rect.clip = around;
     if (styledField(box.replaced, box.style)) {
       rect.bare = {
         x: box.contentX,
@@ -122,6 +172,57 @@ export function controlRectsOf(tree: BoxTree): ControlRect[] {
   return out;
 }
 
+type Rect = { x: number; y: number; width: number; height: number };
+
+/**
+ * Whether a control is cut to its own box: one the page gave an `overflow`
+ * other than `visible`, as an inline block's content is cut (CSS 2.1
+ * 11.1.1). A browser paints no control past its border box whatever its
+ * `overflow` says, scaling a checkbox into a box a pixel square; a widget
+ * has a size of its own, and is cut where the page said its box cuts. At
+ * the border box, which the widget's own frame is drawn in. A text field is
+ * left out: it cuts its own text, and a sheet that gives every `<textarea>`
+ * `overflow: auto`, as normalize.css does, asks for nothing here.
+ */
+function clipsItself(box: Box): boolean {
+  if (box.replaced === 'input' || box.replaced === 'textarea') return false;
+  return box.style.overflowX !== 'visible' || box.style.overflowY !== 'visible';
+}
+
+/** A box's border box on the pixels it is drawn on. */
+function pixelsOf(box: Box): Rect {
+  const x = Math.round(box.x);
+  const y = Math.round(box.y);
+  return {
+    x,
+    y,
+    width: Math.round(box.x + box.width) - x,
+    height: Math.round(box.y + box.height) - y,
+  };
+}
+
+/** What two rectangles share, of no area where they share nothing. */
+export function between(a: Rect, b: Rect): Rect {
+  const x = Math.max(a.x, b.x);
+  const y = Math.max(a.y, b.y);
+  return {
+    x,
+    y,
+    width: Math.max(0, Math.min(a.x + a.width, b.x + b.width) - x),
+    height: Math.max(0, Math.min(a.y + a.height, b.y + b.height) - y),
+  };
+}
+
+/** Whether a clip leaves a rectangle whole. */
+function covers(clip: Rect, rect: Rect): boolean {
+  return (
+    clip.x <= rect.x &&
+    clip.y <= rect.y &&
+    clip.x + clip.width >= rect.x + rect.width &&
+    clip.y + clip.height >= rect.y + rect.height
+  );
+}
+
 /**
  * Whether a field's box is the author's to draw: one given a border or a
  * background of its own, which the UA sheet gives no control, or set to
@@ -261,9 +362,11 @@ export function buttonLabel(el: Element): string {
     const trimmed = text.trim();
     if (trimmed) return trimmed;
   }
+  const type = (attr(el, 'type') ?? '').trim().toLowerCase();
+  // an image button with no image yet says what the image would have
+  if (type === 'image') return attr(el, 'alt') || attr(el, 'value') || 'Submit';
   const value = attr(el, 'value');
   if (value) return value;
-  const type = (attr(el, 'type') ?? '').toLowerCase();
   if (type === 'submit') return 'Submit';
   if (type === 'reset') return 'Reset';
   return attr(el, 'alt') ?? 'Button';
@@ -271,57 +374,17 @@ export function buttonLabel(el: Element): string {
 
 /** A `<select>`'s options, as the widget's item list. */
 export function optionsOf(el: Element): { value: string; label: string }[] {
-  const out: { value: string; label: string }[] = [];
-  const walk = (node: Element): void => {
-    for (const child of node.children) {
-      if (child.type !== 'tag') continue;
-      const tag = tagOf(child);
-      if (tag === 'option') {
-        let label = '';
-        for (const kid of child.children) {
-          if (kid.type === 'text') label += kid.data;
-        }
-        const trimmed = label.trim();
-        out.push({ value: attr(child, 'value') ?? trimmed, label: trimmed });
-      } else if (tag === 'optgroup') {
-        walk(child);
-      }
-    }
-  };
-  walk(el);
-  return out;
+  return optionElements(el).map((option) => ({
+    value: optionValue(option),
+    label: optionLabel(option),
+  }));
 }
 
-/** Which option a `<select>` starts on: `selected`, else the first. */
+/** Which option a `<select>` shows: the one it has selected, which is the
+ *  first where none is marked (`selectedOptions`). */
 export function selectedOption(el: Element): string | null {
-  const options = optionsOf(el);
-  const walk = (node: Element): string | null => {
-    for (const child of node.children) {
-      if (child.type !== 'tag') continue;
-      if (tagOf(child) === 'option' && attr(child, 'selected') !== undefined) {
-        let label = '';
-        for (const kid of child.children) {
-          if (kid.type === 'text') label += kid.data;
-        }
-        return attr(child, 'value') ?? label.trim();
-      }
-      const nested = walk(child);
-      if (nested !== null) return nested;
-    }
-    return null;
-  };
-  return walk(el) ?? options[0]?.value ?? null;
-}
-
-/** A `<textarea>`'s initial text — its content, not an attribute. */
-export function textareaValue(el: Element): string {
-  let text = '';
-  for (const child of el.children) {
-    if (child.type === 'text') text += child.data;
-  }
-  // HTML drops one leading newline after the open tag, which is why a
-  // pretty-printed `<textarea>` does not start with a blank line.
-  return text.replace(/^\r?\n/, '');
+  const [option] = selectedOptions(el);
+  return option ? optionValue(option) : null;
 }
 
 function numberAttr(el: Element, name: string): number | null {