@opentui/core 0.1.53 → 0.1.55

package/3d.js

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

package/Renderable.d.ts

@@ -111,7 +111,7 @@ export declare abstract class BaseRenderable extends EventEmitter {
 }
 export declare abstract class Renderable extends BaseRenderable {
     static renderablesByNumber: Map<number, Renderable>;
-    private _isDestroyed;
+    protected _isDestroyed: boolean;
     protected _ctx: RenderContext;
     protected _translateX: number;
     protected _translateY: number;
@@ -148,6 +148,7 @@ export declare abstract class Renderable extends BaseRenderable {
     parent: Renderable | null;
     private childrenPrimarySortDirty;
     private childrenSortedByPrimaryAxis;
+    private _shouldUpdateBefore;
     onLifecyclePass: (() => void) | null;
     renderBefore?: (this: Renderable, buffer: OptimizedBuffer, deltaTime: number) => void;
     renderAfter?: (this: Renderable, buffer: OptimizedBuffer, deltaTime: number) => void;

package/{index-vhxgbbed.js → index-0razn4m6.js}

@@ -1889,15 +1889,45 @@ var functionalKeyMap = {
   R: "f3",
   S: "f4"
 };
-function parseKittyFunctionalKey(sequence) {
-  const functionalRe = /^\x1b\[1;(\d+):(\d+)([A-Z])$/;
-  const match = functionalRe.exec(sequence);
+var tildeKeyMap = {
+  "1": "home",
+  "2": "insert",
+  "3": "delete",
+  "4": "end",
+  "5": "pageup",
+  "6": "pagedown",
+  "7": "home",
+  "8": "end",
+  "11": "f1",
+  "12": "f2",
+  "13": "f3",
+  "14": "f4",
+  "15": "f5",
+  "17": "f6",
+  "18": "f7",
+  "19": "f8",
+  "20": "f9",
+  "21": "f10",
+  "23": "f11",
+  "24": "f12"
+};
+function parseKittySpecialKey(sequence) {
+  const specialKeyRe = /^\x1b\[(\d+);(\d+):(\d+)([A-Z~])$/;
+  const match = specialKeyRe.exec(sequence);
   if (!match)
     return null;
-  const modifierStr = match[1];
-  const eventTypeStr = match[2];
-  const keyChar = match[3];
-  const keyName = functionalKeyMap[keyChar];
+  const keyNumOrOne = match[1];
+  const modifierStr = match[2];
+  const eventTypeStr = match[3];
+  const terminator = match[4];
+  let keyName;
+  if (terminator === "~") {
+    keyName = tildeKeyMap[keyNumOrOne];
+  } else {
+    if (keyNumOrOne !== "1")
+      return null;
+    keyName = functionalKeyMap[terminator];
+  }
   if (!keyName)
     return null;
   const key = {
@@ -1941,9 +1971,9 @@ function parseKittyFunctionalKey(sequence) {
   return key;
 }
 function parseKittyKeyboard(sequence) {
-  const functionalResult = parseKittyFunctionalKey(sequence);
-  if (functionalResult)
-    return functionalResult;
+  const specialResult = parseKittySpecialKey(sequence);
+  if (specialResult)
+    return specialResult;
   const kittyRe = /^\x1b\[([^\x1b]+)u$/;
   const match = kittyRe.exec(sequence);
   if (!match)
@@ -2212,9 +2242,11 @@ var parseKeypress = (s = "", options = {}) => {
     const modifier = parseInt(modifyOtherKeysMatch[1], 10) - 1;
     const charCode = parseInt(modifyOtherKeysMatch[2], 10);
     key.ctrl = !!(modifier & 4);
-    key.meta = !!(modifier & 10);
+    key.meta = !!(modifier & 2);
     key.shift = !!(modifier & 1);
     key.option = !!(modifier & 2);
+    key.super = !!(modifier & 8);
+    key.hyper = !!(modifier & 16);
     if (charCode === 13) {
       key.name = "return";
     } else if (charCode === 27) {
@@ -2291,9 +2323,11 @@ var parseKeypress = (s = "", options = {}) => {
     const code = [parts[1], parts[2], parts[4], parts[6]].filter(Boolean).join("");
     const modifier = parseInt(parts[3] || parts[5] || "1", 10) - 1;
     key.ctrl = !!(modifier & 4);
-    key.meta = !!(modifier & 10);
+    key.meta = !!(modifier & 2);
     key.shift = !!(modifier & 1);
     key.option = !!(modifier & 2);
+    key.super = !!(modifier & 8);
+    key.hyper = !!(modifier & 16);
     key.code = code;
     const keyNameResult = keyName[code];
     if (keyNameResult) {
@@ -8877,15 +8911,15 @@ class TerminalPalette {
   writeFn;
   activeListeners = [];
   activeTimers = [];
-  inTmux;
-  constructor(stdin, stdout, writeFn, isTmux) {
+  inLegacyTmux;
+  constructor(stdin, stdout, writeFn, isLegacyTmux) {
     this.stdin = stdin;
     this.stdout = stdout;
     this.writeFn = writeFn || ((data) => stdout.write(data));
-    this.inTmux = isTmux ?? false;
+    this.inLegacyTmux = isLegacyTmux ?? false;
   }
   writeOsc(osc) {
-    const data = this.inTmux ? wrapForTmux(osc) : osc;
+    const data = this.inLegacyTmux ? wrapForTmux(osc) : osc;
     return this.writeFn(data);
   }
   cleanup() {
@@ -9122,8 +9156,8 @@ class TerminalPalette {
     };
   }
 }
-function createTerminalPalette(stdin, stdout, writeFn, isTmux) {
-  return new TerminalPalette(stdin, stdout, writeFn, isTmux);
+function createTerminalPalette(stdin, stdout, writeFn, isLegacyTmux) {
+  return new TerminalPalette(stdin, stdout, writeFn, isLegacyTmux);
 }
 // src/zig.ts
 import { dlopen, toArrayBuffer as toArrayBuffer4, JSCallback, ptr as ptr3 } from "bun:ffi";
@@ -11507,7 +11541,7 @@ class FFIRenderLib {
       lineWraps: struct.wraps
     };
   }
-  textBufferViewGetLineCount(view) {
+  textBufferViewGetVirtualLineCount(view) {
     return this.opentui.symbols.textBufferViewGetVirtualLineCount(view);
   }
   textBufferViewGetLineInfoDirect(view, outPtr) {
@@ -12421,6 +12455,7 @@ class Renderable extends BaseRenderable {
   parent = null;
   childrenPrimarySortDirty = true;
   childrenSortedByPrimaryAxis = [];
+  _shouldUpdateBefore = new Set;
   onLifecyclePass = null;
   renderBefore;
   renderAfter;
@@ -12506,19 +12541,27 @@ class Renderable extends BaseRenderable {
     return false;
   }
   focus() {
-    if (this._focused || !this._focusable)
+    if (this._isDestroyed || this._focused || !this._focusable)
       return;
     this._ctx.focusRenderable(this);
     this._focused = true;
     this.requestRender();
     this.keypressHandler = (key) => {
+      if (this._isDestroyed)
+        return;
       this._keyListeners["down"]?.(key);
+      if (this._isDestroyed)
+        return;
       if (!key.defaultPrevented && this.handleKeyPress) {
         this.handleKeyPress(key);
       }
     };
     this.pasteHandler = (event) => {
+      if (this._isDestroyed)
+        return;
       this._pasteListener?.call(this, event);
+      if (this._isDestroyed)
+        return;
       if (!event.defaultPrevented && this.handlePaste) {
         this.handlePaste(event);
       }
@@ -13116,6 +13159,7 @@ class Renderable extends BaseRenderable {
     this._childrenInLayoutOrder.push(renderable);
     this.yogaNode.insertChild(childLayoutNode, insertedIndex);
     this.childrenPrimarySortDirty = true;
+    this._shouldUpdateBefore.add(renderable);
     this.requestRender();
     return insertedIndex;
   }
@@ -13168,6 +13212,7 @@ class Renderable extends BaseRenderable {
     const insertedIndex = Math.max(0, Math.min(anchorIndex, this._childrenInLayoutOrder.length));
     this._childrenInLayoutOrder.splice(insertedIndex, 0, renderable);
     this.yogaNode.insertChild(renderable.getLayoutNode(), insertedIndex);
+    this._shouldUpdateBefore.add(renderable);
     this.requestRender();
     return insertedIndex;
   }
@@ -13214,7 +13259,19 @@ class Renderable extends BaseRenderable {
     if (!this.visible)
       return;
     this.onUpdate(deltaTime);
+    if (this._isDestroyed)
+      return;
     this.updateFromLayout();
+    if (this._shouldUpdateBefore.size > 0) {
+      for (const child of this._shouldUpdateBefore) {
+        if (!child.isDestroyed) {
+          child.updateFromLayout();
+        }
+      }
+      this._shouldUpdateBefore.clear();
+    }
+    if (this._isDestroyed)
+      return;
     renderList.push({ action: "render", renderable: this });
     this.ensureZIndexSorted();
     const shouldPushScissor = this._overflow !== "visible" && this.width > 0 && this.height > 0;
@@ -13442,7 +13499,9 @@ class RootRenderable extends Renderable {
       const command = this.renderList[i];
       switch (command.action) {
         case "render":
-          command.renderable.render(buffer, deltaTime);
+          if (!command.renderable.isDestroyed) {
+            command.renderable.render(buffer, deltaTime);
+          }
           break;
         case "pushScissorRect":
           buffer.pushScissorRect(command.x, command.y, command.width, command.height);
@@ -14601,6 +14660,7 @@ class CliRenderer extends EventEmitter9 {
   currentRenderBuffer;
   _isRunning = false;
   targetFps = 30;
+  maxFps = 60;
   automaticMemorySnapshot = false;
   memorySnapshotInterval;
   memorySnapshotTimer = null;
@@ -14626,7 +14686,8 @@ class CliRenderer extends EventEmitter9 {
   frameCount = 0;
   lastFpsTime = 0;
   currentFps = 0;
-  targetFrameTime = 0;
+  targetFrameTime = 1000 / this.targetFps;
+  minTargetFrameTime = 1000 / this.maxFps;
   immediateRerenderRequested = false;
   updateScheduled = false;
   liveRequestCounter = 0;
@@ -14688,6 +14749,7 @@ class CliRenderer extends EventEmitter9 {
   _onDestroy;
   inputHandlers = [];
   prependedInputHandlers = [];
+  idleResolvers = [];
   handleError = ((error) => {
     console.error(error);
     if (this._openConsoleOnError) {
@@ -14752,6 +14814,9 @@ Captured output:
     this.exitOnCtrlC = config.exitOnCtrlC === undefined ? true : config.exitOnCtrlC;
     this.resizeDebounceDelay = config.debounceDelay || 100;
     this.targetFps = config.targetFps || 30;
+    this.maxFps = config.maxFps || 60;
+    this.targetFrameTime = 1000 / this.targetFps;
+    this.minTargetFrameTime = 1000 / this.maxFps;
     this.memorySnapshotInterval = config.memorySnapshotInterval ?? 0;
     this.gatherStats = config.gatherStats || false;
     this.maxStatSamples = config.maxStatSamples || 300;
@@ -14847,14 +14912,33 @@ Captured output:
     return this.realStdoutWrite.call(this.stdout, chunk, encoding, callback);
   }
   requestRender() {
-    if (!this.rendering && !this.updateScheduled && !this._isRunning && this._controlState !== "explicit_suspended" /* EXPLICIT_SUSPENDED */) {
+    if (this._controlState === "explicit_suspended" /* EXPLICIT_SUSPENDED */) {
+      return;
+    }
+    if (this._isRunning) {
+      return;
+    }
+    if (this.rendering) {
+      this.immediateRerenderRequested = true;
+      return;
+    }
+    if (!this.updateScheduled && !this.renderTimeout) {
       this.updateScheduled = true;
-      process.nextTick(() => {
-        this.loop();
-        this.updateScheduled = false;
-      });
+      const now = Date.now();
+      const elapsed = now - this.lastTime;
+      const delay = Math.max(this.minTargetFrameTime - elapsed, 0);
+      if (delay === 0) {
+        process.nextTick(() => this.activateFrame());
+        return;
+      }
+      setTimeout(() => this.activateFrame(), delay);
     }
   }
+  async activateFrame() {
+    await this.loop();
+    this.updateScheduled = false;
+    this.resolveIdleIfNeeded();
+  }
   get useConsole() {
     return this._useConsole;
   }
@@ -14869,6 +14953,26 @@ Captured output:
   get isRunning() {
     return this._isRunning;
   }
+  isIdleNow() {
+    return !this._isRunning && !this.rendering && !this.renderTimeout && !this.updateScheduled && !this.immediateRerenderRequested;
+  }
+  resolveIdleIfNeeded() {
+    if (!this.isIdleNow())
+      return;
+    const resolvers = this.idleResolvers.splice(0);
+    for (const resolve4 of resolvers) {
+      resolve4();
+    }
+  }
+  idle() {
+    if (this._isDestroyed)
+      return Promise.resolve();
+    if (this.isIdleNow())
+      return Promise.resolve();
+    return new Promise((resolve4) => {
+      this.idleResolvers.push(resolve4);
+    });
+  }
   get resolution() {
     return this._resolution;
   }
@@ -15048,6 +15152,7 @@ Captured output:
     if (isCapabilityResponse(sequence)) {
       this.lib.processCapabilityResponse(this.rendererPtr, sequence);
       this._capabilities = this.lib.getTerminalCapabilities(this.rendererPtr);
+      this.emit("capabilities", this._capabilities);
       return true;
     }
     return false;
@@ -15470,6 +15575,9 @@ Captured output:
         clearTimeout(this.renderTimeout);
         this.renderTimeout = null;
       }
+      if (!this.rendering) {
+        this.resolveIdleIfNeeded();
+      }
     }
   }
   destroy() {
@@ -15522,6 +15630,7 @@ Captured output:
         console.error("Error in onDestroy callback:", e instanceof Error ? e.stack : String(e));
       }
     }
+    this.resolveIdleIfNeeded();
   }
   startRenderLoop() {
     if (!this._isRunning)
@@ -15530,12 +15639,12 @@ Captured output:
     this.frameCount = 0;
     this.lastFpsTime = this.lastTime;
     this.currentFps = 0;
-    this.targetFrameTime = 1000 / this.targetFps;
     this.loop();
   }
   async loop() {
     if (this.rendering || this._isDestroyed)
       return;
+    this.renderTimeout = null;
     this.rendering = true;
     if (this.renderTimeout) {
       clearTimeout(this.renderTimeout);
@@ -15585,16 +15694,21 @@ Captured output:
       if (this.gatherStats) {
         this.collectStatSample(overallFrameTime);
       }
-      if (this._isRunning) {
-        const delay = Math.max(1, this.targetFrameTime - Math.floor(overallFrameTime));
-        this.renderTimeout = setTimeout(() => this.loop(), delay);
+      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.rendering = false;
-    if (this.immediateRerenderRequested) {
-      this.immediateRerenderRequested = false;
-      this.loop();
-    }
+    this.resolveIdleIfNeeded();
   }
   intermediateRender() {
     this.immediateRerenderRequested = true;
@@ -15772,8 +15886,8 @@ Captured output:
       return this._paletteDetectionPromise;
     }
     if (!this._paletteDetector) {
-      const isTmux = this.capabilities?.terminal?.name?.toLowerCase()?.includes("tmux");
-      this._paletteDetector = createTerminalPalette(this.stdin, this.stdout, this.writeOut.bind(this), isTmux);
+      const isLegacyTmux = this.capabilities?.terminal?.name?.toLowerCase()?.includes("tmux") && this.capabilities?.terminal?.version?.localeCompare("3.6") < 0;
+      this._paletteDetector = createTerminalPalette(this.stdin, this.stdout, this.writeOut.bind(this), isLegacyTmux);
     }
     this._paletteDetectionPromise = this._paletteDetector.detect(options).then((result) => {
       this._cachedPalette = result;
@@ -15786,5 +15900,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, DebugOverlayCorner, createTextAttributes, 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, t, hastToStyledText, LinearScrollAccel, MacOSScrollAccel, StdinBuffer, parseAlign, 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, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=1108F3F0A4484C0264756E2164756E21
-//# sourceMappingURL=index-vhxgbbed.js.map
+//# debugId=E61ED12D8C1C497964756E2164756E21
+//# sourceMappingURL=index-0razn4m6.js.map