@ashx-j/lunr-tui 0.2.7 → 0.2.8

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 { extractAnsiCode, extractSegments, normalizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth, } from "./utils.js";
+import { extractSegments, normalizeTerminalOutput, sliceByColumn, sliceWithWidth, visibleWidth } from "./utils.js";
 const KITTY_SEQUENCE_PREFIX = "\x1b_G";
 function parseKittyImageHeader(line) {
     const sequenceStart = line.indexOf(KITTY_SEQUENCE_PREFIX);
@@ -118,7 +118,7 @@ export class TUI extends Container {
     inputListeners = new Set();
     /** Global callback for debug key (Shift+Ctrl+D). Called before input is forwarded to focused component. */
     onDebug;
-    /** Called with selected user/assistant text after an in-app drag-release. */
+    /** Kept for callers; left-drag no longer selects. Shift+drag stays native terminal selection. */
     onTextSelected;
     renderRequested = false;
     renderTimer;
@@ -155,9 +155,8 @@ export class TUI extends Container {
     alternateScreenActive = false;
     mouseTrackingActive = false;
     static WHEEL_LINES = 3;
-    chatHitRegions = [];
     chatScrollbar;
-    selection;
+    scrollbarDrag;
     constructor(terminal, showHardwareCursor) {
         super();
         this.terminal = terminal;
@@ -405,13 +404,9 @@ export class TUI extends Container {
             }
             return;
         }
-        const start = lines.length;
         for (const line of child.render(width)) {
             lines.push(line);
         }
-        if (child.selectable && lines.length > start) {
-            this.chatHitRegions.push({ y0: start, y1: lines.length - 1, lines: lines.slice(start) });
-        }
     }
     snapStartToKittyImageHeader(lines, start) {
         if (start <= 0 || start >= lines.length)
@@ -434,8 +429,8 @@ export class TUI extends Container {
     render(width) {
         const pinIndex = this.getPinIndex();
         if (pinIndex < 0) {
-            this.chatHitRegions = [];
             this.chatScrollbar = undefined;
+            this.scrollbarDrag = undefined;
             this.chatLayoutCache = undefined;
             this.chatUsesGutter = false;
             this.chatLaidOut = false;
@@ -457,18 +452,15 @@ export class TUI extends Container {
         const cache = this.chatLayoutCache;
         if (cache && cache.epoch === this.contentEpoch && cache.chatWidth === chatWidth) {
             scrollLines = cache.scrollLines;
-            this.chatHitRegions = this.copyHitRegions(cache.hitRegionsUnshifted);
             fromCache = true;
         }
         else {
-            this.chatHitRegions = [];
             scrollLines = this.collectChildLines(0, pinIndex, chatWidth);
         }
         if (this.chatUsesGutter) {
             if (scrollLines.length <= viewH) {
                 this.chatUsesGutter = false;
                 chatWidth = width;
-                this.chatHitRegions = [];
                 scrollLines = this.collectChildLines(0, pinIndex, chatWidth);
                 fromCache = false;
             }
@@ -476,7 +468,6 @@ export class TUI extends Container {
         else if (scrollLines.length > viewH) {
             this.chatUsesGutter = true;
             chatWidth = Math.max(1, width - 1);
-            this.chatHitRegions = [];
             scrollLines = this.collectChildLines(0, pinIndex, chatWidth);
             fromCache = false;
         }
@@ -485,7 +476,6 @@ export class TUI extends Container {
                 epoch: this.contentEpoch,
                 chatWidth,
                 scrollLines,
-                hitRegionsUnshifted: this.copyHitRegions(this.chatHitRegions),
             };
         }
         let chatSlice;
@@ -495,6 +485,7 @@ export class TUI extends Container {
             this.chatScrollOffset = 0;
             this.lastChatScrollMax = 0;
             this.chatScrollbar = undefined;
+            this.scrollbarDrag = undefined;
             chatSlice = scrollLines.slice();
         }
         else {
@@ -507,42 +498,31 @@ export class TUI extends Container {
             while (chatSlice.length < viewH) {
                 chatSlice.push("");
             }
-            this.chatScrollbar = { x: width, y0: 1, y1: viewH, viewH, scrollMax: this.lastChatScrollMax };
             const thumbH = Math.max(1, Math.round((viewH * viewH) / scrollLines.length));
             const travel = Math.max(0, viewH - thumbH);
             const thumbTop = this.lastChatScrollMax === 0
                 ? viewH - thumbH
                 : Math.round(travel * (1 - this.chatScrollOffset / this.lastChatScrollMax));
-            const track = "\x1b[2m│\x1b[22m";
-            const thumb = "\x1b[1m█\x1b[22m";
+            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}`;
             }
         }
-        this.shiftHitRegions(-start);
-        if (this.selection) {
-            const lo = Math.min(this.selection.anchorY, this.selection.focusY);
-            const hi = Math.max(this.selection.anchorY, this.selection.focusY);
-            const highlightWidth = this.chatUsesGutter ? chatWidth : width;
-            for (let y = lo; y <= hi; y++) {
-                const idx = y - 1;
-                if (idx < 0 || idx >= chatSlice.length)
-                    continue;
-                chatSlice[idx] = applySelectionHighlight(chatSlice[idx] ?? "", highlightWidth);
-            }
-        }
         return [...chatSlice, ...dockLines];
     }
-    copyHitRegions(regions) {
-        return regions.map((region) => ({ y0: region.y0, y1: region.y1, lines: region.lines }));
-    }
-    shiftHitRegions(delta) {
-        for (const region of this.chatHitRegions) {
-            region.y0 += delta;
-            region.y1 += delta;
-        }
-    }
     /**
      * Show an overlay component with configurable positioning and sizing.
      * Returns a handle to control the overlay's visibility.
@@ -860,61 +840,39 @@ export class TUI extends Container {
         // Shift+drag stays with the terminal's native selection.
         if (mouse.shift)
             return;
-        if (mouse.kind === "button" && !mouse.release && this.chatScrollbar && mouse.x === this.chatScrollbar.x) {
-            const viewH = this.chatScrollbar.viewH;
-            const y = Math.max(this.chatScrollbar.y0, Math.min(mouse.y, this.chatScrollbar.y1));
-            const rel = (y - this.chatScrollbar.y0) / Math.max(1, viewH - 1);
-            this.setChatScroll(Math.round((1 - rel) * this.chatScrollbar.scrollMax));
-            this.selection = undefined;
-            return;
-        }
-        if (mouse.kind === "button" && !mouse.release) {
-            const region = this.hitSelectable(mouse.y);
-            if (!region) {
-                this.selection = undefined;
+        if (this.scrollbarDrag) {
+            if (mouse.kind === "move") {
+                this.dragScrollbarTo(mouse.y);
                 return;
             }
-            this.selection = { anchorY: mouse.y, focusY: mouse.y };
-            this.requestRender();
+            if (mouse.kind === "button" && mouse.release) {
+                this.scrollbarDrag = undefined;
+            }
             return;
         }
-        if (!this.selection)
-            return;
-        if (mouse.kind === "move") {
-            this.selection.focusY = mouse.y;
-            this.requestRender();
+        if (mouse.kind === "button" && !mouse.release && this.chatScrollbar && mouse.x >= this.chatScrollbar.x) {
+            const sb = this.chatScrollbar;
+            const y = Math.max(sb.y0, Math.min(mouse.y, sb.y1));
+            const row = y - sb.y0;
+            const onThumb = row >= sb.thumbTop && row < sb.thumbTop + sb.thumbH;
+            if (!onThumb) {
+                const rel = (y - sb.y0) / Math.max(1, sb.viewH - 1);
+                this.setChatScroll(Math.round((1 - rel) * sb.scrollMax));
+            }
+            this.scrollbarDrag = { grabY: y, startOffset: this.chatScrollOffset };
             return;
         }
-        if (mouse.kind === "button" && mouse.release) {
-            this.selection.focusY = mouse.y;
-            const text = this.selectedText();
-            this.selection = undefined;
-            this.requestRender();
-            if (text)
-                this.onTextSelected?.(text);
-        }
     }
-    hitSelectable(y) {
-        return this.chatHitRegions.find((region) => y >= region.y0 + 1 && y <= region.y1 + 1);
-    }
-    selectedText() {
-        if (!this.selection)
-            return undefined;
-        const lo = Math.min(this.selection.anchorY, this.selection.focusY);
-        const hi = Math.max(this.selection.anchorY, this.selection.focusY);
-        if (lo === hi)
-            return undefined;
-        const lines = [];
-        for (const region of this.chatHitRegions) {
-            for (let i = 0; i < region.lines.length; i++) {
-                const y = region.y0 + i + 1;
-                if (y < lo || y > hi)
-                    continue;
-                lines.push(stripAnsiForCopy(region.lines[i] ?? ""));
-            }
-        }
-        const text = lines.join("\n").trim();
-        return text.length > 0 ? text : undefined;
+    dragScrollbarTo(mouseY) {
+        if (!this.scrollbarDrag || !this.chatScrollbar)
+            return;
+        const { viewH, thumbH, scrollMax, y0, y1 } = this.chatScrollbar;
+        const travel = viewH - thumbH;
+        if (travel <= 0 || scrollMax <= 0)
+            return;
+        const y = Math.max(y0, Math.min(mouseY, y1));
+        const deltaY = y - this.scrollbarDrag.grabY;
+        this.setChatScroll(this.scrollbarDrag.startOffset - Math.round((deltaY * scrollMax) / travel));
     }
     handleInput(data) {
         if (this.consumeOsc11BackgroundResponse(data)) {
@@ -1791,22 +1749,4 @@ function padToWidth(line, width) {
         return line;
     return line + " ".repeat(width - vis);
 }
-function applySelectionHighlight(line, width) {
-    const padded = padToWidth(line, width);
-    return `\x1b[7m${padded}\x1b[27m`;
-}
-function stripAnsiForCopy(line) {
-    let out = "";
-    let i = 0;
-    while (i < line.length) {
-        const ansi = extractAnsiCode(line, i);
-        if (ansi) {
-            i += ansi.length;
-            continue;
-        }
-        out += line[i];
-        i++;
-    }
-    return out.replace(/\s+$/, "");
-}
 //# sourceMappingURL=tui.js.map