@react-x11/components 0.2.0 → 0.3.0

package/dist/tree/index.js

@@ -36,7 +36,9 @@ import { hx } from './hx.js';
 // Shared with <Table> — internal, deliberately not a shared *module*; the
 // header of src/internal/heights.ts says why.
 import { RowHeights } from '../internal/heights.js';
-import { afterLayout, cancelAfterLayout } from '../internal/timers.js';
+import { afterLayout, cancelAfterLayout, cancelLater, later, } from '../internal/timers.js';
+import { useReveal } from '../internal/scroll.js';
+import { BURST_BUDGET, DEFAULT_OVERSCAN, DEFAULT_PREFETCH, SCROLL_HINT_DELAY_MS, SKELETON_THRESHOLD, SETTLE_BUDGET, useVirtualWindow, } from '../internal/window.js';
 import { typeAheadChar, useTypeAhead } from './internal.js';
 import { branchEdges, findItem, groupRows, isGroup, resolveAccessors, visibleRows, } from './rows.js';
 export { branchEdges, findItem, resolveAccessors, visibleRows, } from './rows.js';
@@ -49,16 +51,6 @@ const TWISTY = 12;
  *  is half of that, so `size` for one reads as its width. */
 const TWISTY_GLYPH = 10;
 const ROW_HEIGHT = 22;
-/** Rows kept either side of the viewport, so a fast scroll does not show a
- *  gap before the next frame catches up. */
-const OVERSCAN = 6;
-/**
- * What to build before the viewport has been measured. `onViewport` cannot
- * arrive until layout has run, which is a frame after the first commit, so
- * there is always one render that has to guess — and guessing "all of them"
- * puts a hundred thousand rows in the tree for a frame.
- */
-const ASSUMED_ROWS = 40;
 /**
  * Where `virtual="auto"` starts virtualizing.
  *
@@ -109,6 +101,39 @@ const s = createStyles({
     },
     subtree: { flexShrink: 0 },
     spacer: { flexShrink: 0 },
+    /** The bar inside a skeleton row — a line of "text" with no text, so a
+     *  band of placeholders reads as rows arriving rather than a void. */
+    skeletonBar: {
+        height: 8,
+        borderRadius: 4,
+        alignSelf: 'center',
+        flexShrink: 0,
+    },
+    /** The box the scroll pane and the fast-scroll pill share — it exists so
+     *  the pill can float *outside* the pane, where a scroll cannot move it. */
+    outer: { flexGrow: 1, minHeight: 0 },
+    /** The lane the fast-scroll pill floats in: absolute against the outer
+     *  box so the pane scrolls under it, full-width so the pill centres
+     *  itself, and transparent to the pointer so the rows beneath stay
+     *  clickable. */
+    scrollHintLane: {
+        position: 'absolute',
+        left: 0,
+        right: 0,
+        bottom: 12,
+        flexDirection: 'row',
+        justifyContent: 'center',
+        pointerEvents: 'none',
+    },
+    scrollHint: {
+        paddingStart: 10,
+        paddingEnd: 10,
+        paddingTop: 5,
+        paddingBottom: 5,
+        borderRadius: 12,
+        flexDirection: 'row',
+        alignItems: 'center',
+    },
 });
 /** A string or a number becomes a `<text>`; anything else is already a
  *  node. */
@@ -117,6 +142,144 @@ function labelNode(label, style) {
         ? hx('text', { key: 'label', style }, String(label))
         : label;
 }
+function TreeRowView(props) {
+    const { row, isSelected, indent, rowHeight, rtl, theme, renderToggle, renderGuide, renderLabel, renderContent, rowStyle, guideStyle, toggleStyle, labelStyle, getLabel, onToggle, onGo, onOpen, register, } = props;
+    const color = row.disabled
+        ? theme.textMuted
+        : isSelected
+            ? theme.hoverText
+            : theme.text;
+    const state = {
+        ...row,
+        selected: isSelected,
+        color,
+        toggle: (open) => onToggle(row.id, row.item, open),
+        select: () => onGo(row),
+    };
+    const content = [];
+    // The indent. With no guide seam it is one padding value rather than
+    // `depth` empty boxes — a tree ten deep would otherwise build ten nodes
+    // per row to draw nothing.
+    if (renderGuide && row.depth > 0) {
+        const edges = branchEdges(row);
+        for (let level = 0; level < row.depth; level++) {
+            const guide = {
+                row: state,
+                level,
+                continues: edges[level],
+                own: level === row.depth - 1,
+                width: indent,
+                height: rowHeight,
+            };
+            content.push(hx('box', {
+                key: `guide${level}`,
+                style: [
+                    s.guide,
+                    { width: indent },
+                    typeof guideStyle === 'function' ? guideStyle(guide) : guideStyle,
+                ],
+            }, renderGuide(guide)));
+        }
+    }
+    const toggleState = { ...state, size: TWISTY_GLYPH };
+    content.push(hx('box', {
+        key: 'toggle',
+        style: [s.twisty, toggleStyle],
+        // The twisty is its own hit target: clicking it opens the branch
+        // without moving the selection, the way a file browser lets you
+        // peek inside a folder you have not chosen.
+        onClick: row.branch
+            ? (ev) => {
+                ev.stopPropagation();
+                onToggle(row.id, row.item);
+            }
+            : undefined,
+    }, renderToggle
+        ? renderToggle(toggleState)
+        : row.branch
+            ? React.createElement(Icon, {
+                name: row.open
+                    ? 'chevronDown'
+                    : rtl
+                        ? 'chevronLeft'
+                        : 'chevronRight',
+                size: TWISTY_GLYPH,
+                // dimmer than the label on a resting row, and the row's own
+                // ink once it is selected
+                style: isSelected ? undefined : { color: theme.textMuted },
+            })
+            : null));
+    content.push(renderLabel
+        ? // Keyed here rather than by the app, for the reason `renderSubtree`
+            // is: the label sits in an array beside the guides and the twisty,
+            // and "add a key to the box you return" is not something a render
+            // prop should have to know.
+            React.createElement(React.Fragment, { key: 'label' }, renderLabel(state))
+        : labelNode(getLabel(row.item), [s.label, labelStyle]));
+    return hx('box', {
+        role: 'treeitem',
+        'aria-level': row.depth + 1,
+        'aria-selected': isSelected,
+        'aria-expanded': row.branch ? row.open : undefined,
+        'aria-posinset': row.posInSet,
+        'aria-setsize': row.setSize,
+        // `disabled` rather than `aria-disabled`: on a react-x11 node it is
+        // the real thing — it clears the AT-SPI ENABLED/SENSITIVE states and
+        // selects the `:disabled` style block — and there is no aria spelling
+        // of it to write instead.
+        disabled: row.disabled || undefined,
+        // The index the row was drawn at travels with the node, so measuring
+        // does not have to search a hundred thousand rows for where it is.
+        // It can go stale — the rows may move before the tick that measures —
+        // and both this and the height index check it rather than trust it.
+        ref: (node) => {
+            register(row.id, row.index, node);
+        },
+        onClick: (ev) => {
+            if (row.disabled)
+                return;
+            onGo(row);
+            // Select on the first click, open on the second — the gesture every
+            // file list has. `detail` is the click count the renderer already
+            // counts for text selection.
+            if (ev.detail === 2)
+                onOpen(row);
+        },
+        style: [
+            s.row,
+            // A floor, not a height. The row grows to whatever its content
+            // needs — a wrapped label, two lines, a thumbnail — and the height
+            // index reads back what it actually became.
+            { minHeight: rowHeight },
+            // The indent is what says "inside", so it is measured from the edge
+            // the row's label begins at.
+            { paddingStart: renderGuide ? 4 : 4 + row.depth * indent },
+            {
+                backgroundColor: isSelected ? theme.hoverBackground : 'transparent',
+                // The row's ink, said once: `color` inherits, so the label takes
+                // it without being handed it.
+                color,
+            },
+            !row.disabled && {
+                ':hover': {
+                    backgroundColor: isSelected
+                        ? theme.hoverBackground
+                        : theme.surfaceHover,
+                },
+                // The selection only moves on the release, and `:active` marks
+                // the whole press chain, so a press on the label or the twisty
+                // still darkens the row it is in.
+                ':active': {
+                    backgroundColor: isSelected
+                        ? theme.accentActive
+                        : theme.surfaceActive,
+                },
+            },
+            typeof rowStyle === 'function' ? rowStyle(state) : rowStyle,
+        ],
+    }, renderContent ? renderContent(state, content) : content);
+}
+const MemoTreeRow = React.memo(TreeRowView);
 /**
  * `<Tree items />` — a disclosure tree.
  *
@@ -150,17 +313,17 @@ function labelNode(label, style) {
  * such policy is expressible on top of what is here: hold the set yourself,
  * pass `selected` for the cursor, and paint the rest from `styles.row`.
  */
-export function Tree({ items = [], expanded, defaultExpanded, onExpandedChange, selected, defaultSelected, onSelect, onActivate, indent = INDENT, rowHeight = ROW_HEIGHT, estimatedRowHeight, virtual = 'auto', overscan = OVERSCAN, layout = 'flat', renderToggle, renderGuide, renderLabel, renderContent, renderSubtree, styles, style, ref, 
+export function Tree({ items = [], expanded, defaultExpanded, onExpandedChange, selected, defaultSelected, onSelect, onActivate, indent = INDENT, rowHeight = ROW_HEIGHT, estimatedRowHeight, virtual = 'auto', overscan = DEFAULT_OVERSCAN, prefetch = DEFAULT_PREFETCH, layout = 'flat', renderToggle, renderGuide, renderLabel, renderContent, renderSubtree, renderScrollHint, scrollHintDelay = SCROLL_HINT_DELAY_MS, catchup, styles, style, ref, 
 // the accessors, pulled out so the rest can be spread onto the box
 getId, getLabel, getText, getChildren, isBranch, isDisabled, 
 // ours to chain rather than to hand over: virtualization is measured
 // through both of these
 onScroll, onViewport, ...boxProps }) {
+    globalThis.__renders = (globalThis.__renders ?? 0) + 1;
     const theme = useTheme();
     const rtl = useDirection() === 'rtl';
     const [ownExpanded, setOwnExpanded] = useState(() => new Set(defaultExpanded));
     const [ownSelected, setOwnSelected] = useState(defaultSelected ?? null);
-    const [view, setView] = useState({ top: 0, height: 0 });
     // Bumped by a measurement pass that found a row taller or shorter than the
     // index believed. It is the only reason the component re-renders for a
     // measurement, and a pass that finds nothing new does not bump it, which is
@@ -199,8 +362,6 @@ onScroll, onViewport, ...boxProps }) {
     rowsRef.current = rows;
     const itemsRef = useRef(items);
     itemsRef.current = items;
-    const viewRef = useRef(view);
-    viewRef.current = view;
     const virtualizing = layout === 'flat' &&
         (virtual === true ||
             (virtual === 'auto' && rows.length > VIRTUAL_THRESHOLD));
@@ -209,28 +370,27 @@ onScroll, onViewport, ...boxProps }) {
     // on every render that did not change the tree.
     const index = heights;
     index.sync(rows, estimate);
-    // The slice worth building: what is on screen, plus a little either side.
-    // Which rows those are is a question for the height index now — with rows
-    // of different heights there is no division that answers it.
-    const first = virtualizing
-        ? Math.max(0, index.indexAt(view.top) - overscan)
-        : 0;
-    let last = rows.length;
-    if (virtualizing) {
-        if (view.height > 0) {
-            last = Math.min(rows.length, index.indexAt(view.top + view.height) + 1 + overscan);
-        }
-        else {
-            // Before the first layout there is no viewport to measure against, and
-            // guessing "all of them" would put a hundred thousand rows in the tree
-            // for a frame.
-            last = Math.min(rows.length, first + ASSUMED_ROWS);
-        }
-    }
-    /** Where the slice starts, and how much of the list is below it — the two
-     *  spacers that keep the scrollbar measuring the whole tree. */
-    const above = virtualizing ? index.offsetAt(first) : 0;
-    const below = virtualizing ? index.total() - index.offsetAt(last) : 0;
+    /** The viewport, and the slice worth building from it — the machinery
+     *  shared with `<Table>` (`../internal/window.ts`). */
+    const win = useVirtualWindow({
+        box: scroller,
+        heights,
+        rows,
+        // tree rows are always measured, so the idle band above the viewport
+        // only re-builds territory already visited — see `exact` on the inputs
+        exact: false,
+        virtualizing,
+        overscan,
+        prefetch,
+        threshold: catchup?.threshold ?? SKELETON_THRESHOLD,
+        burstBudget: catchup?.burst ?? BURST_BUDGET,
+        settleBudget: catchup?.settle ?? SETTLE_BUDGET,
+    });
+    const { view, viewRef } = win;
+    /** Whether the fast-scroll pill is up — kept across renders so it does not
+     *  flicker through a catch-up, only appearing and disappearing once. */
+    const hintShown = useRef(false);
+    const { first, last, above, below } = win.slice;
     const setExpandedSet = useCallback((next, change) => {
         openRef.current = next;
         if (expanded === undefined)
@@ -247,34 +407,30 @@ onScroll, onViewport, ...boxProps }) {
         setExpandedSet(next, { id, item, open: shouldOpen });
     }, [setExpandedSet]);
     /**
-     * Put a row in view.
-     *
-     * A mounted row can say where it is, and `scrollIntoView` then works
-     * whatever height it turned out to be — which is what a tree that is *not*
-     * virtualizing wants, since nothing has measured its rows. A row that is not
-     * mounted has no geometry to ask about, and while virtualizing that is the
-     * normal case, so the height index answers instead: where the row starts,
-     * and how tall it is or is estimated to be.
+     * The scroll the tree owes a row, and the pane's real offset read back
+     * after every layout — the two halves of `../internal/scroll.ts`, which
+     * says why a reveal cannot be a one-shot and why `onScroll` is not the
+     * whole story. A tree grows and shrinks under its own hands: opening a
+     * branch is a content that got taller between the ask and the layout, in
+     * exactly the way an arriving row is.
      */
-    const reveal = useCallback((at) => {
-        const box = scroller.current;
+    const reveal = useReveal({
+        box: scroller,
+        rows: rowsRef,
+        nodes: rowNodes,
+        heights,
+    });
+    /** Put a row in view, by the index its call site already has. */
+    const revealAt = useCallback((at) => {
         const row = rowsRef.current[at];
-        if (!box || !row)
-            return;
-        const drawn = rowNodes.current.get(row.id);
-        if (drawn) {
-            box.scrollIntoView(drawn.node);
-            return;
-        }
-        const top = heights.offsetAt(at);
-        const rowH = heights.heightAt(at);
-        const height = viewRef.current.height;
-        if (top < box.scrollY)
-            box.scrollTo({ y: top });
-        else if (height > 0 && top + rowH > box.scrollY + height) {
-            box.scrollTo({ y: top + rowH - height });
-        }
-    }, []);
+        if (row)
+            reveal.to(row.id);
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- `reveal` is a
+        // stable handle
+    }, [reveal]);
+    /** Re-read the offset the pane is *actually* at — the window's `sync`; see
+     *  `../internal/window.ts` for why the pane moves silently. */
+    const syncScroll = win.sync;
     /**
      * Read back what the rows on screen actually laid out at.
      *
@@ -290,7 +446,7 @@ onScroll, onViewport, ...boxProps }) {
      */
     const measureRows = useCallback(() => {
         if (!virtualizing)
-            return;
+            return false;
         const box = scroller.current;
         const rows = rowsRef.current;
         const idx = heights;
@@ -313,17 +469,84 @@ onScroll, onViewport, ...boxProps }) {
                 shift += height - was;
         }
         if (!changed)
-            return;
-        if (shift !== 0 && box) {
-            box.scrollTo({ y: Math.max(0, box.scrollY + shift) });
-        }
+            return false;
+        // A debt, not a one-shot: the pane clamps against the last layout's
+        // content height, so a shift from rows measured above the viewport can
+        // land short until the layout that admits the growth has run.
+        reveal.nudge(shift);
+        setMeasured((n) => n + 1);
+        return true;
+    }, [virtualizing]);
+    /**
+     * Let the estimate learn from the rows that have been measured — the
+     * scrollbar of a measured tree starts as a guess times the row count, and
+     * the measured mean is a far better guess for the rows not yet seen. Idle
+     * only: every unmeasured offset moves when it applies, and the anchor
+     * arithmetic keeping the screen still is `measureRows`'s.
+     */
+    const adaptEstimate = useCallback(() => {
+        if (!virtualizing)
+            return false;
+        const box = scroller.current;
+        if (!box)
+            return false;
+        const anchor = heights.indexAt(box.scrollY);
+        const before = heights.offsetAt(anchor);
+        if (!heights.adapt())
+            return false;
+        reveal.nudge(heights.offsetAt(anchor) - before);
         setMeasured((n) => n + 1);
+        return true;
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- `heights` and
+        // `reveal` are stable instances
     }, [virtualizing]);
+    /**
+     * The one tick after layout, and everything that can only be known there:
+     * what the rows measured, whether an owed scroll can go further now that
+     * the rows it was waiting for are laid out, and where the pane actually
+     * ended up. In that order — each step can move the offset the next one
+     * reads.
+     */
+    /** Whether some drawn row has no size yet — a commit can land between
+     *  frame flushes, and a measure pass over it reads zeros. */
+    const rowsPendingLayout = useCallback(() => {
+        const rows = rowsRef.current;
+        for (const [id, { node, at }] of rowNodes.current) {
+            if (rows[at]?.id === id && !(node.abs.height > 0))
+                return true;
+        }
+        return false;
+    }, []);
     useEffect(() => {
         if (!virtualizing)
             return undefined;
-        const id = afterLayout(measureRows);
-        return () => cancelAfterLayout(id);
+        let look = null;
+        let tries = 0;
+        const pass = () => {
+            globalThis.__ticks = (globalThis.__ticks ?? 0) + 1;
+            // `measureRows` first, and its answer handed on: a pass that moved the
+            // heights has not settled anything, and an owed scroll judged against
+            // the layout it is about to invalidate is not owed any less. During a
+            // flick nothing is measured at all — every correction at that speed is
+            // invalidated by the next event — and the settle tick that follows any
+            // burst is where the deferred passes catch up.
+            const moved = win.fast() ? false : measureRows();
+            const adapted = !win.scrolling() && adaptEstimate();
+            reveal.retry(moved || adapted);
+            syncScroll();
+            // A commit can land between frame flushes: its rows report zero size
+            // until the flush, this tick has already run, and nothing else would
+            // come back for them — a window that just finished growing renders
+            // nothing further, and the missed measurements would stand for good.
+            // Look again, briefly, while any drawn row is still unsized.
+            if (rowsPendingLayout() && tries++ < 8)
+                look = later(pass, 16);
+        };
+        const id = afterLayout(pass);
+        return () => {
+            cancelAfterLayout(id);
+            cancelLater(look);
+        };
     });
     const goTo = useCallback((row) => {
         if (!row)
@@ -332,8 +555,8 @@ onScroll, onViewport, ...boxProps }) {
         if (selected === undefined)
             setOwnSelected(row.id);
         onSelect?.(row.id, row.item);
-        reveal(row.index);
-    }, [selected, onSelect, reveal]);
+        revealAt(row.index);
+    }, [selected, onSelect, revealAt]);
     const activate = useCallback((row) => {
         if (row.branch)
             toggleId(row.id, row.item);
@@ -476,16 +699,100 @@ onScroll, onViewport, ...boxProps }) {
             const row = rowsRef.current.find((r) => r.id === id);
             if (!row)
                 return false;
-            reveal(row.index);
+            revealAt(row.index);
             return true;
         },
         handleKey,
         rows: () => rowsRef.current,
-    }), [goTo, toggleId, reveal, handleKey, selected, accessors]);
+    }), [goTo, toggleId, revealAt, handleKey, selected, accessors]);
     // --- rendering -----------------------------------------------------------
     const rowStyleProp = styles?.row;
     const guideStyleProp = styles?.guide;
+    // The row component's stable half — `MemoTreeRow` bails out of a
+    // re-render only if every prop kept its identity, and this one would
+    // otherwise be rebuilt per row per render.
+    const registerRow = useCallback((id, at, node) => {
+        if (node)
+            rowNodes.current.set(id, { node, at });
+        else
+            rowNodes.current.delete(id);
+    }, []);
+    /**
+     * The row *elements*, reused by identity while nothing they depend on has
+     * changed. The memo already skips re-rendering an unchanged row, but the
+     * skip still costs a `createElement` and a props compare per row per
+     * notch — the burst profile put bare `createElement` at a tenth of a
+     * flick's CPU. Handing React the identical element object instead takes
+     * the cheapest path it has: the fiber is reused with no compare at all.
+     */
+    const rowElems = useRef(new Map());
+    const rowElemDeps = useRef([]);
+    {
+        const deps = [
+            indent,
+            rowHeight,
+            rtl,
+            theme,
+            renderToggle,
+            renderGuide,
+            renderLabel,
+            renderContent,
+            rowStyleProp,
+            guideStyleProp,
+            styles?.toggle,
+            styles?.label,
+            accessors,
+            toggleId,
+            goTo,
+            activate,
+            registerRow,
+        ];
+        const prev = rowElemDeps.current;
+        if (prev.length !== deps.length || deps.some((d, at) => d !== prev[at])) {
+            rowElems.current.clear();
+            rowElemDeps.current = deps;
+        }
+    }
     const renderOneRow = (row) => {
+        const isSelected = row.id === current;
+        const cached = rowElems.current.get(row.id);
+        if (cached && cached.row === row && cached.selected === isSelected) {
+            return cached.el;
+        }
+        const el = React.createElement(MemoTreeRow, {
+            key: String(row.id),
+            row,
+            isSelected,
+            indent,
+            rowHeight,
+            rtl,
+            theme,
+            renderToggle,
+            renderGuide,
+            renderLabel,
+            renderContent,
+            rowStyle: rowStyleProp,
+            guideStyle: guideStyleProp,
+            toggleStyle: styles?.toggle,
+            labelStyle: styles?.label,
+            getLabel: accessors.getLabel,
+            onToggle: toggleId,
+            onGo: goTo,
+            onOpen: activate,
+            register: registerRow,
+        });
+        rowElems.current.set(row.id, { row, selected: isSelected, el });
+        return el;
+    };
+    /**
+     * A row the window said not to build in full yet: the box at its indexed
+     * height and none of its content — no guides, no twisty, no label — so
+     * the commit answering a flood lands frames before the full rows could.
+     * `styles.row` still applies, so row backgrounds hold. Not registered in
+     * `rowNodes`: a skeleton must not be measured into the height index, and
+     * cannot satisfy a reveal.
+     */
+    const renderSkeletonRow = (row) => {
         const isSelected = row.id === current;
         const color = row.disabled
             ? theme.textMuted
@@ -499,136 +806,35 @@ onScroll, onViewport, ...boxProps }) {
             toggle: (open) => toggleId(row.id, row.item, open),
             select: () => goTo(row),
         };
-        const content = [];
-        // The indent. With no guide seam it is one padding value rather than
-        // `depth` empty boxes — a tree ten deep would otherwise build ten nodes
-        // per row to draw nothing.
-        if (renderGuide && row.depth > 0) {
-            const edges = branchEdges(row);
-            for (let level = 0; level < row.depth; level++) {
-                const guide = {
-                    row: state,
-                    level,
-                    continues: edges[level],
-                    own: level === row.depth - 1,
-                    width: indent,
-                    height: rowHeight,
-                };
-                content.push(hx('box', {
-                    key: `guide${level}`,
-                    style: [
-                        s.guide,
-                        { width: indent },
-                        typeof guideStyleProp === 'function'
-                            ? guideStyleProp(guide)
-                            : guideStyleProp,
-                    ],
-                }, renderGuide(guide)));
-            }
-        }
-        const toggleState = { ...state, size: TWISTY_GLYPH };
-        content.push(hx('box', {
-            key: 'toggle',
-            style: [s.twisty, styles?.toggle],
-            // The twisty is its own hit target: clicking it opens the branch
-            // without moving the selection, the way a file browser lets you
-            // peek inside a folder you have not chosen.
-            onClick: row.branch
-                ? (ev) => {
-                    ev.stopPropagation();
-                    toggleId(row.id, row.item);
-                }
-                : undefined,
-        }, renderToggle
-            ? renderToggle(toggleState)
-            : row.branch
-                ? React.createElement(Icon, {
-                    name: row.open
-                        ? 'chevronDown'
-                        : rtl
-                            ? 'chevronLeft'
-                            : 'chevronRight',
-                    size: TWISTY_GLYPH,
-                    // dimmer than the label on a resting row, and the row's own
-                    // ink once it is selected
-                    style: isSelected ? undefined : { color: theme.textMuted },
-                })
-                : null));
-        content.push(renderLabel
-            ? // Keyed here rather than by the app, for the reason `renderSubtree`
-                // is: the label sits in an array beside the guides and the twisty,
-                // and "add a key to the box you return" is not something a render
-                // prop should have to know.
-                React.createElement(React.Fragment, { key: 'label' }, renderLabel(state))
-            : labelNode(accessors.getLabel(row.item), [s.label, styles?.label]));
         return hx('box', {
             key: String(row.id),
-            role: 'treeitem',
-            'aria-level': row.depth + 1,
-            'aria-selected': isSelected,
-            'aria-expanded': row.branch ? row.open : undefined,
-            'aria-posinset': row.posInSet,
-            'aria-setsize': row.setSize,
-            // `disabled` rather than `aria-disabled`: on a react-x11 node it is
-            // the real thing — it clears the AT-SPI ENABLED/SENSITIVE states and
-            // selects the `:disabled` style block — and there is no aria spelling
-            // of it to write instead.
-            disabled: row.disabled || undefined,
-            // The index the row was drawn at travels with the node, so measuring
-            // does not have to search a hundred thousand rows for where it is.
-            // It can go stale — the rows may move before the tick that measures —
-            // and both this and the height index check it rather than trust it.
-            ref: (node) => {
-                if (node)
-                    rowNodes.current.set(row.id, { node, at: row.index });
-                else
-                    rowNodes.current.delete(row.id);
-            },
-            onClick: (ev) => {
-                if (row.disabled)
-                    return;
-                goTo(row);
-                // Select on the first click, open on the second — the gesture every
-                // file list has. `detail` is the click count the renderer already
-                // counts for text selection.
-                if (ev.detail === 2)
-                    activate(row);
-            },
+            'aria-hidden': true,
             style: [
                 s.row,
-                // A floor, not a height. The row grows to whatever its content
-                // needs — a wrapped label, two lines, a thumbnail — and the height
-                // index reads back what it actually became.
-                { minHeight: rowHeight },
-                // The indent is what says "inside", so it is measured from the edge
-                // the row's label begins at.
-                { paddingStart: renderGuide ? 4 : 4 + row.depth * indent },
+                // Exactly what the index believes, so the spacers and the
+                // scrollbar agree with the rows on where everything is.
+                { height: index.heightAt(row.index) },
                 {
                     backgroundColor: isSelected ? theme.hoverBackground : 'transparent',
-                    // The row's ink, said once: `color` inherits, so the label takes
-                    // it without being handed it.
-                    color,
-                },
-                !row.disabled && {
-                    ':hover': {
-                        backgroundColor: isSelected
-                            ? theme.hoverBackground
-                            : theme.surfaceHover,
-                    },
-                    // The selection only moves on the release, and `:active` marks
-                    // the whole press chain, so a press on the label or the twisty
-                    // still darkens the row it is in.
-                    ':active': {
-                        backgroundColor: isSelected
-                            ? theme.accentActive
-                            : theme.surfaceActive,
-                    },
                 },
                 typeof rowStyleProp === 'function'
                     ? rowStyleProp(state)
                     : rowStyleProp,
             ],
-        }, renderContent ? renderContent(state, content) : content);
+        }, 
+        // A line of "text" with no text, at the row's own indent, so a band
+        // of placeholders reads as the tree arriving rather than a void.
+        hx('box', {
+            key: 'bar',
+            style: [
+                s.skeletonBar,
+                {
+                    width: 72 + ((row.index * 37) % 89),
+                    marginStart: 4 + row.depth * indent + TWISTY + 4,
+                    backgroundColor: theme.track,
+                },
+            ],
+        }));
     };
     /** `layout="nested"`: the same rows, wrapped group by group. */
     const renderGroup = (group, key) => {
@@ -663,23 +869,100 @@ onScroll, onViewport, ...boxProps }) {
                 style: [s.spacer, { height: above }],
             }));
         }
-        for (let i = first; i < last; i++)
-            body.push(renderOneRow(rows[i]));
+        for (let i = first; i < last; i++) {
+            body.push(win.skeletons.has(rows[i].id)
+                ? renderSkeletonRow(rows[i])
+                : renderOneRow(rows[i]));
+        }
         if (virtualizing && last < rows.length) {
             body.push(hx('box', {
                 key: 'spacer:after',
                 style: [s.spacer, { height: below }],
             }));
         }
+        // Rows that left the window leave the cache too, once it has grown
+        // well past the window — a scrub across a long list would otherwise
+        // hold an element for every row it passed.
+        if (rowElems.current.size > (last - first) * 3 + 64) {
+            rowElems.current.clear();
+        }
     }
-    return hx('box', {
+    /**
+     * The fast-scroll overlay — shown only while placeholders cover enough of
+     * the viewport that the user would otherwise be looking at blank rows.
+     * The half-viewport threshold keeps a near-miss quiet: a scroll the next
+     * frame will absorb is not worth announcing. Once up it stays until the
+     * view is whole again, so it does not flicker through the catch-up.
+     *
+     * A sibling of the scroll pane, never a child: everything inside the pane
+     * — absolute children included — is shifted by the scroll, so a pill in
+     * there rides away with the very flick it is meant to narrate. Outside,
+     * it is painted after the pane on every repaint frame, which is what a
+     * scrub produces (a jump past the viewport cannot take the blit fast
+     * path), so it stays put while the content flies.
+     */
+    let scrollHint = null;
+    if (virtualizing && rows.length > 0 && view.height > 0) {
+        const vFirst = index.indexAt(view.top);
+        const vLast = Math.min(rows.length - 1, index.indexAt(view.top + view.height));
+        // Two ways in: placeholders covering enough of the viewport that it
+        // would otherwise read as blank, or a scrub — the window teleporting
+        // while the burst is still in flight, where every commit chases a
+        // viewport that has already left and nothing useful can be on screen.
+        // Either way only once the catch-up has already *lasted*: a jump the
+        // next few frames absorb is not worth announcing, so the pill waits
+        // out the show-delay against the catch-up clock. Latched once
+        // triggered: `pending` bounces to zero between catch-up commits, and a
+        // pill that blinked with it would read as a glitch. It goes when the
+        // burst does.
+        const engaged = (win.pending > 0 && win.pending * 2 >= vLast - vFirst + 1) ||
+            (win.jumped && win.scrolling());
+        const lasted = win.catchupSince !== null &&
+            Date.now() - win.catchupSince >= scrollHintDelay;
+        const show = (engaged && lasted) ||
+            (hintShown.current && (win.pending > 0 || win.scrolling()));
+        hintShown.current = show;
+        if (show) {
+            const hintState = {
+                row: rows[vFirst],
+                from: vFirst + 1,
+                to: vLast + 1,
+                count: rows.length,
+                pending: win.pending,
+                since: win.catchupSince ?? Date.now(),
+            };
+            const content = renderScrollHint
+                ? renderScrollHint(hintState)
+                : hx('text', { style: { fontSize: 11, color: theme.hoverText } }, `${hintState.from.toLocaleString()} / ${hintState.count.toLocaleString()}`);
+            if (content !== null && content !== undefined && content !== false) {
+                scrollHint = hx('box', {
+                    key: 'scroll-hint',
+                    // The pill duplicates what the scrollbar already tells an
+                    // assistive technology, and it comes and goes with the
+                    // catch-up — chatter, not content.
+                    'aria-hidden': true,
+                    style: s.scrollHintLane,
+                }, hx('box', {
+                    style: [s.scrollHint, { backgroundColor: theme.hoverBackground }],
+                }, content));
+            }
+        }
+    }
+    else {
+        hintShown.current = false;
+    }
+    // The wrapper exists for the overlay: the scroll pane keeps the role, the
+    // focus, the refs and the events — everything a `<Tree>` has always put
+    // on its root — and the caller's `style` lands out here, where the
+    // tree's place in the layout is decided.
+    return hx('box', { style: [s.outer, style] }, hx('box', {
         theme,
         role: 'tree',
         // The tree takes the focus, not the row — see the doc comment.
         focusable: true,
         ...boxProps,
         ref: scroller,
-        style: [s.root, style],
+        style: s.root,
         /**
          * `preventDefault` is the load-bearing half.
          *
@@ -702,15 +985,24 @@ onScroll, onViewport, ...boxProps }) {
         // worth building — and it is also where a page key gets its distance,
         // so this is measured whether or not the tree virtualizes.
         onViewport: (ev) => {
-            setView((prev) => prev.height === ev.height ? prev : { ...prev, height: ev.height });
+            win.sized(ev.width, ev.height);
+            // The content just changed size, which is both the moment an owed
+            // scroll can reach further than the clamp let it and the moment the
+            // pane may have re-clamped its offset without saying so. It is not a
+            // moment anything can be *settled* in: this runs from layout, a tick
+            // before the pass that reads the rows it just drew back.
+            reveal.retry(virtualizing);
+            syncScroll();
             onViewport?.(ev);
         },
         onScroll: (ev) => {
-            if (virtualizing) {
-                setView((prev) => prev.top === ev.scrollY ? prev : { ...prev, top: ev.scrollY });
-            }
+            // A scroll this component did not ask for is the user taking over,
+            // and an owed reveal must not yank the tree back out from under them
+            // on the next layout.
+            reveal.heard(ev.scrollY);
+            win.scrolled(ev.scrollY);
             onScroll?.(ev);
         },
-    }, body);
+    }, body), scrollHint);
 }
 //# sourceMappingURL=index.js.map