@earendil-works/pi-tui 1.0.0 → 1.0.2

package/dist/tui-alt-screen.js

@@ -5,7 +5,7 @@ import { getKeybindings } from "./keybindings.js";
 import { isKeyRelease } from "./keys.js";
 import { getLayoutBoxesAt, getScrollbarGeometry, getScrollViewBox, getScrollViewsAt, renderLayoutFrame, } from "./layout.js";
 import { getLayoutNode } from "./layout-node.js";
-import { deleteAllKittyImages, deleteAllKittyPlacements, deleteKittyImage, getCapabilities, getKittyImagePlacement, isImageLine, setCapabilities, } from "./terminal-image.js";
+import { deleteAllKittyImages, deleteAllKittyPlacements, deleteKittyImage, getCapabilities, getKittyImagePlacement, getKittyImagePlacementRows, isImageLine, setCapabilities, } from "./terminal-image.js";
 import { Container, CURSOR_MARKER, compositeTuiLine, dispatchMouseEvent, retargetMouseEvent, TuiBase, VIEWPORT_TUI, } from "./tui.js";
 import { extractAnsiCode, getGraphemeCellRange, getOsc8LinkAtColumn, getWordSegmenter, sliceByColumn, stripTerminalSequences, truncateToWidth, visibleWidth, } from "./utils.js";
 import { WheelScrollAccelerator } from "./wheel-scroll.js";
@@ -1458,7 +1458,24 @@ export class TuiAltScreen extends TuiBase {
             return sliceByColumn(line, 0, width, true);
         });
         const fullRedraw = this.previousScreen.length === 0 || this.previousScreenWidth !== width || this.previousScreenHeight !== height;
-        const imagesNeedRedraw = screen.some((line, row) => line !== this.previousScreen[row] && (isImageLine(line) || isImageLine(this.previousScreen[row] ?? "")));
+        const changedRows = screen.map((line, row) => line !== this.previousScreen[row]);
+        const imageAnchorsNeedRedraw = screen.some((line, row) => changedRows[row] && (isImageLine(line) || isImageLine(this.previousScreen[row] ?? "")));
+        const isWezTerm = Boolean(process.env.WEZTERM_PANE) || process.env.TERM_PROGRAM?.toLowerCase() === "wezterm";
+        const imageCellsNeedRedraw = !imageAnchorsNeedRedraw &&
+            isWezTerm &&
+            this.imageProtocol === "kitty" &&
+            changedRows.some(Boolean) &&
+            screen.some((line, row) => {
+                const placementRows = getKittyImagePlacementRows(line);
+                if (placementRows === undefined)
+                    return false;
+                for (let coveredRow = row; coveredRow < row + placementRows; coveredRow++) {
+                    if (changedRows[coveredRow])
+                        return true;
+                }
+                return false;
+            });
+        const imagesNeedRedraw = imageAnchorsNeedRedraw || imageCellsNeedRedraw;
         const redrawImages = fullRedraw || imagesNeedRedraw;
         const hadUploadedKittyImages = this.uploadedKittyImages.size > 0;
         const preparedKittyScreen = redrawImages && this.imageProtocol === "kitty"
@@ -1479,24 +1496,37 @@ export class TuiAltScreen extends TuiBase {
                 buffer += deleteAllKittyPlacements();
         }
         buffer += preparedKittyScreen.evictedImageDeletion;
-        // WezTerm erases intersecting Kitty image cells when a later EL clears a covered row.
-        // Only separate clearing from drawing for WezTerm frames that place images; preserve the
-        // existing interleaved output for text-only frames and every other terminal.
-        const clearRowsBeforeKittyImages = redrawImages &&
-            this.imageProtocol === "kitty" &&
-            screen.some(isImageLine) &&
-            (Boolean(process.env.WEZTERM_PANE) || process.env.TERM_PROGRAM?.toLowerCase() === "wezterm");
-        if (clearRowsBeforeKittyImages) {
+        // WezTerm erases intersecting Kitty image cells when a later row write touches a covered row.
+        // Draw image placements after every clear and text write so nothing later intersects them; preserve
+        // the existing interleaved output for text-only frames and every other terminal.
+        const drawKittyImagesLast = redrawImages && this.imageProtocol === "kitty" && screen.some(isImageLine) && isWezTerm;
+        if (drawKittyImagesLast) {
             for (let row = 0; row < height; row++) {
                 if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
                     continue;
                 buffer += `\x1b[${row + 1};1H\x1b[2K`;
             }
+            for (let row = 0; row < height; row++) {
+                if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
+                    continue;
+                if (isImageLine(preparedKittyScreen.lines[row] ?? ""))
+                    continue;
+                buffer += `\x1b[${row + 1};1H${preparedKittyScreen.lines[row] ?? ""}`;
+            }
+            for (let row = 0; row < height; row++) {
+                if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
+                    continue;
+                if (!isImageLine(preparedKittyScreen.lines[row] ?? ""))
+                    continue;
+                buffer += `\x1b[${row + 1};1H${preparedKittyScreen.lines[row] ?? ""}`;
+            }
         }
-        for (let row = 0; row < height; row++) {
-            if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
-                continue;
-            buffer += `\x1b[${row + 1};1H${clearRowsBeforeKittyImages ? "" : "\x1b[2K"}${preparedKittyScreen.lines[row] ?? ""}`;
+        else {
+            for (let row = 0; row < height; row++) {
+                if (!fullRedraw && !imagesNeedRedraw && screen[row] === this.previousScreen[row])
+                    continue;
+                buffer += `\x1b[${row + 1};1H\x1b[2K${preparedKittyScreen.lines[row] ?? ""}`;
+            }
         }
         if (cursorPos) {
             buffer += `\x1b[${cursorPos.row + 1};${Math.min(width, cursorPos.col) + 1}H`;