react-x11 2.22.4 → 2.22.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-x11",
-  "version": "2.22.4",
+  "version": "2.22.5",
   "description": "react renderer with X11 as a target",
   "main": "./src/index.js",
   "files": [

package/src/nodes/layout.js

@@ -5,6 +5,7 @@
 import { Yoga } from '../yoga.js';
 import { callHandler } from '../errors.js';
 import { DAMAGE_SLOP, layoutDiff } from './damage.js';
+import { resolveBorderWidths } from '../styles.js';
 import { insetRect, intersectRects, outerPixels, outside } from './rects.js';
 import { DEV } from './util.js';
 
@@ -520,12 +521,33 @@ export class NodeLayout {
         ) {
           return;
         }
+        // …and one that rode it and only grew or shrank changed the pixels
+        // along the edges that moved — the column a virtualized document's
+        // blocks sit in, whose spacers re-slice in the scroll's own frame
+        const bands =
+          had && was.x === x && was.y === y && width > 0 && height > 0
+            ? this._edgeBands(was, grow)
+            : null;
+        if (bands) {
+          for (const band of bands) layoutDiff.sink(band, this);
+          return;
+        }
         if (had) layoutDiff.sink(insetRect(was, -grow), this);
         if (width > 0 && height > 0) {
           layoutDiff.sink(insetRect(this.abs, -grow), this);
         }
         return;
       }
+      // A box that stayed where it was and only grew or shrank changed the
+      // pixels along the edges that moved, and no others (`_edgeBands`)
+      const bands =
+        had && old.x === x && old.y === y && width > 0 && height > 0
+          ? this._edgeBands(old, grow)
+          : null;
+      if (bands) {
+        for (const band of bands) layoutDiff.sink(band, this);
+        return;
+      }
       if (had) {
         layoutDiff.sink(insetRect(old, -grow), this);
       }
@@ -535,6 +557,64 @@ export class NodeLayout {
     }
   }
 
+  /**
+   * The pixels a resize changed, for a box whose origin held: a band along
+   * each edge that moved, from where it was to where it is, as deep as the
+   * box's paint reaches in from that edge — a rounded corner, a border, a
+   * shadow's or an outline's reach. Its own paint anywhere else is the same
+   * solid fill it was, and its children claim for themselves when they move.
+   *
+   * A tall box that grows at its far end is the case: a document or a log
+   * or a virtualized list whose column gained a block far below the fold
+   * claimed the column, clipped to its scroll box — the whole viewport — on
+   * every frame it grew, for pixels that were all out of sight.
+   *
+   * Null where the whole box has to be claimed: anything that is not a
+   * plain box, one that scrolls (its bars are sized by it), one whose
+   * gradient is stretched over it, and one drawn through a group surface.
+   */
+  _edgeBands(old, grow) {
+    if (this.kind !== 'box' || this.isScroller?.()) return null;
+    const style = this.style;
+    if (style.backgroundImage) return null;
+    if (style.opacity !== undefined && style.opacity < 1) return null;
+    const bw = resolveBorderWidths(style, this.direction);
+    const reach =
+      Math.max(
+        style.borderRadius ?? 0,
+        bw.top,
+        bw.right,
+        bw.bottom,
+        bw.left,
+        grow,
+      ) + DAMAGE_SLOP;
+    const now = this.abs;
+    const bands = [];
+    const oldBottom = old.y + old.height;
+    const newBottom = now.y + now.height;
+    if (oldBottom !== newBottom) {
+      const top = Math.min(oldBottom, newBottom) - reach;
+      bands.push({
+        x: now.x - reach,
+        y: top,
+        width: Math.max(old.width, now.width) + 2 * reach,
+        height: Math.max(oldBottom, newBottom) + reach - top,
+      });
+    }
+    const oldRight = old.x + old.width;
+    const newRight = now.x + now.width;
+    if (oldRight !== newRight) {
+      const left = Math.min(oldRight, newRight) - reach;
+      bands.push({
+        x: left,
+        y: now.y - reach,
+        width: Math.max(oldRight, newRight) + reach - left,
+        height: Math.max(old.height, now.height) + 2 * reach,
+      });
+    }
+    return bands;
+  }
+
   /**
    * Move an already-laid-out subtree by a constant, without asking yoga
    * anything — the scroll fast path's walk (issue #405).

package/src/nodes/node.js

@@ -384,8 +384,10 @@ export class Node {
     // captured before the child joins, so it covers the arrangement that is
     // about to be replaced (see _childListChanged). A viewport mid-blit has
     // nothing vacating — the child being added had no pixels — and the
-    // layout diff claims where it lands, so it names no region at all.
-    const before = this._blitLedgerOpen() ? null : this._childListBefore();
+    // layout diff claims where it lands, so it names no region at all. A
+    // child already here is a move, and says so (`_childListFine`).
+    const fine = this._childListFine(child.parent !== this);
+    const before = fine ? null : this._childListBefore();
     // a move has to leave the yoga tree too — yoga aborts on insertChild of
     // a node that still has a parent
     if (child.parent === this && this._joinsYoga(child)) {
@@ -414,7 +416,7 @@ export class Node {
     // against the app's, and only now can see the `scale` props above it.
     child._rescaleSubtree(mounting);
     this._textContentChanged();
-    this._childListChanged(before);
+    this._childListChanged(before, fine);
     a11yHooks.attached?.(this, child);
   }
 
@@ -464,7 +466,7 @@ export class Node {
    * through the layout diff in flush(), which is what lets this claim stay
    * bounded without requiring the node's own size to be pinned.
    */
-  _childListChanged(before) {
+  _childListChanged(before, fine = this._childListFine(true)) {
     // belt for a subtree attached imperatively with its rect already laid
     // out — nothing then re-runs _assignAbs to notice the reach grew
     this._clearHitBounds();
@@ -477,7 +479,7 @@ export class Node {
     // and says nothing about the ones that only rode the scroll. Joining
     // `_reflowed` would undo both — its post-layout claim is this node's
     // box, the whole band the blit is about to move.
-    if (this._blitLedgerOpen()) {
+    if (fine) {
       root.invalidate(true, before ?? NO_DAMAGE, 'child-list', this);
       return;
     }
@@ -485,6 +487,39 @@ export class Node {
     root._reflowed.add(this);
   }
 
+  /**
+   * Whether a child-list change here is claimed the fine way — the child
+   * that leaves claims its own rect, and the layout diff names where an
+   * entering child lands and whatever its arrival displaced — rather than
+   * as this node's box before and after the pass.
+   *
+   * Always for a viewport keeping a ledger this frame (issue #398). And,
+   * for a child that enters or leaves (`entersOrLeaves`), for any node
+   * inside a scroll box, scrolling or not: a document's blocks, the rows
+   * of a virtualized list one box down from its scroll box, a log that
+   * grows. Such a node is usually taller than the view, and its box
+   * clipped to the viewport is the whole viewport — so every re-slice of
+   * a list inside a column, all of it below the fold, repainted the view,
+   * and one landing in a scroll's frame poisoned its blit. The diff runs
+   * over every node that pass laid out, however deep, and a node that
+   * only grew claims the edge that moved (`_edgeBands`).
+   *
+   * Not for a move: a child moved within the list keeps its rect when
+   * what changed is only which sibling it is painted over, and no rect
+   * says that. Nor for a scroll box's own children outside a ledger frame:
+   * its box is also the claim that repaints its bars, which its content
+   * sizes.
+   */
+  _childListFine(entersOrLeaves) {
+    if (this._blitLedgerOpen()) return true;
+    if (!entersOrLeaves) return false;
+    for (let n = this.parent; n; n = n.parent) {
+      if (n.isWindow) return false;
+      if (n.isScroller?.()) return true;
+    }
+    return false;
+  }
+
   removeChild(child) {
     const index = this._indexOfChild(child);
     if (index === -1) return;
@@ -494,7 +529,8 @@ export class Node {
     // captured while the child is still attached, so it covers the rect the
     // child is about to stop occupying — the child's own, for a viewport
     // mid-blit, where this node's box is the whole scrolled band
-    const before = this._blitLedgerOpen()
+    const fine = this._childListFine(true);
+    const before = fine
       ? (child._claimBounds() ?? NO_DAMAGE)
       : this._childListBefore();
     this.children.splice(index, 1);
@@ -515,7 +551,7 @@ export class Node {
       child.yoga = null;
     }
     this._textContentChanged();
-    this._childListChanged(before);
+    this._childListChanged(before, fine);
   }
 
   /** Destroy real resources (X windows) in this subtree. Yoga nodes are

package/src/nodes/scrollblit.js

@@ -855,7 +855,15 @@ export class WindowScrollBlit {
       ? unionArea([strip, ...repairs]) - rectArea(strip)
       : 0;
     if (repairArea > area * BLIT_MAX_CLAIM_AREA) return;
-    if (!this._scrollBlitSafe(node, vp, target.top)) return;
+    // An ancestor's rounded corners reach into the viewport: a scroll box
+    // filling a rounded card, the commonest place a scroll box is. Their
+    // arcs do not translate, but they live in four small squares and
+    // nowhere else, so they are pinned the way an element blit pins them
+    // (issue #691) and repaired below, where they are and where the copy
+    // dragged their image. Refused instead, a list or a document inside a
+    // rounded frame repainted its whole viewport on every step of a scroll.
+    const corners = this._cornerPins(node, vp, target.top);
+    if (!this._scrollBlitSafe(node, vp, target.top, null, corners)) return;
     // The band the scrolled bar's thumb travels in is repaired on its own.
     // The thumb's rects are thin and run along the viewport's edge, and a
     // rect reaching into the band from inside — a column held down the
@@ -932,10 +940,28 @@ export class WindowScrollBlit {
       if (dragged) add(dragged);
     }
     for (const repair of repairs) add(repair);
-    rects = joinAlongEdges(rects).reduce(
-      (capped, rect) => addDamageRect(capped, rect),
-      [],
-    );
+    // Each pinned corner where it is and where the copy put its image — one
+    // box, since a step moves it a few pixels, and less the strip, which
+    // repaints anyway.
+    for (const pin of corners ?? []) {
+      const image = { ...pin, x: pin.x + dx, y: pin.y + dy };
+      const repair = intersectRects(unionRect(pin, image), vp);
+      if (!repair) continue;
+      for (const piece of outside(repair, strip)) add(piece);
+    }
+    // Capped in one call where corners were pinned: two at each end of the
+    // viewport and the strip at one of them are more pieces than the cap
+    // holds, and squeezed under it one at a time a corner joined whatever
+    // box an earlier merge had grown — scrolling back up merged the bottom
+    // corners with the strip at the top, which is the viewport. Offered
+    // together, neighbours merge first (`addDamageRects`), with the room an
+    // element blit's pins get.
+    rects = corners
+      ? addDamageRects([], joinAlongEdges(rects), CONTENTS_BLIT_MAX_RECTS)
+      : joinAlongEdges(rects).reduce(
+          (capped, rect) => addDamageRect(capped, rect),
+          [],
+        );
     // The last gate, and the only one that has to wait until the rects are
     // assembled: damage rects must not overlap, and the frame carries at
     // most MAX_DAMAGE_RECTS of them, so repairs that meet — a column and a