@opentui/core 0.1.56 → 0.1.58

package/index.js

@@ -137,7 +137,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-rrt84m8j.js";
+} from "./index-crebvcxc.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -4573,6 +4573,7 @@ class DiffRenderable extends Renderable {
   _view;
   _parsedDiff = null;
   _parseError = null;
+  _fg;
   _filetype;
   _syntaxStyle;
   _wrapMode;
@@ -4610,6 +4611,7 @@ class DiffRenderable extends Renderable {
     });
     this._diff = options.diff ?? "";
     this._view = options.view ?? "unified";
+    this._fg = options.fg ? parseColor(options.fg) : undefined;
     this._filetype = options.filetype;
     this._syntaxStyle = options.syntaxStyle;
     this._wrapMode = options.wrapMode;
@@ -4770,6 +4772,7 @@ class DiffRenderable extends Renderable {
         syntaxStyle: this._syntaxStyle ?? SyntaxStyle.create(),
         width: "100%",
         height: "100%",
+        ...this._fg !== undefined && { fg: this._fg },
         ...drawUnstyledText !== undefined && { drawUnstyledText },
         ...this._selectionBg !== undefined && { selectionBg: this._selectionBg },
         ...this._selectionFg !== undefined && { selectionFg: this._selectionFg },
@@ -4801,6 +4804,9 @@ class DiffRenderable extends Renderable {
       if (this._selectionFg !== undefined) {
         existingRenderable.selectionFg = this._selectionFg;
       }
+      if (this._fg !== undefined) {
+        existingRenderable.fg = this._fg;
+      }
       return existingRenderable;
     }
   }
@@ -5412,8 +5418,78 @@ class DiffRenderable extends Renderable {
       this.rebuildView();
     }
   }
+  get fg() {
+    return this._fg;
+  }
+  set fg(value) {
+    const parsed = value ? parseColor(value) : undefined;
+    if (this._fg !== parsed) {
+      this._fg = parsed;
+      if (this.leftCodeRenderable) {
+        this.leftCodeRenderable.fg = parsed;
+      }
+      if (this.rightCodeRenderable) {
+        this.rightCodeRenderable.fg = parsed;
+      }
+    }
+  }
+}
+// src/lib/keymapping.ts
+var defaultKeyAliases = {
+  enter: "return",
+  esc: "escape"
+};
+function mergeKeyAliases(defaults, custom) {
+  return { ...defaults, ...custom };
+}
+function mergeKeyBindings(defaults, custom) {
+  const map = new Map;
+  for (const binding of defaults) {
+    const key = getKeyBindingKey(binding);
+    map.set(key, binding);
+  }
+  for (const binding of custom) {
+    const key = getKeyBindingKey(binding);
+    map.set(key, binding);
+  }
+  return Array.from(map.values());
+}
+function getKeyBindingKey(binding) {
+  return `${binding.name}:${binding.ctrl ? 1 : 0}:${binding.shift ? 1 : 0}:${binding.meta ? 1 : 0}:${binding.super ? 1 : 0}`;
+}
+function buildKeyBindingsMap(bindings, aliasMap) {
+  const map = new Map;
+  const aliases = aliasMap || {};
+  for (const binding of bindings) {
+    const key = getKeyBindingKey(binding);
+    map.set(key, binding.action);
+  }
+  for (const binding of bindings) {
+    const normalizedName = aliases[binding.name] || binding.name;
+    if (normalizedName !== binding.name) {
+      const aliasedKey = getKeyBindingKey({ ...binding, name: normalizedName });
+      map.set(aliasedKey, binding.action);
+    }
+  }
+  return map;
 }
+
 // src/renderables/Input.ts
+var defaultInputKeybindings = [
+  { name: "left", action: "move-left" },
+  { name: "right", action: "move-right" },
+  { name: "home", action: "move-home" },
+  { name: "end", action: "move-end" },
+  { name: "backspace", action: "delete-backward" },
+  { name: "delete", action: "delete-forward" },
+  { name: "return", action: "submit" },
+  { name: "linefeed", action: "submit" },
+  { name: "a", ctrl: true, action: "move-home" },
+  { name: "e", ctrl: true, action: "move-end" },
+  { name: "f", ctrl: true, action: "move-right" },
+  { name: "b", ctrl: true, action: "move-left" },
+  { name: "d", ctrl: true, action: "delete-forward" }
+];
 var InputRenderableEvents;
 ((InputRenderableEvents2) => {
   InputRenderableEvents2["INPUT"] = "input";
@@ -5435,6 +5511,9 @@ class InputRenderable extends Renderable {
   _cursorStyle;
   _maxLength;
   _lastCommittedValue = "";
+  _keyBindingsMap;
+  _keyAliasMap;
+  _keyBindings;
   _defaultOptions = {
     backgroundColor: "transparent",
     textColor: "#FFFFFF",
@@ -5464,6 +5543,10 @@ class InputRenderable extends Renderable {
     this._placeholderColor = parseColor(options.placeholderColor || this._defaultOptions.placeholderColor);
     this._cursorColor = parseColor(options.cursorColor || this._defaultOptions.cursorColor);
     this._cursorStyle = options.cursorStyle || this._defaultOptions.cursorStyle;
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, options.keyAliasMap || {});
+    this._keyBindings = options.keyBindings || [];
+    const mergedBindings = mergeKeyBindings(defaultInputKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
   }
   updateCursorPosition() {
     if (!this._focused)
@@ -5594,39 +5677,52 @@ class InputRenderable extends Renderable {
   handleKeyPress(key) {
     const keyName = typeof key === "string" ? key : key.name;
     const keySequence = typeof key === "string" ? key : key.sequence;
-    switch (keyName) {
-      case "left":
-        this.cursorPosition = this._cursorPosition - 1;
-        return true;
-      case "right":
-        this.cursorPosition = this._cursorPosition + 1;
-        return true;
-      case "home":
-        this.cursorPosition = 0;
-        return true;
-      case "end":
-        this.cursorPosition = this._value.length;
-        return true;
-      case "backspace":
-        this.deleteCharacter("backward");
-        return true;
-      case "delete":
-        this.deleteCharacter("forward");
-        return true;
-      case "return":
-      case "linefeed":
-        if (this._value !== this._lastCommittedValue) {
-          this._lastCommittedValue = this._value;
-          this.emit("change" /* CHANGE */, this._value);
-        }
-        this.emit("enter" /* ENTER */, this._value);
-        return true;
-      default:
-        if (keySequence && keySequence.length === 1 && keySequence.charCodeAt(0) >= 32 && keySequence.charCodeAt(0) <= 126 && (typeof key === "string" || !key.ctrl && !key.meta && !key.super && !key.hyper)) {
-          this.insertText(keySequence);
+    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 keyHyper = typeof key === "string" ? false : key.hyper;
+    const bindingKey = getKeyBindingKey({
+      name: keyName,
+      ctrl: keyCtrl,
+      shift: keyShift,
+      meta: keyMeta,
+      super: keySuper,
+      action: "move-left"
+    });
+    const action = this._keyBindingsMap.get(bindingKey);
+    if (action) {
+      switch (action) {
+        case "move-left":
+          this.cursorPosition = this._cursorPosition - 1;
           return true;
-        }
-        break;
+        case "move-right":
+          this.cursorPosition = this._cursorPosition + 1;
+          return true;
+        case "move-home":
+          this.cursorPosition = 0;
+          return true;
+        case "move-end":
+          this.cursorPosition = this._value.length;
+          return true;
+        case "delete-backward":
+          this.deleteCharacter("backward");
+          return true;
+        case "delete-forward":
+          this.deleteCharacter("forward");
+          return true;
+        case "submit":
+          if (this._value !== this._lastCommittedValue) {
+            this._lastCommittedValue = this._value;
+            this.emit("change" /* CHANGE */, this._value);
+          }
+          this.emit("enter" /* ENTER */, this._value);
+          return true;
+      }
+    }
+    if (keySequence && keySequence.length === 1 && keySequence.charCodeAt(0) >= 32 && keySequence.charCodeAt(0) <= 126 && !keyCtrl && !keyMeta && !keySuper && !keyHyper) {
+      this.insertText(keySequence);
+      return true;
     }
     return false;
   }
@@ -5706,6 +5802,16 @@ class InputRenderable extends Renderable {
       this._ctx.setCursorPosition(0, 0, false);
     }
   }
+  set keyBindings(bindings) {
+    this._keyBindings = bindings;
+    const mergedBindings = mergeKeyBindings(defaultInputKeybindings, bindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
+  set keyAliasMap(aliases) {
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, aliases);
+    const mergedBindings = mergeKeyBindings(defaultInputKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
 }
 // src/renderables/Slider.ts
 var defaultThumbBackgroundColor = RGBA.fromHex("#9a9ea3");
@@ -6306,7 +6412,7 @@ class ContentRenderable extends BoxRenderable {
   }
   _getVisibleChildren() {
     if (this._viewportCulling) {
-      return getObjectsInViewport(this.viewport, this.getChildrenSortedByPrimaryAxis(), this.primaryAxis).map((child) => child.num);
+      return getObjectsInViewport(this.viewport, this.getChildrenSortedByPrimaryAxis(), this.primaryAxis, 0).map((child) => child.num);
     }
     return this.getChildrenSortedByPrimaryAxis().map((child) => child.num);
   }
@@ -6858,6 +6964,16 @@ class ScrollBoxRenderable extends BoxRenderable {
   }
 }
 // src/renderables/Select.ts
+var defaultSelectKeybindings = [
+  { name: "up", action: "move-up" },
+  { name: "k", action: "move-up" },
+  { name: "down", action: "move-down" },
+  { name: "j", action: "move-down" },
+  { name: "up", shift: true, action: "move-up-fast" },
+  { name: "down", shift: true, action: "move-down-fast" },
+  { name: "return", action: "select-current" },
+  { name: "linefeed", action: "select-current" }
+];
 var SelectRenderableEvents;
 ((SelectRenderableEvents2) => {
   SelectRenderableEvents2["SELECTION_CHANGED"] = "selectionChanged";
@@ -6886,6 +7002,9 @@ class SelectRenderable extends Renderable {
   linesPerItem;
   fontHeight;
   _fastScrollStep;
+  _keyBindingsMap;
+  _keyAliasMap;
+  _keyBindings;
   _defaultOptions = {
     backgroundColor: "transparent",
     textColor: "#FFFFFF",
@@ -6925,6 +7044,10 @@ class SelectRenderable extends Renderable {
     this._descriptionColor = parseColor(options.descriptionColor || this._defaultOptions.descriptionColor);
     this._selectedDescriptionColor = parseColor(options.selectedDescriptionColor || this._defaultOptions.selectedDescriptionColor);
     this._fastScrollStep = options.fastScrollStep || this._defaultOptions.fastScrollStep;
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, options.keyAliasMap || {});
+    this._keyBindings = options.keyBindings || [];
+    const mergedBindings = mergeKeyBindings(defaultSelectKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
     this.requestRender();
   }
   renderSelf(buffer, deltaTime) {
@@ -7065,20 +7188,37 @@ class SelectRenderable extends Renderable {
   }
   handleKeyPress(key) {
     const keyName = typeof key === "string" ? key : key.name;
-    const isShift = typeof key !== "string" && key.shift;
-    switch (keyName) {
-      case "up":
-      case "k":
-        this.moveUp(isShift ? this._fastScrollStep : 1);
-        return true;
-      case "down":
-      case "j":
-        this.moveDown(isShift ? this._fastScrollStep : 1);
-        return true;
-      case "return":
-      case "linefeed":
-        this.selectCurrent();
-        return true;
+    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-up"
+    });
+    const action = this._keyBindingsMap.get(bindingKey);
+    if (action) {
+      switch (action) {
+        case "move-up":
+          this.moveUp(1);
+          return true;
+        case "move-down":
+          this.moveDown(1);
+          return true;
+        case "move-up-fast":
+          this.moveUp(this._fastScrollStep);
+          return true;
+        case "move-down-fast":
+          this.moveDown(this._fastScrollStep);
+          return true;
+        case "select-current":
+          this.selectCurrent();
+          return true;
+      }
     }
     return false;
   }
@@ -7184,6 +7324,16 @@ class SelectRenderable extends Renderable {
   set fastScrollStep(step) {
     this._fastScrollStep = step;
   }
+  set keyBindings(bindings) {
+    this._keyBindings = bindings;
+    const mergedBindings = mergeKeyBindings(defaultSelectKeybindings, bindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
+  set keyAliasMap(aliases) {
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, aliases);
+    const mergedBindings = mergeKeyBindings(defaultSelectKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
   set selectedIndex(value) {
     const newIndex = value ?? this._defaultOptions.selectedIndex;
     const clampedIndex = this._options.length > 0 ? Math.min(Math.max(0, newIndex), this._options.length - 1) : 0;
@@ -7195,6 +7345,14 @@ class SelectRenderable extends Renderable {
   }
 }
 // src/renderables/TabSelect.ts
+var defaultTabSelectKeybindings = [
+  { name: "left", action: "move-left" },
+  { name: "[", action: "move-left" },
+  { name: "right", action: "move-right" },
+  { name: "]", action: "move-right" },
+  { name: "return", action: "select-current" },
+  { name: "linefeed", action: "select-current" }
+];
 var TabSelectRenderableEvents;
 ((TabSelectRenderableEvents2) => {
   TabSelectRenderableEvents2["SELECTION_CHANGED"] = "selectionChanged";
@@ -7229,6 +7387,9 @@ class TabSelectRenderable extends Renderable {
   _showDescription;
   _showUnderline;
   _wrapSelection;
+  _keyBindingsMap;
+  _keyAliasMap;
+  _keyBindings;
   constructor(ctx, options) {
     const calculatedHeight = calculateDynamicHeight(options.showUnderline ?? true, options.showDescription ?? true);
     super(ctx, { ...options, height: calculatedHeight, buffered: true });
@@ -7246,6 +7407,10 @@ class TabSelectRenderable extends Renderable {
     this._selectedBackgroundColor = parseColor(options.selectedBackgroundColor || "#334455");
     this._selectedTextColor = parseColor(options.selectedTextColor || "#FFFF00");
     this._selectedDescriptionColor = parseColor(options.selectedDescriptionColor || "#CCCCCC");
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, options.keyAliasMap || {});
+    this._keyBindings = options.keyBindings || [];
+    const mergedBindings = mergeKeyBindings(defaultTabSelectKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
   }
   calculateDynamicHeight() {
     return calculateDynamicHeight(this._showUnderline, this._showDescription);
@@ -7396,19 +7561,31 @@ class TabSelectRenderable extends Renderable {
   }
   handleKeyPress(key) {
     const keyName = typeof key === "string" ? key : key.name;
-    switch (keyName) {
-      case "left":
-      case "[":
-        this.moveLeft();
-        return true;
-      case "right":
-      case "]":
-        this.moveRight();
-        return true;
-      case "return":
-      case "linefeed":
-        this.selectCurrent();
-        return true;
+    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);
+    if (action) {
+      switch (action) {
+        case "move-left":
+          this.moveLeft();
+          return true;
+        case "move-right":
+          this.moveRight();
+          return true;
+        case "select-current":
+          this.selectCurrent();
+          return true;
+      }
     }
     return false;
   }
@@ -7497,6 +7674,16 @@ class TabSelectRenderable extends Renderable {
     this.updateScrollOffset();
     this.requestRender();
   }
+  set keyBindings(bindings) {
+    this._keyBindings = bindings;
+    const mergedBindings = mergeKeyBindings(defaultTabSelectKeybindings, bindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
+  set keyAliasMap(aliases) {
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, aliases);
+    const mergedBindings = mergeKeyBindings(defaultTabSelectKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
 }
 // src/renderables/EditBufferRenderable.ts
 class EditBufferRenderable extends Renderable {
@@ -7990,31 +8177,6 @@ class EditBufferRenderable extends Renderable {
   }
 }
 
-// src/lib/keymapping.ts
-function mergeKeyBindings(defaults, custom) {
-  const map = new Map;
-  for (const binding of defaults) {
-    const key = getKeyBindingKey(binding);
-    map.set(key, binding);
-  }
-  for (const binding of custom) {
-    const key = getKeyBindingKey(binding);
-    map.set(key, binding);
-  }
-  return Array.from(map.values());
-}
-function getKeyBindingKey(binding) {
-  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;
-  for (const binding of bindings) {
-    const key = getKeyBindingKey(binding);
-    map.set(key, binding.action);
-  }
-  return map;
-}
-
 // src/renderables/Textarea.ts
 var defaultTextareaKeybindings = [
   { name: "left", action: "move-left" },
@@ -8067,6 +8229,8 @@ class TextareaRenderable extends EditBufferRenderable {
   _focusedBackgroundColor;
   _focusedTextColor;
   _keyBindingsMap;
+  _keyAliasMap;
+  _keyBindings;
   _actionHandlers;
   _initialValueSet = false;
   _submitListener = undefined;
@@ -8090,8 +8254,10 @@ class TextareaRenderable extends EditBufferRenderable {
     this._focusedBackgroundColor = parseColor(options.focusedBackgroundColor || options.backgroundColor || defaults.focusedBackgroundColor);
     this._focusedTextColor = parseColor(options.focusedTextColor || options.textColor || defaults.focusedTextColor);
     this._placeholder = options.placeholder ?? defaults.placeholder;
-    const mergedBindings = mergeKeyBindings(defaultTextareaKeybindings, options.keyBindings || []);
-    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings);
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, options.keyAliasMap || {});
+    this._keyBindings = options.keyBindings || [];
+    const mergedBindings = mergeKeyBindings(defaultTextareaKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
     this._actionHandlers = this.buildActionHandlers();
     this._submitListener = options.onSubmit;
     if (options.initialValue) {
@@ -8285,7 +8451,13 @@ class TextareaRenderable extends EditBufferRenderable {
     const select = options?.select ?? false;
     this.updateSelectionForMovement(select, true);
     const cursor = this.editorView.getCursor();
-    this.editBuffer.setCursor(cursor.row, 0);
+    if (cursor.col === 0 && cursor.row > 0) {
+      this.editBuffer.setCursor(cursor.row - 1, 0);
+      const prevLineEol = this.editBuffer.getEOL();
+      this.editBuffer.setCursor(prevLineEol.row, prevLineEol.col);
+    } else {
+      this.editBuffer.setCursor(cursor.row, 0);
+    }
     this.updateSelectionForMovement(select, false);
     this.requestRender();
     return true;
@@ -8293,8 +8465,14 @@ class TextareaRenderable extends EditBufferRenderable {
   gotoLineEnd(options) {
     const select = options?.select ?? false;
     this.updateSelectionForMovement(select, true);
+    const cursor = this.editorView.getCursor();
     const eol = this.editBuffer.getEOL();
-    this.editBuffer.setCursor(eol.row, eol.col);
+    const lineCount = this.editBuffer.getLineCount();
+    if (cursor.col === eol.col && cursor.row < lineCount - 1) {
+      this.editBuffer.setCursor(cursor.row + 1, 0);
+    } else {
+      this.editBuffer.setCursor(eol.row, eol.col);
+    }
     this.updateSelectionForMovement(select, false);
     this.requestRender();
     return true;
@@ -8463,8 +8641,14 @@ class TextareaRenderable extends EditBufferRenderable {
     return this._submitListener;
   }
   set keyBindings(bindings) {
+    this._keyBindings = bindings;
     const mergedBindings = mergeKeyBindings(defaultTextareaKeybindings, bindings);
-    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
+  }
+  set keyAliasMap(aliases) {
+    this._keyAliasMap = mergeKeyAliases(defaultKeyAliases, aliases);
+    const mergedBindings = mergeKeyBindings(defaultTextareaKeybindings, this._keyBindings);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings, this._keyAliasMap);
   }
   get extmarks() {
     return this.editorView.extmarks;
@@ -8657,5 +8841,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=C184A1CDDE59DFEA64756E2164756E21
+//# debugId=AA9B550CE879718B64756E2164756E21
 //# sourceMappingURL=index.js.map