@opentui/core 0.0.0-20251108-0c7899b1 → 0.0.0-20251112-613689c1

package/index.js

@@ -136,7 +136,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-z5bb2h2z.js";
+} from "./index-y49e47t2.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -2022,17 +2022,27 @@ class FrameBufferRenderable extends Renderable {
 // src/renderables/ASCIIFont.ts
 class ASCIIFontRenderable extends FrameBufferRenderable {
   selectable = true;
+  static _defaultOptions = {
+    text: "",
+    font: "tiny",
+    color: "#FFFFFF",
+    backgroundColor: "transparent",
+    selectionBg: undefined,
+    selectionFg: undefined,
+    selectable: true
+  };
   _text;
   _font;
-  _fg;
-  _bg;
+  _color;
+  _backgroundColor;
   _selectionBg;
   _selectionFg;
   lastLocalSelection = null;
   selectionHelper;
   constructor(ctx, options) {
-    const font = options.font || "tiny";
-    const text = options.text || "";
+    const defaultOptions = ASCIIFontRenderable._defaultOptions;
+    const font = options.font || defaultOptions.font;
+    const text = options.text || defaultOptions.text;
     const measurements = measureText({ text, font });
     super(ctx, {
       flexShrink: 0,
@@ -2043,8 +2053,8 @@ class ASCIIFontRenderable extends FrameBufferRenderable {
     });
     this._text = text;
     this._font = font;
-    this._fg = Array.isArray(options.fg) ? options.fg : [options.fg || RGBA.fromInts(255, 255, 255, 255)];
-    this._bg = options.bg || RGBA.fromValues(0, 0, 0, 0);
+    this._color = options.color || defaultOptions.color;
+    this._backgroundColor = options.backgroundColor || defaultOptions.backgroundColor;
     this._selectionBg = options.selectionBg ? parseColor(options.selectionBg) : undefined;
     this._selectionFg = options.selectionFg ? parseColor(options.selectionFg) : undefined;
     this.selectable = options.selectable ?? true;
@@ -2075,23 +2085,19 @@ class ASCIIFontRenderable extends FrameBufferRenderable {
     this.renderFontToBuffer();
     this.requestRender();
   }
-  get fg() {
-    return this._fg;
+  get color() {
+    return this._color;
   }
-  set fg(value) {
-    if (Array.isArray(value)) {
-      this._fg = value.map((color) => typeof color === "string" ? parseColor(color) : color);
-    } else {
-      this._fg = [typeof value === "string" ? parseColor(value) : value];
-    }
+  set color(value) {
+    this._color = value;
     this.renderFontToBuffer();
     this.requestRender();
   }
-  get bg() {
-    return this._bg;
+  get backgroundColor() {
+    return this._backgroundColor;
   }
-  set bg(value) {
-    this._bg = typeof value === "string" ? parseColor(value) : value;
+  set backgroundColor(value) {
+    this._backgroundColor = value;
     this.renderFontToBuffer();
     this.requestRender();
   }
@@ -2131,13 +2137,13 @@ class ASCIIFontRenderable extends FrameBufferRenderable {
   renderFontToBuffer() {
     if (this.isDestroyed)
       return;
-    this.frameBuffer.clear(this._bg);
+    this.frameBuffer.clear(parseColor(this._backgroundColor));
     renderFontToFrameBuffer(this.frameBuffer, {
       text: this._text,
       x: 0,
       y: 0,
-      fg: this._fg,
-      bg: this._bg,
+      color: this.color,
+      backgroundColor: this._backgroundColor,
       font: this._font
     });
     const selection = this.selectionHelper.getSelection();
@@ -2155,15 +2161,15 @@ class ASCIIFontRenderable extends FrameBufferRenderable {
     const startX = positions[selection.start] || 0;
     const endX = selection.end < positions.length ? positions[selection.end] : measureText({ text: this._text, font: this._font }).width;
     if (this._selectionBg) {
-      this.frameBuffer.fillRect(startX, 0, endX - startX, this.height, this._selectionBg);
+      this.frameBuffer.fillRect(startX, 0, endX - startX, this.height, parseColor(this._selectionBg));
     }
     if (this._selectionFg || this._selectionBg) {
       renderFontToFrameBuffer(this.frameBuffer, {
         text: selectedText,
         x: startX,
         y: 0,
-        fg: this._selectionFg ? [this._selectionFg] : this._fg,
-        bg: this._selectionBg || this._bg,
+        color: this._selectionFg ? this._selectionFg : this._color,
+        backgroundColor: this._selectionBg ? this._selectionBg : this._backgroundColor,
         font: this._font
       });
     }
@@ -4226,12 +4232,7 @@ class ScrollBoxRenderable extends BoxRenderable {
     this.internalId = ScrollBoxRenderable.idCounter++;
     this._stickyScroll = stickyScroll;
     this._stickyStart = stickyStart;
-    if (scrollAcceleration) {
-      this.scrollAccel = scrollAcceleration;
-    } else if (process.platform === "darwin") {
-      this.scrollAccel = new MacOSScrollAccel;
-    }
-    this.scrollAccel ??= new LinearScrollAccel;
+    this.scrollAccel = scrollAcceleration ?? new LinearScrollAccel;
     this.wrapper = new BoxRenderable(ctx, {
       flexDirection: "column",
       flexGrow: 1,
@@ -4704,8 +4705,8 @@ class SelectRenderable extends Renderable {
           text: option.name,
           x: contentX + 1 + indicatorWidth,
           y: itemY,
-          fg: nameColor,
-          bg: isSelected ? this._selectedBackgroundColor : bgColor,
+          color: nameColor,
+          backgroundColor: isSelected ? this._selectedBackgroundColor : bgColor,
           font: this._font
         });
         descX = contentX + 1 + indicatorWidth;
@@ -5763,7 +5764,7 @@ function mergeKeyBindings(defaults, custom) {
   return Array.from(map.values());
 }
 function getKeyBindingKey(binding) {
-  return `${binding.name}:${!!binding.ctrl}:${!!binding.shift}:${!!binding.meta}`;
+  return `${binding.name}:${binding.ctrl ? 1 : 0}:${binding.shift ? 1 : 0}:${binding.meta ? 1 : 0}:${binding.super ? 1 : 0}`;
 }
 function buildKeyBindingsMap(bindings) {
   const map = new Map;
@@ -5790,27 +5791,33 @@ var defaultTextareaKeybindings = [
   { name: "end", shift: true, action: "select-line-end" },
   { name: "a", ctrl: true, action: "buffer-home" },
   { name: "e", ctrl: true, action: "buffer-end" },
-  { name: "d", ctrl: true, action: "delete-line" },
+  { name: "f", ctrl: true, action: "move-right" },
+  { name: "b", ctrl: true, action: "move-left" },
+  { name: "d", ctrl: true, action: "delete-word-forward" },
+  { name: "w", ctrl: true, action: "delete-word-backward" },
   { name: "k", ctrl: true, action: "delete-to-line-end" },
+  { name: "u", ctrl: true, action: "delete-to-line-start" },
   { name: "backspace", action: "backspace" },
+  { name: "backspace", shift: true, action: "backspace" },
   { name: "delete", action: "delete" },
+  { name: "delete", shift: true, action: "delete" },
   { name: "return", action: "newline" },
   { name: "linefeed", action: "newline" },
   { name: "return", meta: true, action: "submit" },
-  { name: "z", ctrl: true, action: "undo" },
-  { name: "Z", ctrl: true, shift: true, action: "redo" },
-  { name: "y", ctrl: true, action: "redo" },
+  { name: "-", ctrl: true, action: "undo" },
+  { name: ".", ctrl: true, action: "redo" },
+  { name: "z", super: true, action: "undo" },
+  { name: "z", super: true, shift: true, action: "redo" },
   { name: "f", meta: true, action: "word-forward" },
   { name: "b", meta: true, action: "word-backward" },
   { name: "right", meta: true, action: "word-forward" },
   { name: "left", meta: true, action: "word-backward" },
-  { name: "F", meta: true, shift: true, action: "select-word-forward" },
-  { name: "B", meta: true, shift: true, action: "select-word-backward" },
+  { name: "f", meta: true, shift: true, action: "select-word-forward" },
+  { name: "b", meta: true, shift: true, action: "select-word-backward" },
   { name: "right", meta: true, shift: true, action: "select-word-forward" },
   { name: "left", meta: true, shift: true, action: "select-word-backward" },
-  { name: "d", meta: true, action: "delete-word-forward" },
-  { name: "backspace", meta: true, action: "delete-word-backward" },
-  { name: "w", ctrl: true, action: "delete-word-backward" }
+  { name: "d", meta: true, action: "delete-line" },
+  { name: "backspace", meta: true, action: "delete-word-backward" }
 ];
 
 class TextareaRenderable extends EditBufferRenderable {
@@ -5885,6 +5892,7 @@ class TextareaRenderable extends EditBufferRenderable {
       ["buffer-end", () => this.gotoBufferEnd()],
       ["delete-line", () => this.deleteLine()],
       ["delete-to-line-end", () => this.deleteToLineEnd()],
+      ["delete-to-line-start", () => this.deleteToLineStart()],
       ["backspace", () => this.deleteCharBackward()],
       ["delete", () => this.deleteChar()],
       ["newline", () => this.newLine()],
@@ -5908,11 +5916,13 @@ class TextareaRenderable extends EditBufferRenderable {
     const keyCtrl = typeof key === "string" ? false : key.ctrl;
     const keyShift = typeof key === "string" ? false : key.shift;
     const keyMeta = typeof key === "string" ? false : key.meta;
+    const keySuper = typeof key === "string" ? false : key.super;
     const bindingKey = getKeyBindingKey({
       name: keyName,
       ctrl: keyCtrl,
       shift: keyShift,
       meta: keyMeta,
+      super: keySuper,
       action: "move-left"
     });
     const action = this._keyBindingsMap.get(bindingKey);
@@ -6065,6 +6075,14 @@ class TextareaRenderable extends EditBufferRenderable {
     this.requestRender();
     return true;
   }
+  deleteToLineStart() {
+    const cursor = this.editorView.getCursor();
+    if (cursor.col > 0) {
+      this.editBuffer.deleteRange(cursor.row, 0, cursor.row, cursor.col);
+    }
+    this.requestRender();
+    return true;
+  }
   undo() {
     this._ctx.clearSelection();
     this.editBuffer.undo();
@@ -6405,5 +6423,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=33D29679C10495BA64756E2164756E21
+//# debugId=B9B7175D268B0B9C64756E2164756E21
 //# sourceMappingURL=index.js.map