@oh-my-pi/pi-tui 18.2.4 → 18.2.6

package/src/components/scroll-view.ts

@@ -1,11 +1,22 @@
 import { matchesKey } from "../keys";
 import type { Component } from "../tui";
-import { Ellipsis, replaceTabs, truncateToWidth, visibleWidth } from "../utils";
+import { Ellipsis, getWidthConfigEpoch, padding, replaceTabs, truncateToWidth, visibleWidth } from "../utils";
+import {
+	clampScrollOffset,
+	maxScrollOffset,
+	scrollbarThumbRange,
+	scrollOffsetForRow,
+	type ViewportAlignment,
+	viewportOverflows,
+	viewportRange,
+} from "./scroll-viewport";
 
 const DEFAULT_TRACK = "│";
 const DEFAULT_THUMB = "█";
+const EMPTY_LINES: readonly string[] = [];
 
 type ScrollbarMode = "auto" | "always" | "never";
+export type ScrollAnchor = "start" | "end";
 
 export interface ScrollViewTheme {
 	track?: (text: string) => string;
@@ -16,7 +27,7 @@ export interface ScrollViewOptions {
 	height: number;
 	/** Defaults to "auto". "auto" reserves a scrollbar column only when content overflows. */
 	scrollbar?: ScrollbarMode | boolean;
-	/** Logical row count for pre-windowed line slices. Defaults to lines.length. */
+	/** Logical row count for pre-windowed line slices. Defaults to the rendered content row count. */
 	totalRows?: number;
 	theme?: ScrollViewTheme;
 	trackChar?: string;
@@ -24,15 +35,48 @@ export interface ScrollViewOptions {
 	/**
 	 * Indicator appended when a row overflows `contentWidth`. Defaults to
 	 * {@link Ellipsis.Unicode}. Pass {@link Ellipsis.Omit} when callers wrap
-	 * lines to width themselves and only trailing padding can overflow (e.g.
-	 * the plan-review overlay), so no stray `…` lands on every padded row.
+	 * lines to width themselves and only trailing padding can overflow.
 	 */
 	ellipsis?: Ellipsis;
-	/**
-	 * Rows moved per keystroke when {@link ScrollView.handleScrollKey} sees a
-	 * Shift+Arrow (the "scroll faster" affordance). Defaults to 5.
-	 */
+	/** Rows moved by Shift+Arrow in {@link ScrollView.handleScrollKey}. Defaults to 5. */
 	fastScrollLines?: number;
+	/** Follow newly appended rows while the viewport was already at its tail. */
+	followTail?: boolean;
+	/** Preserve either the leading row or the distance from the tail across content/height changes. */
+	anchor?: ScrollAnchor;
+}
+
+/** A selected logical range revealed once or whenever its geometry changes. */
+export interface ScrollRangeAnchor {
+	id: string;
+	start: number;
+	end: number;
+	margin?: number;
+	alignment?: ViewportAlignment;
+	mode?: "selection" | "once";
+	/** Prefer the leading edge when the selected range fills more than the viewport. */
+	oversized?: "nearest" | "start";
+}
+
+interface RangeSnapshot {
+	anchor: Required<ScrollRangeAnchor>;
+	width: number;
+	height: number;
+	totalRows: number;
+}
+
+interface RenderCache {
+	width: number;
+	widthEpoch: number;
+	height: number;
+	scrollOffset: number;
+	rowCount: number;
+	showScrollbar: boolean;
+	trackSample: string;
+	thumbSample: string;
+	sourceLines: readonly string[];
+	sourceSnapshot: readonly string[] | undefined;
+	result: readonly string[];
 }
 
 function normalizeScrollbarMode(scrollbar: ScrollViewOptions["scrollbar"]): ScrollbarMode {
@@ -46,14 +90,26 @@ function firstCellGlyph(value: string, fallback: string): string {
 	return visibleWidth(glyph) === 1 ? glyph : fallback;
 }
 
+function normalizedRows(value: number): number {
+	return Number.isFinite(value) ? Math.max(0, Math.trunc(value)) : 0;
+}
+
+function isComponent(content: readonly string[] | Component): content is Component {
+	return !Array.isArray(content);
+}
+
 /**
- * Fixed-height viewport over pre-rendered lines, with optional right-edge scrollbar.
+ * Fixed-height viewport over supplied rows or a lazily rendered child.
  *
- * ScrollView owns only the row offset. Callers remain responsible for producing
- * already-wrapped logical lines appropriate for the current render width.
+ * Without `totalRows`, content is a complete row buffer and ScrollView slices
+ * it at its own offset. With `totalRows`, content is an already-windowed slice:
+ * the offset remains logical (for thumb and hit mapping), while local row zero
+ * is rendered from content row zero.
  */
 export class ScrollView implements Component {
-	#lines: string[];
+	#lines: readonly string[];
+	#child: Component | undefined;
+	#measuredRows: number;
 	#height: number;
 	#scrollOffset = 0;
 	#totalRows: number | undefined;
@@ -63,11 +119,20 @@ export class ScrollView implements Component {
 	#thumbChar: string;
 	#ellipsis: Ellipsis;
 	#fastScrollLines: number;
+	#followTail: boolean;
+	#anchor: ScrollAnchor;
+	#activeRow: number | undefined;
+	#activeAlignment: ViewportAlignment = "nearest";
+	#rangeSnapshot: RangeSnapshot | undefined;
+	#cache: RenderCache | undefined;
+	#disposed = false;
 
-	constructor(lines: readonly string[], options: ScrollViewOptions) {
-		this.#lines = [...lines];
-		this.#height = Number.isFinite(options.height) ? Math.max(0, Math.trunc(options.height)) : 0;
-		this.#totalRows = options.totalRows === undefined ? undefined : Math.max(0, Math.trunc(options.totalRows));
+	constructor(content: readonly string[] | Component, options: ScrollViewOptions) {
+		this.#child = isComponent(content) ? content : undefined;
+		this.#lines = isComponent(content) ? [] : content.slice();
+		this.#measuredRows = this.#lines.length;
+		this.#height = normalizedRows(options.height);
+		this.#totalRows = options.totalRows === undefined ? undefined : normalizedRows(options.totalRows);
 		this.#scrollbar = normalizeScrollbarMode(options.scrollbar);
 		this.#theme = {
 			track: options.theme?.track ?? (text => text),
@@ -77,38 +142,88 @@ export class ScrollView implements Component {
 		this.#thumbChar = firstCellGlyph(options.thumbChar ?? DEFAULT_THUMB, DEFAULT_THUMB);
 		this.#ellipsis = options.ellipsis ?? Ellipsis.Unicode;
 		this.#fastScrollLines = Math.max(1, Math.trunc(options.fastScrollLines ?? 5));
-		this.#clampScrollOffset();
+		this.#followTail = options.followTail ?? false;
+		this.#anchor = options.anchor ?? "start";
+		if (this.#followTail || this.#anchor === "end") this.#scrollOffset = this.getMaxScrollOffset();
+	}
+
+	/** Child exposed for debug-tree traversal when the viewport wraps a component. */
+	get debugChildren(): readonly Component[] {
+		return !this.#disposed && this.#child ? [this.#child] : [];
 	}
+
 	/** Return viewport, content, and scroll position state for debug inspection. */
 	debugState(): Record<string, unknown> {
-		const rowCount = this.#totalRows ?? this.#lines.length;
 		return {
 			scrollOffset: this.#scrollOffset,
 			maxScrollOffset: this.getMaxScrollOffset(),
 			height: this.#height,
-			rowCount,
-			bufferedLineCount: this.#lines.length,
+			rowCount: this.#rowCount(),
+			bufferedLineCount: this.#child ? this.#measuredRows : this.#lines.length,
 			scrollbar: this.#scrollbar,
+			followTail: this.#followTail,
+			anchor: this.#anchor,
+			activeRow: this.#activeRow,
+			disposed: this.#disposed,
 		};
 	}
 
 	setLines(lines: readonly string[]): void {
-		this.#lines = [...lines];
-		this.#clampScrollOffset();
+		if (this.#disposed) return;
+		const oldTotal = this.#rowCount();
+		const oldHeight = this.#height;
+		this.#child = undefined;
+		this.#lines = lines.slice();
+		this.#measuredRows = this.#lines.length;
+		this.#reconcileBounds(oldTotal, oldHeight);
+		this.#cache = undefined;
+	}
+
+	/** Replace the supplied rows with a lazily rendered child component. */
+	setChild(child: Component): void {
+		if (this.#disposed) {
+			child.dispose?.();
+			return;
+		}
+		if (this.#child === child) return;
+		this.#child = child;
+		this.#lines = [];
+		this.#cache = undefined;
 	}
 
 	setTotalRows(totalRows: number | undefined): void {
-		this.#totalRows = totalRows === undefined ? undefined : Math.max(0, Math.trunc(totalRows));
-		this.#clampScrollOffset();
+		const normalized = totalRows === undefined ? undefined : normalizedRows(totalRows);
+		if (this.#totalRows === normalized) return;
+		const oldTotal = this.#rowCount();
+		const oldHeight = this.#height;
+		this.#totalRows = normalized;
+		this.#reconcileBounds(oldTotal, oldHeight);
+		this.#cache = undefined;
 	}
 
 	setHeight(height: number): void {
-		this.#height = Number.isFinite(height) ? Math.max(0, Math.trunc(height)) : 0;
-		this.#clampScrollOffset();
+		const normalized = normalizedRows(height);
+		if (this.#height === normalized) return;
+		const oldTotal = this.#rowCount();
+		const oldHeight = this.#height;
+		this.#height = normalized;
+		this.#reconcileBounds(oldTotal, oldHeight);
+		this.#cache = undefined;
 	}
 
 	setScrollbar(scrollbar: ScrollViewOptions["scrollbar"]): void {
-		this.#scrollbar = normalizeScrollbarMode(scrollbar);
+		const normalized = normalizeScrollbarMode(scrollbar);
+		if (this.#scrollbar === normalized) return;
+		this.#scrollbar = normalized;
+		this.#cache = undefined;
+	}
+
+	setFollowTail(followTail: boolean): void {
+		this.#followTail = followTail;
+	}
+
+	setAnchor(anchor: ScrollAnchor): void {
+		this.#anchor = anchor;
 	}
 
 	getScrollOffset(): number {
@@ -116,13 +231,116 @@ export class ScrollView implements Component {
 	}
 
 	getMaxScrollOffset(): number {
-		const rowCount = this.#totalRows ?? this.#lines.length;
-		return Math.max(0, rowCount - this.#height);
+		return maxScrollOffset(this.#rowCount(), this.#height);
+	}
+
+	/** Current half-open logical row range. */
+	getVisibleRange(): { start: number; end: number } {
+		return viewportRange(this.#rowCount(), this.#height, this.#scrollOffset);
+	}
+
+	/** Map a local viewport row to its logical content row. */
+	logicalRowAt(localRow: number): number | undefined {
+		if (!Number.isFinite(localRow)) return undefined;
+		const local = Math.trunc(localRow);
+		const range = this.getVisibleRange();
+		const logical = range.start + local;
+		return local >= 0 && logical < range.end ? logical : undefined;
+	}
+
+	/** Map a visible logical content row to its local viewport row. */
+	localRowFor(logicalRow: number): number | undefined {
+		if (!Number.isFinite(logicalRow)) return undefined;
+		const logical = Math.trunc(logicalRow);
+		const range = this.getVisibleRange();
+		return logical >= range.start && logical < range.end ? logical - range.start : undefined;
 	}
 
 	setScrollOffset(offset: number): void {
-		this.#scrollOffset = Number.isFinite(offset) ? Math.trunc(offset) : 0;
-		this.#clampScrollOffset();
+		const next = clampScrollOffset(offset, this.#rowCount(), this.#height);
+		if (this.#scrollOffset === next) return;
+		this.#scrollOffset = next;
+		this.#cache = undefined;
+	}
+
+	/** Keep a logical row visible now and through subsequent resize/content changes. */
+	setActiveRow(row: number | undefined, alignment: ViewportAlignment = "nearest"): void {
+		this.#activeRow = row === undefined ? undefined : normalizedRows(row);
+		this.#activeAlignment = alignment;
+		if (this.#activeRow !== undefined) {
+			this.setScrollOffset(
+				scrollOffsetForRow(
+					this.#scrollOffset,
+					this.#activeRow,
+					this.#rowCount(),
+					this.#height,
+					this.#activeAlignment,
+				),
+			);
+		}
+	}
+
+	/** Whether a keyed range has already been revealed successfully. */
+	hasRevealedRange(id: string): boolean {
+		return this.#rangeSnapshot?.anchor.id === id;
+	}
+
+	/**
+	 * Reveal a changed selection without snapping manual scrolling back on
+	 * unchanged renders. Passing undefined forgets the previous range.
+	 */
+	revealRange(anchor: ScrollRangeAnchor | undefined, width: number): boolean {
+		if (!anchor) {
+			this.#rangeSnapshot = undefined;
+			return false;
+		}
+		if (
+			this.#disposed ||
+			!Number.isFinite(anchor.start) ||
+			!Number.isFinite(anchor.end) ||
+			anchor.start < 0 ||
+			anchor.end <= anchor.start
+		) {
+			return false;
+		}
+		const mode = anchor.mode ?? "selection";
+		const alignment = anchor.alignment ?? "nearest";
+		const margin = normalizedRows(anchor.margin ?? 1);
+		const oversized = anchor.oversized ?? "nearest";
+		const totalRows = this.#rowCount();
+		const previous = this.#rangeSnapshot;
+		if (
+			previous?.anchor.id === anchor.id &&
+			previous.anchor.mode === mode &&
+			previous.anchor.alignment === alignment &&
+			previous.anchor.margin === margin &&
+			previous.anchor.oversized === oversized &&
+			(mode === "once" ||
+				(previous.anchor.start === anchor.start &&
+					previous.anchor.end === anchor.end &&
+					previous.width === width &&
+					previous.height === this.#height &&
+					previous.totalRows === totalRows))
+		)
+			return false;
+
+		const top = Math.max(0, Math.trunc(anchor.start) - margin);
+		const bottom = Math.min(totalRows, Math.trunc(anchor.end) + margin);
+		const visible = this.getVisibleRange();
+		if (alignment === "start") this.setActiveRow(top, "start");
+		else if (alignment === "end") this.setActiveRow(Math.max(top, bottom - 1), "end");
+		else if (alignment === "center") this.setActiveRow(Math.floor((anchor.start + anchor.end - 1) / 2), "center");
+		else if (top < visible.start || (oversized === "start" && bottom - top >= this.#height))
+			this.setActiveRow(top, "start");
+		else if (bottom > visible.end) this.setActiveRow(Math.max(top, bottom - 1), "end");
+		this.setActiveRow(undefined);
+		this.#rangeSnapshot = {
+			anchor: { ...anchor, mode, alignment, margin, oversized },
+			width,
+			height: this.#height,
+			totalRows,
+		};
+		return true;
 	}
 
 	scroll(delta: number): void {
@@ -135,21 +353,14 @@ export class ScrollView implements Component {
 	}
 
 	scrollToTop(): void {
-		this.#scrollOffset = 0;
+		this.setScrollOffset(0);
 	}
 
 	scrollToBottom(): void {
-		this.#scrollOffset = this.getMaxScrollOffset();
+		this.setScrollOffset(this.getMaxScrollOffset());
 	}
 
-	/**
-	 * Apply a standard navigation key to the viewport. Shift+Arrow scrolls by
-	 * {@link ScrollViewOptions.fastScrollLines} (the "scroll faster" affordance);
-	 * plain Arrow by one line; PageUp/PageDown by a page; Home/End to the ends.
-	 * Returns true when the key was consumed, so callers can fall through to
-	 * their own (e.g. vim-style) bindings. Generic on purpose: every ScrollView
-	 * consumer gets the same scroll keys, including Shift-to-go-faster.
-	 */
+	/** Apply Arrow, Shift+Arrow, Page, Home, and End navigation keys. */
 	handleScrollKey(data: string): boolean {
 		if (matchesKey(data, "shift+up")) {
 			this.scroll(-this.#fastScrollLines);
@@ -187,53 +398,144 @@ export class ScrollView implements Component {
 	}
 
 	invalidate(): void {
-		// No cached layout to invalidate.
+		if (this.#disposed) return;
+		this.#cache = undefined;
+		this.#child?.invalidate?.();
+	}
+
+	/** Permanently release a wrapped child's timers, subscriptions, and other resources. */
+	dispose(): void {
+		if (this.#disposed) return;
+		this.#disposed = true;
+		this.#cache = undefined;
+		this.#lines = EMPTY_LINES;
+		this.#measuredRows = 0;
+		const child = this.#child;
+		this.#child = undefined;
+		child?.dispose?.();
 	}
 
 	render(width: number): readonly string[] {
-		this.#clampScrollOffset();
-		const safeWidth = Number.isFinite(width) ? Math.max(0, Math.trunc(width)) : 0;
-		if (this.#height === 0) return [];
-		const showScrollbar = safeWidth > 0 && this.#shouldRenderScrollbar();
+		if (this.#disposed) return EMPTY_LINES;
+		const safeWidth = normalizedRows(width);
+		if (this.#height === 0) return EMPTY_LINES;
+
+		let sourceLines: readonly string[];
+		let showScrollbar: boolean;
+		if (this.#child) {
+			const knownRows = this.#totalRows;
+			if (knownRows !== undefined || this.#scrollbar !== "auto") {
+				showScrollbar = this.#shouldRenderScrollbar(knownRows ?? this.#measuredRows, safeWidth);
+				sourceLines = this.#child.render(Math.max(0, safeWidth - (showScrollbar ? 1 : 0)));
+			} else {
+				sourceLines = this.#child.render(safeWidth);
+				showScrollbar = this.#shouldRenderScrollbar(sourceLines.length, safeWidth);
+				if (showScrollbar) sourceLines = this.#child.render(Math.max(0, safeWidth - 1));
+			}
+			this.#updateMeasuredRows(sourceLines.length);
+			showScrollbar = this.#shouldRenderScrollbar(this.#rowCount(), safeWidth);
+		} else {
+			sourceLines = this.#lines;
+			showScrollbar = this.#shouldRenderScrollbar(this.#rowCount(), safeWidth);
+		}
+
+		this.#scrollOffset = clampScrollOffset(this.#scrollOffset, this.#rowCount(), this.#height);
+		const rowCount = this.#rowCount();
 		const contentWidth = Math.max(0, safeWidth - (showScrollbar ? 1 : 0));
-		const thumb = showScrollbar ? this.#thumbRange() : undefined;
+		const thumb = showScrollbar ? scrollbarThumbRange(this.#height, rowCount, this.#scrollOffset) : undefined;
+		const trackSample = this.#theme.track(this.#trackChar);
+		const thumbSample = this.#theme.thumb(this.#thumbChar);
+		const widthEpoch = getWidthConfigEpoch();
+		const cached = this.#cache;
+		if (
+			cached !== undefined &&
+			cached.width === safeWidth &&
+			cached.widthEpoch === widthEpoch &&
+			cached.height === this.#height &&
+			cached.scrollOffset === this.#scrollOffset &&
+			cached.rowCount === rowCount &&
+			cached.showScrollbar === showScrollbar &&
+			cached.trackSample === trackSample &&
+			cached.thumbSample === thumbSample &&
+			(this.#child
+				? cached.sourceSnapshot !== undefined &&
+					cached.sourceSnapshot.length === sourceLines.length &&
+					sourceLines.every((line, index) => cached.sourceSnapshot?.[index] === line)
+				: cached.sourceLines === sourceLines)
+		) {
+			return cached.result;
+		}
+
 		const lines: string[] = [];
 		for (let row = 0; row < this.#height; row++) {
 			const sourceIndex = this.#totalRows === undefined ? this.#scrollOffset + row : row;
-			const source = this.#lines[sourceIndex] ?? "";
+			const source = sourceLines[sourceIndex] ?? "";
 			const truncated = truncateToWidth(replaceTabs(source), contentWidth, this.#ellipsis);
 			if (!showScrollbar) {
 				lines.push(truncated);
 				continue;
 			}
-			const content = `${truncated}${" ".repeat(Math.max(0, contentWidth - visibleWidth(truncated)))}`;
-			const barGlyph = thumb && row >= thumb.start && row < thumb.end ? this.#thumbChar : this.#trackChar;
-			const styledBar =
-				thumb && row >= thumb.start && row < thumb.end ? this.#theme.thumb(barGlyph) : this.#theme.track(barGlyph);
-			lines.push(`${content}${styledBar}`);
+			const content = `${truncated}${padding(Math.max(0, contentWidth - visibleWidth(truncated)))}`;
+			lines.push(`${content}${thumb && row >= thumb.start && row < thumb.end ? thumbSample : trackSample}`);
 		}
+
+		this.#cache = {
+			width: safeWidth,
+			widthEpoch: getWidthConfigEpoch(),
+			height: this.#height,
+			scrollOffset: this.#scrollOffset,
+			rowCount,
+			showScrollbar,
+			trackSample,
+			thumbSample,
+			sourceLines,
+			sourceSnapshot: this.#child ? sourceLines.slice() : undefined,
+			result: lines,
+		};
 		return lines;
 	}
 
-	#clampScrollOffset(): void {
-		this.#scrollOffset = Math.max(0, Math.min(this.#scrollOffset, this.getMaxScrollOffset()));
+	#rowCount(): number {
+		return this.#totalRows ?? this.#measuredRows;
+	}
+
+	#updateMeasuredRows(measuredRows: number): void {
+		const normalized = normalizedRows(measuredRows);
+		if (this.#measuredRows === normalized) return;
+		const oldTotal = this.#rowCount();
+		const oldHeight = this.#height;
+		this.#measuredRows = normalized;
+		this.#reconcileBounds(oldTotal, oldHeight);
+		this.#cache = undefined;
+	}
+
+	#reconcileBounds(oldTotal: number, oldHeight: number): void {
+		const newTotal = this.#rowCount();
+		if (this.#activeRow !== undefined) {
+			this.#scrollOffset = scrollOffsetForRow(
+				this.#scrollOffset,
+				this.#activeRow,
+				newTotal,
+				this.#height,
+				this.#activeAlignment,
+			);
+			return;
+		}
+
+		const wasAtTail = this.#scrollOffset >= maxScrollOffset(oldTotal, oldHeight);
+		if (this.#anchor === "end") {
+			const trailingRows = Math.max(0, oldTotal - (this.#scrollOffset + oldHeight));
+			this.#scrollOffset = clampScrollOffset(newTotal - this.#height - trailingRows, newTotal, this.#height);
+		} else if (this.#followTail && wasAtTail) {
+			this.#scrollOffset = maxScrollOffset(newTotal, this.#height);
+		} else {
+			this.#scrollOffset = clampScrollOffset(this.#scrollOffset, newTotal, this.#height);
+		}
 	}
 
-	#shouldRenderScrollbar(): boolean {
-		if (this.#height <= 0) return false;
-		if (this.#scrollbar === "never") return false;
+	#shouldRenderScrollbar(rowCount: number, width: number): boolean {
+		if (this.#height <= 0 || width <= 0 || this.#scrollbar === "never") return false;
 		if (this.#scrollbar === "always") return true;
-		return (this.#totalRows ?? this.#lines.length) > this.#height;
-	}
-
-	#thumbRange(): { start: number; end: number } {
-		if (this.#height <= 0) return { start: 0, end: 0 };
-		const rowCount = this.#totalRows ?? this.#lines.length;
-		if (rowCount <= this.#height) return { start: 0, end: this.#height };
-		const thumbSize = Math.max(1, Math.min(Math.floor((this.#height * this.#height) / rowCount), this.#height));
-		const travel = this.#height - thumbSize;
-		const maxOffset = this.getMaxScrollOffset();
-		const start = maxOffset === 0 ? 0 : Math.round((this.#scrollOffset / maxOffset) * travel);
-		return { start, end: start + thumbSize };
+		return viewportOverflows(rowCount, this.#height);
 	}
 }