@effect-tui/react 0.15.2 → 2.0.0

package/dist/src/hosts/box.js

@@ -26,7 +26,7 @@ export class BoxHost extends SingleChildHost {
         const titleHeight = this.titleDivider && this.title && this.border !== "none" ? 2 : 0; // title row + divider
         return this.borderThickness + titleHeight + this.padding.top + this.padding.bottom + this.borderThickness;
     }
-    measure(maxW, maxH) {
+    measureSelf(maxW, maxH) {
         // Apply frame constraints first
         const constrained = this.constrainProposal(maxW, maxH);
         const innerMaxW = Math.max(0, constrained.w - this.insetX);
@@ -47,7 +47,7 @@ export class BoxHost extends SingleChildHost {
         // Apply frame constraints to result
         return this.constrainResult(naturalSize);
     }
-    layout(rect) {
+    layoutSelf(rect) {
         const layoutRect = this.layoutWithConstraints(rect);
         const t = this.borderThickness;
         // When titleDivider: title row (1) + divider line (1) = 2
@@ -120,6 +120,14 @@ export class BoxHost extends SingleChildHost {
     }
     updateProps(props) {
         super.updateProps(props);
+        const prevPadding = this.padding;
+        const prevBorder = this.border;
+        const prevBorderColor = this.borderColor;
+        const prevBg = this.bg;
+        const prevTitle = this.title;
+        const prevTitleColor = this.titleColor;
+        const prevTitleBold = this.titleBold;
+        const prevTitleDivider = this.titleDivider;
         this.padding = resolvePadding(props.padding);
         this.border = props.border ?? "none";
         // Color props support MotionValue/ColorMotionValue - auto-subscribe and animate
@@ -135,6 +143,25 @@ export class BoxHost extends SingleChildHost {
         });
         this.titleBold = Boolean(props.titleBold);
         this.titleDivider = Boolean(props.titleDivider);
+        const paddingChanged = prevPadding.top !== this.padding.top ||
+            prevPadding.right !== this.padding.right ||
+            prevPadding.bottom !== this.padding.bottom ||
+            prevPadding.left !== this.padding.left;
+        const layoutChanged = paddingChanged ||
+            prevBorder !== this.border ||
+            prevTitle !== this.title ||
+            prevTitleDivider !== this.titleDivider;
+        if (layoutChanged) {
+            this.invalidateLayout();
+            return;
+        }
+        const renderChanged = prevBorderColor !== this.borderColor ||
+            prevBg !== this.bg ||
+            prevTitleColor !== this.titleColor ||
+            prevTitleBold !== this.titleBold;
+        if (renderChanged) {
+            this.invalidateRender();
+        }
     }
 }
 //# sourceMappingURL=box.js.map

package/dist/src/hosts/box.js.map

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

package/dist/src/hosts/canvas.d.ts

@@ -1,13 +1,22 @@
 import type { CellBuffer, Color, Palette } from "@effect-tui/core";
 import type { CommonProps, HostContext, Size } from "../reconciler/types.js";
 import { type BorderKind } from "../utils/index.js";
-import { BaseHost } from "./base.js";
+import { LeafHost } from "./leaf.js";
 export type { BorderKind };
 export interface DrawContext {
     /** Canvas width in cells */
     width: number;
     /** Canvas height in cells */
     height: number;
+    /** Resolve a style id for reuse across many draw calls */
+    style(opts?: {
+        fg?: Color;
+        bg?: Color;
+        bold?: boolean;
+        italic?: boolean;
+        underline?: boolean;
+        inverse?: boolean;
+    }): number;
     /** Draw text at position */
     text(x: number, y: number, str: string, opts?: {
         fg?: Color;
@@ -18,7 +27,7 @@ export interface DrawContext {
         inverse?: boolean;
     }): void;
     /** Fill rectangle with character */
-    fill(x: number, y: number, w: number, h: number, char?: string, opts?: {
+    fillRect(x: number, y: number, w: number, h: number, char?: string, opts?: {
         fg?: Color;
         bg?: Color;
         bold?: boolean;
@@ -35,6 +44,17 @@ export interface DrawContext {
     }): void;
     /** Clear entire canvas */
     clear(): void;
+    /** Draw a single cell with a codepoint */
+    cell(x: number, y: number, cp: number, style?: number, width?: number): void;
+    /** Draw many single-cell codepoints efficiently */
+    cells(cells: Array<CanvasCell>): void;
+}
+export interface CanvasCell {
+    x: number;
+    y: number;
+    cp: number;
+    style?: number;
+    width?: number;
 }
 export interface CanvasProps extends CommonProps {
     /** Draw function called each render */
@@ -46,13 +66,13 @@ export interface CanvasProps extends CommonProps {
     /** Inherit background color from parent and pre-fill canvas (default: false) */
     inheritBg?: boolean;
 }
-export declare class CanvasHost extends BaseHost {
+export declare class CanvasHost extends LeafHost {
     draw: CanvasProps["draw"];
     fixedWidth?: number;
     fixedHeight?: number;
     inheritBg: boolean;
     constructor(props: CanvasProps, ctx: HostContext);
-    measure(maxW: number, maxH: number): Size;
+    protected measureSelf(maxW: number, maxH: number): Size;
     render(buffer: CellBuffer, palette: Palette): void;
     updateProps(props: Record<string, unknown>): void;
 }

package/dist/src/hosts/canvas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../../src/hosts/canvas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAElE,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EACN,KAAK,UAAU,EAOf,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,YAAY,EAAE,UAAU,EAAE,CAAA;AAE1B,MAAM,WAAW,WAAW;IAC3B,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,6BAA6B;IAC7B,MAAM,EAAE,MAAM,CAAA;IAEd,4BAA4B;IAC5B,IAAI,CACH,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,KAAK,CAAC;QAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GACzG,IAAI,CAAA;IAEP,oCAAoC;IACpC,IAAI,CACH,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,KAAK,CAAC;QAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GACzG,IAAI,CAAA;IAEP,oCAAoC;IACpC,GAAG,CACF,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,MAAM,EACT,IAAI,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,UAAU,CAAA;QACnB,WAAW,CAAC,EAAE,KAAK,CAAA;QACnB,EAAE,CAAC,EAAE,KAAK,CAAA;QACV,EAAE,CAAC,EAAE,KAAK,CAAA;KACV,GACC,IAAI,CAAA;IAEP,0BAA0B;IAC1B,KAAK,IAAI,IAAI,CAAA;CACb;AAED,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC/C,uCAAuC;IACvC,IAAI,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,IAAI,CAAA;IAChC,4CAA4C;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,gFAAgF;IAChF,SAAS,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,qBAAa,UAAW,SAAQ,QAAQ;IACvC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAW;IACpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,SAAS,UAAQ;gBAEL,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,WAAW;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IASzC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAyGzC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CAU1D"}
+{"version":3,"file":"canvas.d.ts","sourceRoot":"","sources":["../../../src/hosts/canvas.ts"],"names":[],"mappings":"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"}

package/dist/src/hosts/canvas.js

@@ -1,7 +1,8 @@
-import { Colors } from "@effect-tui/core";
-import { borderChars, drawBorder, resolveBgStyle, resolveInheritedBgStyle, styleIdFromProps, toColorValue, } from "../utils/index.js";
-import { BaseHost } from "./base.js";
-export class CanvasHost extends BaseHost {
+import { Colors, displayWidth } from "@effect-tui/core";
+import * as Prof from "../profiler.js";
+import { borderChars, drawBorder, fillRectWithInheritedBg, resolveBgStyle, styleIdFromProps, toColorValue, } from "../utils/index.js";
+import { LeafHost } from "./leaf.js";
+export class CanvasHost extends LeafHost {
     draw = () => { };
     fixedWidth;
     fixedHeight;
@@ -10,7 +11,7 @@ export class CanvasHost extends BaseHost {
         super("canvas", props, ctx);
         this.updateProps(props);
     }
-    measure(maxW, maxH) {
+    measureSelf(maxW, maxH) {
         const constrained = this.constrainProposal(maxW, maxH);
         const size = {
             w: this.fixedWidth ?? constrained.w,
@@ -22,23 +23,33 @@ export class CanvasHost extends BaseHost {
         if (!this.rect)
             return;
         const { x: ox, y: oy, w, h } = this.rect;
-        // Get inherited background for use in drawing functions
-        const { value: inheritedBgValue, styleId: inheritedBgStyleId } = this.inheritBg
-            ? resolveInheritedBgStyle(palette, undefined, this.parent)
-            : { value: undefined, styleId: 0 };
         // Pre-fill with inherited background if requested
-        if (this.inheritBg && inheritedBgValue !== undefined) {
-            buffer.fillRect(ox, oy, w, h, " ".codePointAt(0), inheritedBgStyleId);
-        }
+        const inheritedBgValue = this.inheritBg
+            ? fillRectWithInheritedBg(buffer, palette, { x: ox, y: oy, w, h }, undefined, this.parent, {
+                skipWhenUndefined: true,
+            }).value
+            : undefined;
         // Create draw context
         const ctx = {
             width: w,
             height: h,
+            style: (opts) => {
+                const effectiveBg = opts?.bg ?? (this.inheritBg ? inheritedBgValue : undefined);
+                return styleIdFromProps(palette, {
+                    fg: opts?.fg,
+                    bg: effectiveBg,
+                    bold: opts?.bold,
+                    italic: opts?.italic,
+                    underline: opts?.underline,
+                    inverse: opts?.inverse,
+                });
+            },
             text: (x, y, str, opts) => {
                 const px = Math.round(ox + x);
                 const py = Math.round(oy + y);
                 // Use inherited bg when inheritBg is enabled and no explicit bg provided
                 const effectiveBg = opts?.bg ?? (this.inheritBg ? inheritedBgValue : undefined);
+                const styleT = Prof.startPhase();
                 const style = styleIdFromProps(palette, {
                     fg: opts?.fg,
                     bg: effectiveBg,
@@ -47,20 +58,42 @@ export class CanvasHost extends BaseHost {
                     underline: opts?.underline,
                     inverse: opts?.inverse,
                 });
-                let col = px;
-                for (const char of str) {
-                    if (col >= ox + w)
-                        break;
-                    buffer.drawCP(col, py, char.codePointAt(0), style);
-                    col++;
+                Prof.endPhase("canvas.text.style", styleT);
+                const widthT = Prof.startPhase();
+                let textWidth = 0;
+                let asciiCp = null;
+                if (str.length === 1) {
+                    const code = str.charCodeAt(0);
+                    if (code >= 0x20 && code <= 0x7e) {
+                        textWidth = 1;
+                        asciiCp = code;
+                    }
+                    else {
+                        textWidth = displayWidth(str);
+                    }
+                }
+                else {
+                    textWidth = displayWidth(str);
+                }
+                Prof.endPhase("canvas.text.width", widthT);
+                if (textWidth > 0) {
+                    const drawT = Prof.startPhase();
+                    if (asciiCp !== null) {
+                        buffer.drawCP(px, py, asciiCp, style, 1);
+                    }
+                    else {
+                        buffer.drawText(px, py, str, style, textWidth);
+                    }
+                    Prof.endPhase("canvas.text.draw", drawT);
                 }
             },
-            fill: (x, y, fw, fh, char = " ", opts) => {
+            fillRect: (x, y, fw, fh, char = " ", opts) => {
                 const px = Math.round(ox + x);
                 const py = Math.round(oy + y);
-                const cp = char.codePointAt(0);
+                const cp = char.length > 0 ? char.codePointAt(0) : " ".codePointAt(0);
                 // Use inherited bg when inheritBg is enabled and no explicit bg provided
                 const effectiveBg = opts?.bg ?? (this.inheritBg ? inheritedBgValue : undefined);
+                const styleT = Prof.startPhase();
                 const style = styleIdFromProps(palette, {
                     fg: opts?.fg,
                     bg: effectiveBg,
@@ -69,56 +102,80 @@ export class CanvasHost extends BaseHost {
                     underline: opts?.underline,
                     inverse: opts?.inverse,
                 });
-                for (let row = 0; row < fh; row++) {
-                    const yy = py + row;
-                    for (let col = 0; col < fw; col++) {
-                        const xx = px + col;
-                        buffer.drawCP(xx, yy, cp, style);
-                    }
-                }
+                Prof.endPhase("canvas.fillRect.style", styleT);
+                const fillW = Math.ceil(fw);
+                const fillH = Math.ceil(fh);
+                const drawT = Prof.startPhase();
+                buffer.fillRect(px, py, fillW, fillH, cp, style);
+                Prof.endPhase("canvas.fillRect.draw", drawT);
             },
             box: (x, y, bw, bh, opts) => {
                 const px = Math.round(ox + x);
                 const py = Math.round(oy + y);
+                const boxW = Math.ceil(bw);
+                const boxH = Math.ceil(bh);
                 const border = opts?.border ?? "none";
+                const bgStyleT = Prof.startPhase();
                 const { value: bgValue, styleId: bgStyleId } = resolveBgStyle(palette, opts?.bg);
+                Prof.endPhase("canvas.box.bg.style", bgStyleT);
                 // Fill background (with clipping)
                 if (bgValue !== undefined) {
-                    for (let row = 0; row < bh; row++) {
-                        const yy = py + row;
-                        for (let col = 0; col < bw; col++) {
-                            const xx = px + col;
-                            buffer.drawCP(xx, yy, " ".codePointAt(0), bgStyleId);
-                        }
-                    }
+                    const bgDrawT = Prof.startPhase();
+                    buffer.fillRect(px, py, boxW, boxH, " ".codePointAt(0), bgStyleId);
+                    Prof.endPhase("canvas.box.bg.draw", bgDrawT);
                 }
                 // Draw border (with clipping)
-                if (border !== "none" && bw >= 2 && bh >= 2) {
+                if (border !== "none" && boxW >= 2 && boxH >= 2) {
+                    const borderStyleT = Prof.startPhase();
                     const chars = borderChars(border);
                     const borderFg = toColorValue(opts?.borderColor) ?? toColorValue(opts?.fg) ?? Colors.ansi.gray(8);
                     const borderStyle = palette.id({ fg: borderFg });
-                    drawBorder(buffer, px, py, bw, bh, chars, borderStyle, { ox, oy, w, h });
+                    Prof.endPhase("canvas.box.border.style", borderStyleT);
+                    const borderDrawT = Prof.startPhase();
+                    drawBorder(buffer, px, py, boxW, boxH, chars, borderStyle, { ox, oy, w, h });
+                    Prof.endPhase("canvas.box.border.draw", borderDrawT);
                 }
             },
             clear: () => {
+                const clearT = Prof.startPhase();
                 const style = palette.id({});
-                for (let row = 0; row < h; row++) {
-                    for (let col = 0; col < w; col++) {
-                        buffer.drawCP(ox + col, oy + row, " ".codePointAt(0), style);
-                    }
+                buffer.fillRect(ox, oy, w, h, " ".codePointAt(0), style);
+                Prof.endPhase("canvas.clear", clearT);
+            },
+            cell: (x, y, cp, style = 0, width) => {
+                const px = Math.round(ox + x);
+                const py = Math.round(oy + y);
+                const drawT = Prof.startPhase();
+                buffer.drawCP(px, py, cp, style, width);
+                Prof.endPhase("canvas.cell.draw", drawT);
+            },
+            cells: (cells) => {
+                const drawT = Prof.startPhase();
+                const baseX = ox;
+                const baseY = oy;
+                for (const cell of cells) {
+                    const px = Math.round(baseX + cell.x);
+                    const py = Math.round(baseY + cell.y);
+                    buffer.drawCP(px, py, cell.cp, cell.style ?? 0, cell.width);
                 }
+                Prof.endPhase("canvas.cells.draw", drawT);
             },
         };
         buffer.withClip(ox, oy, w, h, () => {
             // Call user's draw function within the canvas clip region
+            const drawT = Prof.startPhase();
             this.draw(ctx);
+            Prof.endPhase("canvas.draw", drawT);
         });
     }
     updateProps(props) {
         super.updateProps(props);
+        const prevDraw = this.draw;
+        const prevWidth = this.fixedWidth;
+        const prevHeight = this.fixedHeight;
+        const prevInheritBg = this.inheritBg;
         if (props.draw !== undefined) {
             this.draw = props.draw;
-            this.ctx.requestRender(); // trigger repaint when draw function changes
         }
         if (props.width !== undefined)
             this.fixedWidth = props.width;
@@ -126,6 +183,15 @@ export class CanvasHost extends BaseHost {
             this.fixedHeight = props.height;
         if (props.inheritBg !== undefined)
             this.inheritBg = props.inheritBg;
+        const layoutChanged = prevWidth !== this.fixedWidth || prevHeight !== this.fixedHeight;
+        if (layoutChanged) {
+            this.invalidateLayout();
+            return;
+        }
+        const renderChanged = prevDraw !== this.draw || prevInheritBg !== this.inheritBg;
+        if (renderChanged) {
+            this.invalidateRender();
+        }
     }
 }
 //# sourceMappingURL=canvas.js.map

package/dist/src/hosts/canvas.js.map

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

package/dist/src/hosts/codeblock.d.ts

@@ -2,33 +2,31 @@ import { type CellBuffer, type Color, type Palette } from "@effect-tui/core";
 import type { HighlightLine } from "../highlight.js";
 import type { CommonProps, HostContext, Size } from "../reconciler/types.js";
 import { type Padding, type PaddingInput } from "../utils/index.js";
-import { BaseHost } from "./base.js";
+import { LeafHost } from "./leaf.js";
 export interface CodeBlockProps extends CommonProps {
     lines: HighlightLine[];
     lineNumbers?: boolean;
     padding?: PaddingInput;
-    background?: Color;
-    lineNumberColor?: Color;
-    lineNumberBackground?: Color;
+    bg?: Color;
+    lineNumberFg?: Color;
+    lineNumberBg?: Color;
 }
-export declare class CodeBlockHost extends BaseHost {
+export declare class CodeBlockHost extends LeafHost {
     lines: HighlightLine[];
     lineNumbers: boolean;
     padding: Padding;
-    background?: Color;
-    lineNumberColor?: Color;
-    lineNumberBackground?: Color;
+    bg?: Color;
+    lineNumberFg?: Color;
+    lineNumberBg?: Color;
     private cachedLineWidths;
     private gutterWidth;
-    private prepared;
     constructor(props: CodeBlockProps, ctx: HostContext);
     private computeGutterWidth;
     private get insetX();
     private get insetY();
     private prepareMetrics;
-    private ensurePrepared;
-    protected prepareSelf(): void;
-    measure(maxW: number, maxH: number): Size;
+    protected prepareSelf(_layoutDirty: boolean, _renderDirty: boolean): void;
+    protected measureSelf(maxW: number, maxH: number): Size;
     render(buffer: CellBuffer, palette: Palette): void;
     updateProps(props: Record<string, unknown>): void;
 }

package/dist/src/hosts/codeblock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codeblock.d.ts","sourceRoot":"","sources":["../../../src/hosts/codeblock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAwB,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAoD,MAAM,mBAAmB,CAAA;AACrH,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,WAAW,cAAe,SAAQ,WAAW;IAClD,KAAK,EAAE,aAAa,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,eAAe,CAAC,EAAE,KAAK,CAAA;IACvB,oBAAoB,CAAC,EAAE,KAAK,CAAA;CAC5B;AAMD,qBAAa,aAAc,SAAQ,QAAQ;IAC1C,KAAK,EAAE,aAAa,EAAE,CAAO;IAC7B,WAAW,UAAQ;IACnB,OAAO,EAAE,OAAO,CAA2C;IAC3D,UAAU,CAAC,EAAE,KAAK,CAAA;IAClB,eAAe,CAAC,EAAE,KAAK,CAAA;IACvB,oBAAoB,CAAC,EAAE,KAAK,CAAA;IAE5B,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAI;IACvB,OAAO,CAAC,QAAQ,CAAQ;gBAEZ,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,WAAW;IAKnD,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,cAAc;cAKH,WAAW,IAAI,IAAI;IAItC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAezC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAiDzC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CAiB1D"}
+{"version":3,"file":"codeblock.d.ts","sourceRoot":"","sources":["../../../src/hosts/codeblock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,KAAK,EAAwB,KAAK,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC5E,OAAO,EACN,KAAK,OAAO,EACZ,KAAK,YAAY,EAKjB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,MAAM,WAAW,cAAe,SAAQ,WAAW;IAClD,KAAK,EAAE,aAAa,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,OAAO,CAAC,EAAE,YAAY,CAAA;IACtB,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,YAAY,CAAC,EAAE,KAAK,CAAA;CACpB;AAED,qBAAa,aAAc,SAAQ,QAAQ;IAC1C,KAAK,EAAE,aAAa,EAAE,CAAO;IAC7B,WAAW,UAAQ;IACnB,OAAO,EAAE,OAAO,CAA2C;IAC3D,EAAE,CAAC,EAAE,KAAK,CAAA;IACV,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,YAAY,CAAC,EAAE,KAAK,CAAA;IAEpB,OAAO,CAAC,gBAAgB,CAAe;IACvC,OAAO,CAAC,WAAW,CAAI;gBAEX,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,WAAW;IAKnD,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,KAAK,MAAM,GAEjB;IAED,OAAO,CAAC,cAAc;cAKH,WAAW,CAAC,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,GAAG,IAAI;IAIlF,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAevD,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAiDzC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CAkC1D"}

package/dist/src/hosts/codeblock.js

@@ -1,19 +1,15 @@
 import { Colors, displayWidth } from "@effect-tui/core";
-import { resolveBgStyle, resolvePadding, styleIdFromProps } from "../utils/index.js";
-import { BaseHost } from "./base.js";
-function lineDisplayWidth(line) {
-    return line.reduce((w, token) => w + displayWidth(token.text), 0);
-}
-export class CodeBlockHost extends BaseHost {
+import { resolveBgStyle, resolvePadding, spansDisplayWidth, styleIdFromProps, } from "../utils/index.js";
+import { LeafHost } from "./leaf.js";
+export class CodeBlockHost extends LeafHost {
     lines = [[]];
     lineNumbers = false;
     padding = { top: 0, right: 0, bottom: 0, left: 0 };
-    background;
-    lineNumberColor;
-    lineNumberBackground;
+    bg;
+    lineNumberFg;
+    lineNumberBg;
     cachedLineWidths = [];
     gutterWidth = 0;
-    prepared = false;
     constructor(props, ctx) {
         super("codeblock", props, ctx);
         this.updateProps(props);
@@ -33,19 +29,13 @@ export class CodeBlockHost extends BaseHost {
         return this.padding.top + this.padding.bottom;
     }
     prepareMetrics() {
-        this.cachedLineWidths = this.lines.map((line) => lineDisplayWidth(line));
+        this.cachedLineWidths = this.lines.map((line) => spansDisplayWidth(line));
         this.gutterWidth = this.computeGutterWidth();
-        this.prepared = true;
     }
-    ensurePrepared() {
-        if (this.prepared)
-            return;
+    prepareSelf(_layoutDirty, _renderDirty) {
         this.prepareMetrics();
     }
-    prepareSelf() {
-        this.ensurePrepared();
-    }
-    measure(maxW, maxH) {
+    measureSelf(maxW, maxH) {
         const constrained = this.constrainProposal(maxW, maxH);
         this.ensurePrepared();
         const maxLineW = this.cachedLineWidths.reduce((max, w) => (w > max ? w : max), 0);
@@ -64,7 +54,7 @@ export class CodeBlockHost extends BaseHost {
         const maxLines = Math.max(0, Math.min(this.lines.length, h - this.insetY));
         const startX = x + this.padding.left + this.gutterWidth;
         const startY = y + this.padding.top;
-        const { value: bgValue, styleId: bgStyleId } = resolveBgStyle(palette, this.background);
+        const { value: bgValue, styleId: bgStyleId } = resolveBgStyle(palette, this.bg);
         if (bgValue !== undefined && w > 0 && h > 0) {
             buffer.fillRect(x, y, w, h, " ".codePointAt(0), bgStyleId);
         }
@@ -73,8 +63,8 @@ export class CodeBlockHost extends BaseHost {
             let drawX = startX;
             if (this.lineNumbers) {
                 const gutterStyle = styleIdFromProps(palette, {
-                    fg: this.lineNumberColor ?? Colors.ansi.gray(11),
-                    bg: this.lineNumberBackground ?? this.background,
+                    fg: this.lineNumberFg ?? Colors.ansi.gray(11),
+                    bg: this.lineNumberBg ?? this.bg,
                 });
                 const digits = String(i + 1).padStart(this.gutterWidth - 1, " ");
                 buffer.drawText(x + this.padding.left, lineY, `${digits} `, gutterStyle, this.gutterWidth);
@@ -89,7 +79,7 @@ export class CodeBlockHost extends BaseHost {
                 const style = token.style ?? {};
                 const styleId = styleIdFromProps(palette, {
                     fg: style.fg,
-                    bg: style.bg ?? this.background,
+                    bg: style.bg ?? this.bg,
                     bold: style.bold,
                     italic: style.italic,
                     underline: style.underline,
@@ -103,25 +93,38 @@ export class CodeBlockHost extends BaseHost {
     }
     updateProps(props) {
         super.updateProps(props);
-        let invalidate = false;
+        let layoutChanged = false;
+        let renderChanged = false;
         if (props.lines !== undefined) {
             this.lines = props.lines;
-            invalidate = true;
+            layoutChanged = true;
         }
         if (props.lineNumbers !== undefined) {
             this.lineNumbers = !!props.lineNumbers;
-            invalidate = true;
+            layoutChanged = true;
         }
-        if (props.padding !== undefined)
+        if (props.padding !== undefined) {
             this.padding = resolvePadding(props.padding);
-        if (props.background !== undefined)
-            this.background = props.background;
-        if (props.lineNumberColor !== undefined)
-            this.lineNumberColor = props.lineNumberColor;
-        if (props.lineNumberBackground !== undefined)
-            this.lineNumberBackground = props.lineNumberBackground;
-        if (invalidate)
-            this.prepared = false;
+            layoutChanged = true;
+        }
+        if (props.bg !== undefined) {
+            this.bg = props.bg;
+            renderChanged = true;
+        }
+        if (props.lineNumberFg !== undefined) {
+            this.lineNumberFg = props.lineNumberFg;
+            renderChanged = true;
+        }
+        if (props.lineNumberBg !== undefined) {
+            this.lineNumberBg = props.lineNumberBg;
+            renderChanged = true;
+        }
+        if (layoutChanged) {
+            this.invalidateLayout();
+        }
+        else if (renderChanged) {
+            this.invalidateRender();
+        }
     }
 }
 //# sourceMappingURL=codeblock.js.map