@opentui/core 0.1.69 → 0.1.70

package/3d.js

@@ -5,7 +5,7 @@ import {
   __export,
   __require,
   __toESM
-} from "./index-zj0wwh9d.js";
+} from "./index-cr95zpf8.js";
 
 // ../../node_modules/.bun/omggif@1.0.10/node_modules/omggif/omggif.js
 var require_omggif = __commonJS((exports) => {

package/Renderable.d.ts

@@ -296,6 +296,8 @@ interface RenderCommandPushScissorRect extends RenderCommandBase {
     y: number;
     width: number;
     height: number;
+    screenX: number;
+    screenY: number;
 }
 interface RenderCommandPopScissorRect extends RenderCommandBase {
     action: "popScissorRect";

package/{index-zj0wwh9d.js → index-cr95zpf8.js}

@@ -2368,6 +2368,7 @@ class KeyEvent {
   baseCode;
   repeated;
   _defaultPrevented = false;
+  _propagationStopped = false;
   constructor(key) {
     this.name = key.name;
     this.ctrl = key.ctrl;
@@ -2390,23 +2391,36 @@ class KeyEvent {
   get defaultPrevented() {
     return this._defaultPrevented;
   }
+  get propagationStopped() {
+    return this._propagationStopped;
+  }
   preventDefault() {
     this._defaultPrevented = true;
   }
+  stopPropagation() {
+    this._propagationStopped = true;
+  }
 }
 
 class PasteEvent {
   text;
   _defaultPrevented = false;
+  _propagationStopped = false;
   constructor(text) {
     this.text = text;
   }
   get defaultPrevented() {
     return this._defaultPrevented;
   }
+  get propagationStopped() {
+    return this._propagationStopped;
+  }
   preventDefault() {
     this._defaultPrevented = true;
   }
+  stopPropagation() {
+    this._propagationStopped = true;
+  }
 }
 
 class KeyHandler extends EventEmitter {
@@ -2458,10 +2472,22 @@ class InternalKeyHandler extends KeyHandler {
   }
   emitWithPriority(event, ...args) {
     let hasGlobalListeners = false;
-    try {
-      hasGlobalListeners = super.emit(event, ...args);
-    } catch (error) {
-      console.error(`[KeyHandler] Error in global ${event} handler:`, error);
+    const globalListeners = this.listeners(event);
+    if (globalListeners.length > 0) {
+      hasGlobalListeners = true;
+      for (const listener of globalListeners) {
+        try {
+          listener(...args);
+        } catch (error) {
+          console.error(`[KeyHandler] Error in global ${event} handler:`, error);
+        }
+        if (event === "keypress" || event === "keyrelease" || event === "paste") {
+          const keyEvent = args[0];
+          if (keyEvent.propagationStopped) {
+            return hasGlobalListeners;
+          }
+        }
+      }
     }
     const renderableSet = this.renderableHandlers.get(event);
     const renderableHandlers = renderableSet && renderableSet.size > 0 ? [...renderableSet] : [];
@@ -2472,6 +2498,8 @@ class InternalKeyHandler extends KeyHandler {
         const keyEvent = args[0];
         if (keyEvent.defaultPrevented)
           return hasGlobalListeners || hasRenderableListeners;
+        if (keyEvent.propagationStopped)
+          return hasGlobalListeners || hasRenderableListeners;
       }
       for (const handler of renderableHandlers) {
         try {
@@ -2479,6 +2507,12 @@ class InternalKeyHandler extends KeyHandler {
         } catch (error) {
           console.error(`[KeyHandler] Error in renderable ${event} handler:`, error);
         }
+        if (event === "keypress" || event === "keyrelease" || event === "paste") {
+          const keyEvent = args[0];
+          if (keyEvent.propagationStopped) {
+            return hasGlobalListeners || hasRenderableListeners;
+          }
+        }
       }
     }
     return hasGlobalListeners || hasRenderableListeners;
@@ -10444,6 +10478,26 @@ function getOpenTUILib(libPath) {
       args: ["ptr", "i32", "i32", "u32", "u32", "u32"],
       returns: "void"
     },
+    clearCurrentHitGrid: {
+      args: ["ptr"],
+      returns: "void"
+    },
+    hitGridPushScissorRect: {
+      args: ["ptr", "i32", "i32", "u32", "u32"],
+      returns: "void"
+    },
+    hitGridPopScissorRect: {
+      args: ["ptr"],
+      returns: "void"
+    },
+    hitGridClearScissorRects: {
+      args: ["ptr"],
+      returns: "void"
+    },
+    addToCurrentHitGridClipped: {
+      args: ["ptr", "i32", "i32", "u32", "u32", "u32"],
+      returns: "void"
+    },
     checkHit: {
       args: ["ptr", "u32", "u32"],
       returns: "u32"
@@ -11540,6 +11594,21 @@ class FFIRenderLib {
   addToHitGrid(renderer, x, y, width, height, id) {
     this.opentui.symbols.addToHitGrid(renderer, x, y, width, height, id);
   }
+  clearCurrentHitGrid(renderer) {
+    this.opentui.symbols.clearCurrentHitGrid(renderer);
+  }
+  hitGridPushScissorRect(renderer, x, y, width, height) {
+    this.opentui.symbols.hitGridPushScissorRect(renderer, x, y, width, height);
+  }
+  hitGridPopScissorRect(renderer) {
+    this.opentui.symbols.hitGridPopScissorRect(renderer);
+  }
+  hitGridClearScissorRects(renderer) {
+    this.opentui.symbols.hitGridClearScissorRects(renderer);
+  }
+  addToCurrentHitGridClipped(renderer, x, y, width, height, id) {
+    this.opentui.symbols.addToCurrentHitGridClipped(renderer, x, y, width, height, id);
+  }
   checkHit(renderer, x, y) {
     return this.opentui.symbols.checkHit(renderer, x, y);
   }
@@ -12934,9 +13003,9 @@ class Renderable extends BaseRenderable {
     if (this._translateX === value)
       return;
     this._translateX = value;
-    this.requestRender();
     if (this.parent)
       this.parent.childrenPrimarySortDirty = true;
+    this.requestRender();
   }
   get translateY() {
     return this._translateY;
@@ -12945,9 +13014,9 @@ class Renderable extends BaseRenderable {
     if (this._translateY === value)
       return;
     this._translateY = value;
-    this.requestRender();
     if (this.parent)
       this.parent.childrenPrimarySortDirty = true;
+    this.requestRender();
   }
   get x() {
     if (this.parent) {
@@ -13580,7 +13649,9 @@ class Renderable extends BaseRenderable {
         x: scissorRect.x,
         y: scissorRect.y,
         width: scissorRect.width,
-        height: scissorRect.height
+        height: scissorRect.height,
+        screenX: this.x,
+        screenY: this.y
       });
     }
     const visibleChildren = this._getVisibleChildren();
@@ -13796,6 +13867,7 @@ class RootRenderable extends Renderable {
     }
     this.renderList.length = 0;
     this.updateLayout(deltaTime, this.renderList);
+    this._ctx.clearHitGridScissorRects();
     for (let i = 1;i < this.renderList.length; i++) {
       const command = this.renderList[i];
       switch (command.action) {
@@ -13806,9 +13878,11 @@ class RootRenderable extends Renderable {
           break;
         case "pushScissorRect":
           buffer.pushScissorRect(command.x, command.y, command.width, command.height);
+          this._ctx.pushHitGridScissorRect(command.screenX, command.screenY, command.width, command.height);
           break;
         case "popScissorRect":
           buffer.popScissorRect();
+          this._ctx.popHitGridScissorRect();
           break;
         case "pushOpacity":
           buffer.pushOpacity(command.opacity);
@@ -15409,6 +15483,8 @@ class CliRenderer extends EventEmitter9 {
   exitSignals;
   _exitListenersAdded = false;
   _isDestroyed = false;
+  _destroyPending = false;
+  _destroyFinalized = false;
   nextRenderBuffer;
   currentRenderBuffer;
   _isRunning = false;
@@ -15494,6 +15570,7 @@ class CliRenderer extends EventEmitter9 {
   }).bind(this);
   _capabilities = null;
   _latestPointer = { x: 0, y: 0 };
+  _hasPointer = false;
   _currentFocusedRenderable = null;
   lifecyclePasses = new Set;
   _openConsoleOnError = true;
@@ -15675,11 +15752,26 @@ Captured output:
     }
     this._currentFocusedRenderable = renderable;
   }
+  setCapturedRenderable(renderable) {
+    if (this.capturedRenderable === renderable) {
+      return;
+    }
+    this.capturedRenderable = renderable;
+  }
   addToHitGrid(x, y, width, height, id) {
     if (id !== this.capturedRenderable?.num) {
       this.lib.addToHitGrid(this.rendererPtr, x, y, width, height, id);
     }
   }
+  pushHitGridScissorRect(x, y, width, height) {
+    this.lib.hitGridPushScissorRect(this.rendererPtr, x, y, width, height);
+  }
+  popHitGridScissorRect() {
+    this.lib.hitGridPopScissorRect(this.rendererPtr);
+  }
+  clearHitGridScissorRects() {
+    this.lib.hitGridClearScissorRects(this.rendererPtr);
+  }
   get widthMethod() {
     const caps = this.capabilities;
     return caps?.unicode === "wcwidth" ? "wcwidth" : "unicode";
@@ -15874,7 +15966,11 @@ Captured output:
       const backgroundColor = this.backgroundColor.toInts();
       const newlines = " ".repeat(this.width) + `
 `.repeat(space);
-      clear = ANSI.setRgbBackground(backgroundColor[0], backgroundColor[1], backgroundColor[2]) + newlines + ANSI.resetBackground;
+      if (backgroundColor[3] === 0) {
+        clear = newlines;
+      } else {
+        clear = ANSI.setRgbBackground(backgroundColor[0], backgroundColor[1], backgroundColor[2]) + newlines + ANSI.resetBackground;
+      }
     }
     this.writeOut(flush + move + output + clear);
     return true;
@@ -15885,7 +15981,7 @@ Captured output:
   }
   disableMouse() {
     this._useMouse = false;
-    this.capturedRenderable = undefined;
+    this.setCapturedRenderable(undefined);
     this.mouseParser.reset();
     this.lib.disableMouse(this.rendererPtr);
   }
@@ -16003,6 +16099,7 @@ Captured output:
       }
       this._latestPointer.x = mouseEvent.x;
       this._latestPointer.y = mouseEvent.y;
+      this._hasPointer = true;
       if (this._console.visible) {
         const consoleBounds = this._console.bounds;
         if (mouseEvent.x >= consoleBounds.x && mouseEvent.x < consoleBounds.x + consoleBounds.width && mouseEvent.y >= consoleBounds.y && mouseEvent.y < consoleBounds.y + consoleBounds.height) {
@@ -16013,7 +16110,7 @@ Captured output:
         }
       }
       if (mouseEvent.type === "scroll") {
-        const maybeRenderableId2 = this.lib.checkHit(this.rendererPtr, mouseEvent.x, mouseEvent.y);
+        const maybeRenderableId2 = this.hitTest(mouseEvent.x, mouseEvent.y);
         const maybeRenderable2 = Renderable.renderablesByNumber.get(maybeRenderableId2);
         if (maybeRenderable2) {
           const event2 = new MouseEvent(maybeRenderable2, mouseEvent);
@@ -16021,7 +16118,7 @@ Captured output:
         }
         return true;
       }
-      const maybeRenderableId = this.lib.checkHit(this.rendererPtr, mouseEvent.x, mouseEvent.y);
+      const maybeRenderableId = this.hitTest(mouseEvent.x, mouseEvent.y);
       const sameElement = maybeRenderableId === this.lastOverRenderableNum;
       this.lastOverRenderableNum = maybeRenderableId;
       const maybeRenderable = Renderable.renderablesByNumber.get(maybeRenderableId);
@@ -16090,20 +16187,20 @@ Captured output:
         }
         this.lastOverRenderable = this.capturedRenderable;
         this.lastOverRenderableNum = this.capturedRenderable.num;
-        this.capturedRenderable = undefined;
+        this.setCapturedRenderable(undefined);
         this.requestRender();
       }
       let event = undefined;
       if (maybeRenderable) {
         if (mouseEvent.type === "drag" && mouseEvent.button === 0 /* LEFT */) {
-          this.capturedRenderable = maybeRenderable;
+          this.setCapturedRenderable(maybeRenderable);
         } else {
-          this.capturedRenderable = undefined;
+          this.setCapturedRenderable(undefined);
         }
         event = new MouseEvent(maybeRenderable, mouseEvent);
         maybeRenderable.processMouseEvent(event);
       } else {
-        this.capturedRenderable = undefined;
+        this.setCapturedRenderable(undefined);
         this.lastOverRenderable = undefined;
       }
       if (!event?.defaultPrevented && mouseEvent.type === "down" && this.currentSelection) {
@@ -16113,6 +16210,9 @@ Captured output:
     }
     return false;
   }
+  hitTest(x, y) {
+    return this.lib.checkHit(this.rendererPtr, x, y);
+  }
   takeMemorySnapshot() {
     if (this._isDestroyed)
       return;
@@ -16173,7 +16273,7 @@ Captured output:
     this._terminalWidth = width;
     this._terminalHeight = height;
     this.queryPixelResolution();
-    this.capturedRenderable = undefined;
+    this.setCapturedRenderable(undefined);
     this.mouseParser.reset();
     if (this._splitHeight > 0) {
       if (width < prevWidth) {
@@ -16385,6 +16485,17 @@ Captured output:
     if (this._isDestroyed)
       return;
     this._isDestroyed = true;
+    this._destroyPending = true;
+    if (this.rendering) {
+      return;
+    }
+    this.finalizeDestroy();
+  }
+  finalizeDestroy() {
+    if (this._destroyFinalized)
+      return;
+    this._destroyFinalized = true;
+    this._destroyPending = false;
     process.removeListener("SIGWINCH", this.sigwinchHandler);
     process.removeListener("uncaughtException", this.handleError);
     process.removeListener("unhandledRejection", this.handleError);
@@ -16416,7 +16527,7 @@ Captured output:
     }
     this._isRunning = false;
     this.waitingForPixelResolution = false;
-    this.capturedRenderable = undefined;
+    this.setCapturedRenderable(undefined);
     try {
       this.root.destroyRecursively();
     } catch (e) {
@@ -16461,65 +16572,71 @@ Captured output:
       clearTimeout(this.renderTimeout);
       this.renderTimeout = null;
     }
-    const now = Date.now();
-    const elapsed = now - this.lastTime;
-    const deltaTime = elapsed;
-    this.lastTime = now;
-    this.frameCount++;
-    if (now - this.lastFpsTime >= 1000) {
-      this.currentFps = this.frameCount;
-      this.frameCount = 0;
-      this.lastFpsTime = now;
-    }
-    this.renderStats.frameCount++;
-    this.renderStats.fps = this.currentFps;
-    const overallStart = performance.now();
-    const frameRequests = Array.from(this.animationRequest.values());
-    this.animationRequest.clear();
-    const animationRequestStart = performance.now();
-    frameRequests.forEach((callback) => {
-      callback(deltaTime);
-      this.dropLive();
-    });
-    const animationRequestEnd = performance.now();
-    const animationRequestTime = animationRequestEnd - animationRequestStart;
-    const start = performance.now();
-    for (const frameCallback of this.frameCallbacks) {
-      try {
-        await frameCallback(deltaTime);
-      } catch (error) {
-        console.error("Error in frame callback:", error);
+    try {
+      const now = Date.now();
+      const elapsed = now - this.lastTime;
+      const deltaTime = elapsed;
+      this.lastTime = now;
+      this.frameCount++;
+      if (now - this.lastFpsTime >= 1000) {
+        this.currentFps = this.frameCount;
+        this.frameCount = 0;
+        this.lastFpsTime = now;
       }
-    }
-    const end = performance.now();
-    this.renderStats.frameCallbackTime = end - start;
-    this.root.render(this.nextRenderBuffer, deltaTime);
-    for (const postProcessFn of this.postProcessFns) {
-      postProcessFn(this.nextRenderBuffer, deltaTime);
-    }
-    this._console.renderToBuffer(this.nextRenderBuffer);
-    if (!this._isDestroyed) {
-      this.renderNative();
-      const overallFrameTime = performance.now() - overallStart;
-      this.lib.updateStats(this.rendererPtr, overallFrameTime, this.renderStats.fps, this.renderStats.frameCallbackTime);
-      if (this.gatherStats) {
-        this.collectStatSample(overallFrameTime);
+      this.renderStats.frameCount++;
+      this.renderStats.fps = this.currentFps;
+      const overallStart = performance.now();
+      const frameRequests = Array.from(this.animationRequest.values());
+      this.animationRequest.clear();
+      const animationRequestStart = performance.now();
+      for (const callback of frameRequests) {
+        callback(deltaTime);
+        this.dropLive();
+      }
+      const animationRequestEnd = performance.now();
+      const animationRequestTime = animationRequestEnd - animationRequestStart;
+      const start = performance.now();
+      for (const frameCallback of this.frameCallbacks) {
+        try {
+          await frameCallback(deltaTime);
+        } catch (error) {
+          console.error("Error in frame callback:", error);
+        }
+      }
+      const end = performance.now();
+      this.renderStats.frameCallbackTime = end - start;
+      this.root.render(this.nextRenderBuffer, deltaTime);
+      for (const postProcessFn of this.postProcessFns) {
+        postProcessFn(this.nextRenderBuffer, deltaTime);
       }
-      if (this._isRunning || this.immediateRerenderRequested) {
-        const targetFrameTime = this.immediateRerenderRequested ? this.minTargetFrameTime : this.targetFrameTime;
-        const delay = Math.max(1, targetFrameTime - Math.floor(overallFrameTime));
-        this.immediateRerenderRequested = false;
-        this.renderTimeout = setTimeout(() => {
+      this._console.renderToBuffer(this.nextRenderBuffer);
+      if (!this._isDestroyed) {
+        this.renderNative();
+        const overallFrameTime = performance.now() - overallStart;
+        this.lib.updateStats(this.rendererPtr, overallFrameTime, this.renderStats.fps, this.renderStats.frameCallbackTime);
+        if (this.gatherStats) {
+          this.collectStatSample(overallFrameTime);
+        }
+        if (this._isRunning || this.immediateRerenderRequested) {
+          const targetFrameTime = this.immediateRerenderRequested ? this.minTargetFrameTime : this.targetFrameTime;
+          const delay = Math.max(1, targetFrameTime - Math.floor(overallFrameTime));
+          this.immediateRerenderRequested = false;
+          this.renderTimeout = setTimeout(() => {
+            this.renderTimeout = null;
+            this.loop();
+          }, delay);
+        } else {
+          clearTimeout(this.renderTimeout);
           this.renderTimeout = null;
-          this.loop();
-        }, delay);
-      } else {
-        clearTimeout(this.renderTimeout);
-        this.renderTimeout = null;
+        }
       }
+    } finally {
+      this.rendering = false;
+      if (this._destroyPending) {
+        this.finalizeDestroy();
+      }
+      this.resolveIdleIfNeeded();
     }
-    this.rendering = false;
-    this.resolveIdleIfNeeded();
   }
   intermediateRender() {
     this.immediateRerenderRequested = true;
@@ -16624,7 +16741,7 @@ Captured output:
   requestSelectionUpdate() {
     if (this.currentSelection?.isSelecting) {
       const pointer = this._latestPointer;
-      const maybeRenderableId = this.lib.checkHit(this.rendererPtr, pointer.x, pointer.y);
+      const maybeRenderableId = this.hitTest(pointer.x, pointer.y);
       const maybeRenderable = Renderable.renderablesByNumber.get(maybeRenderableId);
       this.updateSelection(maybeRenderable, pointer.x, pointer.y);
     }
@@ -16714,5 +16831,5 @@ Captured output:
 
 export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, exports_src, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, nonAlphanumericKeys, parseKeypress, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, createTextAttributes, attributesWithLink, getLinkId, visualizeRenderableTree, isStyledText, StyledText, stringToStyledText, black, red, green, yellow, blue, magenta, cyan, white, brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite, bgBlack, bgRed, bgGreen, bgYellow, bgBlue, bgMagenta, bgCyan, bgWhite, bold, italic, underline, strikethrough, dim, reverse, blink, fg, bg, link, t, hastToStyledText, LinearScrollAccel, MacOSScrollAccel, StdinBuffer, parseAlign, parseAlignItems, parseBoxSizing, parseDimension, parseDirection, parseDisplay, parseEdge, parseFlexDirection, parseGutter, parseJustify, parseLogLevel, parseMeasureMode, parseOverflow, parsePositionType, parseUnit, parseWrap, MouseParser, Selection, convertGlobalToLocalSelection, ASCIIFontSelectionHelper, envRegistry, registerEnvVar, clearEnvCache, generateEnvMarkdown, generateEnvColored, env, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extToFiletype, pathToFiletype, main, getTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, TextBuffer, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, ANSI, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingKey, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=E5F92C3AE627580664756E2164756E21
-//# sourceMappingURL=index-zj0wwh9d.js.map
+//# debugId=FF2A8CAC839E289564756E2164756E21
+//# sourceMappingURL=index-cr95zpf8.js.map