@ashx-j/lunr-tui 0.2.12 → 0.2.13-dev.2.1

package/dist/tui.js

@@ -9,7 +9,7 @@ import { isKeyRelease, matchesKey } from "./keys.js";
 import { MOUSE_TRACKING_DISABLE, MOUSE_TRACKING_ENABLE, parseMouseEvent } from "./mouse.js";
 import { isOsc11BackgroundColorResponse, parseOsc11BackgroundColor, parseTerminalColorSchemeReport, } from "./terminal-colors.js";
 import { deleteKittyImage, getCapabilities, isImageLine, setCellDimensions } from "./terminal-image.js";
-import { extractSegments, normalizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils.js";
+import { extractSegments, normalizeTerminalOutput, sanitizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth, } from "./utils.js";
 const KITTY_SEQUENCE_PREFIX = "\x1b_G";
 function parseKittyImageHeader(line) {
     const sequenceStart = line.indexOf(KITTY_SEQUENCE_PREFIX);
@@ -77,29 +77,57 @@ function isTermuxSession() {
  */
 export class Container {
     children = [];
+    revision = 0;
+    parents = new Set();
     addChild(component) {
         this.children.push(component);
+        if (component instanceof Container)
+            component.parents.add(this);
+        this.markDirty();
     }
     removeChild(component) {
         const index = this.children.indexOf(component);
         if (index !== -1) {
             this.children.splice(index, 1);
+            if (component instanceof Container && !this.children.includes(component))
+                component.parents.delete(this);
+            this.markDirty();
         }
     }
     clear() {
+        for (const child of this.children) {
+            if (child instanceof Container)
+                child.parents.delete(this);
+        }
         this.children = [];
+        this.markDirty();
     }
     invalidate() {
+        this.markDirty();
         for (const child of this.children) {
             child.invalidate?.();
         }
     }
+    getRenderRevision() {
+        return this.revision;
+    }
+    syncChildParents() {
+        for (const child of this.children) {
+            if (child instanceof Container)
+                child.parents.add(this);
+        }
+    }
+    markDirty() {
+        this.revision++;
+        for (const parent of this.parents)
+            parent.markDirty();
+    }
     render(width) {
         const lines = [];
         for (const child of this.children) {
             const childLines = child.render(width);
             for (const line of childLines) {
-                lines.push(line);
+                lines.push(sanitizeTerminalOutput(line, isImageLine(line)));
             }
         }
         return lines;
@@ -162,8 +190,6 @@ export class TUI extends Container {
     lastChatScrollMax = 0;
     chatLaidOut = false;
     chatUsesGutter = false;
-    /** Bumped on non-scroll `requestRender` so offset-only paints can reuse chat layout. */
-    contentEpoch = 0;
     chatLayoutCache;
     alternateScreen = false;
     alternateScreenActive = false;
@@ -181,6 +207,11 @@ export class TUI extends Container {
             this.showHardwareCursor = showHardwareCursor;
         }
     }
+    markDirty() {
+        super.markDirty();
+        if (this.started)
+            this.queueRender(false);
+    }
     get fullRedraws() {
         return this.fullRedrawCount;
     }
@@ -403,6 +434,23 @@ export class TUI extends Container {
             return -1;
         return this.children.indexOf(this.pinComponent);
     }
+    captureChatComponentState(to) {
+        return this.children.slice(0, to).map((component) => ({
+            component,
+            revision: component instanceof Container ? component.getRenderRevision() : 0,
+            childCount: component instanceof Container ? component.children.length : undefined,
+            firstChild: component instanceof Container ? component.children[0] : undefined,
+            lastChild: component instanceof Container ? component.children[component.children.length - 1] : undefined,
+        }));
+    }
+    chatComponentStateMatches(cached, current) {
+        return (cached.length === current.length &&
+            cached.every((state, index) => state.component === current[index]?.component &&
+                state.revision === current[index]?.revision &&
+                state.childCount === current[index]?.childCount &&
+                state.firstChild === current[index]?.firstChild &&
+                state.lastChild === current[index]?.lastChild));
+    }
     collectChildLines(from, to, width, ranges) {
         const lines = [];
         for (let i = from; i < to; i++) {
@@ -423,7 +471,7 @@ export class TUI extends Container {
         }
         const start = lines.length;
         for (const line of child.render(width)) {
-            lines.push(line);
+            lines.push(sanitizeTerminalOutput(line, isImageLine(line)));
         }
         ranges?.push({ component: child, start, end: lines.length });
     }
@@ -465,17 +513,25 @@ export class TUI extends Container {
         const viewH = Math.max(minView, rows - dockLines.length);
         this.lastChatViewportHeight = viewH;
         this.chatLaidOut = true;
-        let chatWidth = this.chatUsesGutter ? Math.max(1, width - 1) : width;
+        const canUseGutter = width >= 2;
+        if (!canUseGutter)
+            this.chatUsesGutter = false;
+        let chatWidth = this.chatUsesGutter ? width - 1 : width;
         let scrollLines;
         let ranges;
         let fromCache = false;
         const cache = this.chatLayoutCache;
-        if (cache && cache.epoch === this.contentEpoch && cache.chatWidth === chatWidth) {
+        const componentState = this.captureChatComponentState(pinIndex);
+        if (cache && cache.chatWidth === chatWidth && this.chatComponentStateMatches(cache.components, componentState)) {
             scrollLines = cache.scrollLines;
             ranges = cache.ranges;
             fromCache = true;
         }
         else {
+            for (const state of componentState) {
+                if (state.component instanceof Container)
+                    state.component.syncChildParents();
+            }
             ranges = [];
             scrollLines = this.collectChildLines(0, pinIndex, chatWidth, ranges);
         }
@@ -488,17 +544,17 @@ export class TUI extends Container {
                 fromCache = false;
             }
         }
-        else if (scrollLines.length > viewH) {
+        else if (canUseGutter && scrollLines.length > viewH) {
             this.chatUsesGutter = true;
-            chatWidth = Math.max(1, width - 1);
+            chatWidth = width - 1;
             ranges = [];
             scrollLines = this.collectChildLines(0, pinIndex, chatWidth, ranges);
             fromCache = false;
         }
         if (!fromCache) {
             this.chatLayoutCache = {
-                epoch: this.contentEpoch,
                 chatWidth,
+                components: this.captureChatComponentState(pinIndex),
                 scrollLines,
                 ranges,
             };
@@ -518,7 +574,8 @@ export class TUI extends Container {
             this.lastChatScrollMax = scrollLines.length - viewH;
             this.chatScrollOffset = Math.max(0, Math.min(this.chatScrollOffset, this.lastChatScrollMax));
             start = scrollLines.length - viewH - this.chatScrollOffset;
-            start = this.snapStartToKittyImageHeader(scrollLines, start);
+            if (this.chatScrollOffset > 0)
+                start = this.snapStartToKittyImageHeader(scrollLines, start);
             start = Math.max(0, start);
             this.lastChatStart = start;
             chatSlice = scrollLines.slice(start, start + viewH);
@@ -530,26 +587,34 @@ export class TUI extends Container {
             const thumbTop = this.lastChatScrollMax === 0
                 ? viewH - thumbH
                 : Math.round(travel * (1 - this.chatScrollOffset / this.lastChatScrollMax));
-            this.chatScrollbar = {
-                x: width,
-                y0: 1,
-                y1: viewH,
-                viewH,
-                scrollMax: this.lastChatScrollMax,
-                thumbTop,
-                thumbH,
-            };
-            // Reset SGR so error/thinking colors cannot bleed into the gutter.
-            const RESET = "\x1b[0m";
-            const track = `${RESET}\x1b[2m│\x1b[0m`;
-            const thumb = `${RESET}\x1b[1m█\x1b[0m`;
-            for (let i = 0; i < chatSlice.length; i++) {
-                const glyph = i >= thumbTop && i < thumbTop + thumbH ? thumb : track;
-                chatSlice[i] = `${padToWidth(chatSlice[i] ?? "", chatWidth)}${glyph}`;
+            if (this.chatUsesGutter) {
+                this.chatScrollbar = {
+                    x: width,
+                    y0: 1,
+                    y1: viewH,
+                    viewH,
+                    scrollMax: this.lastChatScrollMax,
+                    thumbTop,
+                    thumbH,
+                };
+                const RESET = "\x1b[0m";
+                const track = `${RESET}\x1b[2m│\x1b[0m`;
+                const thumb = `${RESET}\x1b[1m█\x1b[0m`;
+                for (let i = 0; i < chatSlice.length; i++) {
+                    const glyph = i >= thumbTop && i < thumbTop + thumbH ? thumb : track;
+                    chatSlice[i] = `${padToWidth(chatSlice[i] ?? "", chatWidth)}${glyph}`;
+                }
+            }
+            else {
+                this.chatScrollbar = undefined;
+                this.scrollbarDrag = undefined;
             }
         }
         this.lastChatSliceHeight = chatSlice.length;
-        return [...chatSlice, ...dockLines];
+        const frame = [...chatSlice, ...dockLines];
+        if (width > 1)
+            return frame;
+        return frame.map((line) => (visibleWidth(line) > width ? sliceByColumn(line, 0, width, true) : line));
     }
     /**
      * Show an overlay component with configurable positioning and sizing.
@@ -779,9 +844,12 @@ export class TUI extends Container {
         this.terminal.stop();
     }
     requestRender(force = false) {
-        this.contentEpoch++;
+        this.chatLayoutCache = undefined;
         this.queueRender(force);
     }
+    requestPaint() {
+        this.queueRender(false);
+    }
     requestRenderFromScroll() {
         this.queueRender(false);
     }
@@ -1267,7 +1335,7 @@ export class TUI extends Container {
         for (let i = 0; i < lines.length; i++) {
             const line = lines[i];
             if (!isImageLine(line)) {
-                lines[i] = normalizeTerminalOutput(line) + reset;
+                lines[i] = normalizeTerminalOutput(sanitizeTerminalOutput(line)) + reset;
             }
         }
         return lines;