@fairyhunter13/opentui-core 0.1.119 → 0.1.121

package/3d.js

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

package/Renderable.d.ts

@@ -132,6 +132,7 @@ export declare abstract class Renderable extends BaseRenderable {
     protected frameBuffer: OptimizedBuffer | null;
     protected _focusable: boolean;
     protected _focused: boolean;
+    protected _hasFocusedDescendant: boolean;
     protected keypressHandler: ((key: KeyEvent) => void) | null;
     protected pasteHandler: ((event: PasteEvent) => void) | null;
     private _live;
@@ -174,8 +175,10 @@ export declare abstract class Renderable extends BaseRenderable {
     getSelectedText(): string;
     shouldStartSelection(x: number, y: number): boolean;
     focus(): void;
+    protected propagateFocusChange(hasFocus: boolean): void;
     blur(): void;
     get focused(): boolean;
+    get hasFocusedDescendant(): boolean;
     get live(): boolean;
     get liveCount(): number;
     set live(value: boolean);

package/{index-p0v1qbn9.js → index-7xsz0ndw.js}

@@ -5788,6 +5788,18 @@ var isShiftKey = (code) => {
 var isCtrlKey = (code) => {
   return ["Oa", "Ob", "Oc", "Od", "Oe", "[2^", "[3^", "[5^", "[6^", "[7^", "[8^"].includes(code);
 };
+var getCtrlKeyName = (charCode) => {
+  if (charCode === 0) {
+    return "space";
+  }
+  if (charCode >= 1 && charCode <= 26) {
+    return String.fromCharCode(charCode + 97 - 1);
+  }
+  if (charCode >= 28 && charCode <= 31) {
+    return String.fromCharCode(charCode + 64);
+  }
+  return;
+};
 var modifyOtherKeysRe = /^\x1b\[27;(\d+);(\d+)~$/;
 var parseKeypress = (s = "", options = {}) => {
   let parts;
@@ -5852,6 +5864,8 @@ var parseKeypress = (s = "", options = {}) => {
     source: "raw"
   };
   key.sequence = key.sequence || s || key.name;
+  const ctrlKeyName = s.length === 1 ? getCtrlKeyName(s.charCodeAt(0)) : undefined;
+  const metaCtrlKeyName = s.length === 2 && s[0] === "\x1B" ? getCtrlKeyName(s.charCodeAt(1)) : undefined;
   if (options.useKittyKeyboard) {
     const kittyResult = parseKittyKeyboard(s);
     if (kittyResult) {
@@ -5907,11 +5921,8 @@ var parseKeypress = (s = "", options = {}) => {
   } else if (s === " " || s === "\x1B ") {
     key.name = "space";
     key.meta = s.length === 2;
-  } else if (s === "\x00") {
-    key.name = "space";
-    key.ctrl = true;
-  } else if (s.length === 1 && s <= "\x1A") {
-    key.name = String.fromCharCode(s.charCodeAt(0) + 97 - 1);
+  } else if (ctrlKeyName) {
+    key.name = ctrlKeyName;
     key.ctrl = true;
   } else if (s.length === 1 && s >= "0" && s <= "9") {
     key.name = s;
@@ -5937,10 +5948,10 @@ var parseKeypress = (s = "", options = {}) => {
     } else {
       key.name = char;
     }
-  } else if (s.length === 2 && s[0] === "\x1B" && s[1] <= "\x1A") {
+  } else if (metaCtrlKeyName) {
     key.meta = true;
     key.ctrl = true;
-    key.name = String.fromCharCode(s.charCodeAt(1) + 97 - 1);
+    key.name = metaCtrlKeyName;
   } else if (parts = fnKeyRe.exec(s)) {
     const segs = [...s];
     if (segs[0] === "\x1B" && segs[1] === "\x1B") {
@@ -14620,6 +14631,7 @@ class Renderable extends BaseRenderable {
   frameBuffer = null;
   _focusable = false;
   _focused = false;
+  _hasFocusedDescendant = false;
   keypressHandler = null;
   pasteHandler = null;
   _live = false;
@@ -14769,11 +14781,24 @@ class Renderable extends BaseRenderable {
     };
     this.ctx._internalKeyInput.onInternal("keypress", this.keypressHandler);
     this.ctx._internalKeyInput.onInternal("paste", this.pasteHandler);
+    this.propagateFocusChange(true);
     this.emit("focused" /* FOCUSED */);
   }
+  propagateFocusChange(hasFocus) {
+    let parent = this.parent;
+    while (parent) {
+      if (parent._hasFocusedDescendant !== hasFocus) {
+        parent._hasFocusedDescendant = hasFocus;
+        parent.markDirty();
+      }
+      parent = parent.parent;
+    }
+    this.requestRender();
+  }
   blur() {
     if (!this._focused || !this._focusable)
       return;
+    this._ctx.blurRenderable(this);
     this._focused = false;
     this.requestRender();
     if (this.keypressHandler) {
@@ -14784,11 +14809,15 @@ class Renderable extends BaseRenderable {
       this.ctx._internalKeyInput.offInternal("paste", this.pasteHandler);
       this.pasteHandler = null;
     }
+    this.propagateFocusChange(false);
     this.emit("blurred" /* BLURRED */);
   }
   get focused() {
     return this._focused;
   }
+  get hasFocusedDescendant() {
+    return this._hasFocusedDescendant;
+  }
   get live() {
     return this._live;
   }
@@ -15324,7 +15353,10 @@ class Renderable extends BaseRenderable {
     }
     try {
       const widthMethod = this._ctx.widthMethod;
-      this.frameBuffer = OptimizedBuffer.create(w, h, widthMethod, { respectAlpha: true, id: `framebuffer-${this.id}` });
+      this.frameBuffer = OptimizedBuffer.create(w, h, widthMethod, {
+        respectAlpha: true,
+        id: `framebuffer-${this.id}`
+      });
     } catch (error) {
       console.error(`Failed to create frame buffer for ${this.id}:`, error);
       this.frameBuffer = null;
@@ -15720,7 +15752,14 @@ class Renderable extends BaseRenderable {
 class RootRenderable extends Renderable {
   renderList = [];
   constructor(ctx) {
-    super(ctx, { id: "__root__", zIndex: 0, visible: true, width: ctx.width, height: ctx.height, enableLayout: true });
+    super(ctx, {
+      id: "__root__",
+      zIndex: 0,
+      visible: true,
+      width: ctx.width,
+      height: ctx.height,
+      enableLayout: true
+    });
     if (this.yogaNode) {
       this.yogaNode.free();
     }
@@ -16562,6 +16601,41 @@ function mergeKeyBindings(defaults, custom) {
 function getKeyBindingKey(binding) {
   return `${binding.name}:${binding.ctrl ? 1 : 0}:${binding.shift ? 1 : 0}:${binding.meta ? 1 : 0}:${binding.super ? 1 : 0}`;
 }
+function getBaseCodeKeyName(baseCode) {
+  if (baseCode === undefined || baseCode < 32 || baseCode === 127) {
+    return;
+  }
+  try {
+    const name = String.fromCodePoint(baseCode);
+    if (name.length === 1 && name >= "A" && name <= "Z") {
+      return name.toLowerCase();
+    }
+    return name;
+  } catch {
+    return;
+  }
+}
+function getKeyBindingKeys(binding) {
+  const names = new Set([binding.name]);
+  const baseCodeName = getBaseCodeKeyName(binding.baseCode);
+  if (baseCodeName) {
+    names.add(baseCodeName);
+  }
+  return [...names].map((name) => getKeyBindingKey({ ...binding, name }));
+}
+function getKeyBindingAction(map, binding) {
+  for (const key of getKeyBindingKeys(binding)) {
+    const action = map.get(key);
+    if (action !== undefined) {
+      return action;
+    }
+  }
+  return;
+}
+function matchesKeyBinding(binding, match) {
+  const matchKey = getKeyBindingKey(match);
+  return getKeyBindingKeys(binding).includes(matchKey);
+}
 function buildKeyBindingsMap(bindings, aliasMap) {
   const map = new Map;
   const aliases = aliasMap || {};
@@ -16945,15 +17019,7 @@ class TerminalConsole extends EventEmitter8 {
       this.blur();
       return;
     }
-    const bindingKey = getKeyBindingKey({
-      name: event.name,
-      ctrl: event.ctrl,
-      shift: event.shift,
-      meta: event.meta,
-      super: event.super,
-      action: "scroll-up"
-    });
-    const action = this._keyBindingsMap.get(bindingKey);
+    const action = getKeyBindingAction(this._keyBindingsMap, event);
     if (action) {
       const handler = this._actionHandlers.get(action);
       if (handler) {
@@ -18984,7 +19050,11 @@ class CliRenderer extends EventEmitter9 {
   _capabilities = null;
   _latestPointer = { x: 0, y: 0 };
   _hasPointer = false;
-  _lastPointerModifiers = { shift: false, alt: false, ctrl: false };
+  _lastPointerModifiers = {
+    shift: false,
+    alt: false,
+    ctrl: false
+  };
   _currentMousePointerStyle = undefined;
   _currentFocusedRenderable = null;
   lifecyclePasses = new Set;
@@ -19104,7 +19174,7 @@ Captured output:
     const useKittyForParsing = kittyConfig !== null;
     this._keyHandler = new InternalKeyHandler;
     this._keyHandler.on("keypress", (event) => {
-      if (this.exitOnCtrlC && event.name === "c" && event.ctrl) {
+      if (this.exitOnCtrlC && matchesKeyBinding(event, { name: "c", ctrl: true })) {
         process.nextTick(() => {
           this.destroy();
         });
@@ -19215,15 +19285,18 @@ Captured output:
     if (this._currentFocusedRenderable === renderable)
       return;
     const prev = this.currentFocusedEditor;
-    if (this._currentFocusedRenderable) {
-      this._currentFocusedRenderable.blur();
-    }
+    this._currentFocusedRenderable?.blur();
     this._currentFocusedRenderable = renderable;
     const next = this.currentFocusedEditor;
     if (prev !== next) {
       this.emit("focused_editor" /* FOCUSED_EDITOR */, next, prev);
     }
   }
+  blurRenderable(renderable) {
+    if (this._currentFocusedRenderable === renderable) {
+      this._currentFocusedRenderable = null;
+    }
+  }
   setCapturedRenderable(renderable) {
     if (this.capturedRenderable === renderable) {
       return;
@@ -19803,14 +19876,20 @@ Captured output:
     if (mouseEvent.type === "drag" && this.currentSelection?.isDragging) {
       this.updateSelection(maybeRenderable, mouseEvent.x, mouseEvent.y);
       if (maybeRenderable) {
-        const event2 = new MouseEvent(maybeRenderable, { ...mouseEvent, isDragging: true });
+        const event2 = new MouseEvent(maybeRenderable, {
+          ...mouseEvent,
+          isDragging: true
+        });
         maybeRenderable.processMouseEvent(event2);
       }
       return true;
     }
     if (mouseEvent.type === "up" && this.currentSelection?.isDragging) {
       if (maybeRenderable) {
-        const event2 = new MouseEvent(maybeRenderable, { ...mouseEvent, isDragging: true });
+        const event2 = new MouseEvent(maybeRenderable, {
+          ...mouseEvent,
+          isDragging: true
+        });
         maybeRenderable.processMouseEvent(event2);
       }
       this.finishSelection();
@@ -19825,7 +19904,10 @@ Captured output:
     }
     if (!sameElement && (mouseEvent.type === "drag" || mouseEvent.type === "move")) {
       if (this.lastOverRenderable && this.lastOverRenderable !== this.capturedRenderable && !this.lastOverRenderable.isDestroyed) {
-        const event2 = new MouseEvent(this.lastOverRenderable, { ...mouseEvent, type: "out" });
+        const event2 = new MouseEvent(this.lastOverRenderable, {
+          ...mouseEvent,
+          type: "out"
+        });
         this.lastOverRenderable.processMouseEvent(event2);
       }
       this.lastOverRenderable = maybeRenderable;
@@ -19844,7 +19926,10 @@ Captured output:
       return true;
     }
     if (this.capturedRenderable && mouseEvent.type === "up") {
-      const event2 = new MouseEvent(this.capturedRenderable, { ...mouseEvent, type: "drag-end" });
+      const event2 = new MouseEvent(this.capturedRenderable, {
+        ...mouseEvent,
+        type: "drag-end"
+      });
       this.capturedRenderable.processMouseEvent(event2);
       this.capturedRenderable.processMouseEvent(new MouseEvent(this.capturedRenderable, mouseEvent));
       if (maybeRenderable) {
@@ -20583,7 +20668,7 @@ Captured output:
   }
 }
 
-export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, exports_src, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, 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, SystemClock, nonAlphanumericKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, 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, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, main, getTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, decodePasteBytes, stripAnsiSequences, detectLinks, TextBuffer, SpanInfoStruct, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, EditBuffer, EditorView, ANSI, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingKey, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
+export { __toESM, __commonJS, __export, __require, Edge, Gutter, MeasureMode, exports_src, isValidBorderStyle, parseBorderStyle, BorderChars, getBorderFromSides, getBorderSides, borderCharsToArray, BorderCharArrays, KeyEvent, PasteEvent, KeyHandler, InternalKeyHandler, RGBA, hexToRgb, rgbToHex, hsvToRgb, parseColor, fonts, measureText, getCharacterPositions, coordinateToCharacterIndex, renderFontToFrameBuffer, TextAttributes, ATTRIBUTE_BASE_BITS, ATTRIBUTE_BASE_MASK, getBaseAttributes, DebugOverlayCorner, TargetChannel, 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, SystemClock, nonAlphanumericKeys, parseKeypress, LinearScrollAccel, MacOSScrollAccel, 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, StdinParser, treeSitterToTextChunks, treeSitterToStyledText, addDefaultParsers, TreeSitterClient, DataPathsManager, getDataPaths, extensionToFiletype, basenameToFiletype, extToFiletype, pathToFiletype, infoStringToFiletype, main, getTreeSitterClient, ExtmarksController, createExtmarksController, TerminalPalette, createTerminalPalette, decodePasteBytes, stripAnsiSequences, detectLinks, TextBuffer, SpanInfoStruct, LogLevel2 as LogLevel, setRenderLibPath, resolveRenderLib, OptimizedBuffer, h, isVNode, maybeMakeRenderable, wrapWithDelegates, instantiate, delegate, isValidPercentage, LayoutEvents, RenderableEvents, isRenderable, BaseRenderable, Renderable, RootRenderable, EditBuffer, EditorView, ANSI, defaultKeyAliases, mergeKeyAliases, mergeKeyBindings, getKeyBindingAction, buildKeyBindingsMap, capture, ConsolePosition, TerminalConsole, getObjectsInViewport, EditBufferRenderableEvents, isEditBufferRenderable, EditBufferRenderable, buildKittyKeyboardFlags, MouseEvent, MouseButton, createCliRenderer, CliRenderEvents, RendererControlState, CliRenderer };
 
-//# debugId=67F59C2409FF014364756E2164756E21
-//# sourceMappingURL=index-p0v1qbn9.js.map
+//# debugId=4A1F7F558505C98564756E2164756E21
+//# sourceMappingURL=index-7xsz0ndw.js.map