@opentui/core 0.1.29 → 0.1.30

package/index.js

@@ -131,7 +131,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-bztetjc3.js";
+} from "./index-0qmm1k4p.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -329,6 +329,10 @@ class EditBuffer extends EventEmitter {
     this.guard();
     this.lib.editBufferDeleteCharBackward(this.bufferPtr);
   }
+  deleteRange(startLine, startCol, endLine, endCol) {
+    this.guard();
+    this.lib.editBufferDeleteRange(this.bufferPtr, startLine, startCol, endLine, endCol);
+  }
   newLine() {
     this.guard();
     this.lib.editBufferNewLine(this.bufferPtr);
@@ -373,6 +377,33 @@ class EditBuffer extends EventEmitter {
     this.guard();
     return this.lib.editBufferGetCursorPosition(this.bufferPtr);
   }
+  getNextWordBoundary() {
+    this.guard();
+    const boundary = this.lib.editBufferGetNextWordBoundary(this.bufferPtr);
+    return {
+      line: boundary.row,
+      visualColumn: boundary.col,
+      offset: boundary.offset
+    };
+  }
+  getPrevWordBoundary() {
+    this.guard();
+    const boundary = this.lib.editBufferGetPrevWordBoundary(this.bufferPtr);
+    return {
+      line: boundary.row,
+      visualColumn: boundary.col,
+      offset: boundary.offset
+    };
+  }
+  getEOL() {
+    this.guard();
+    const boundary = this.lib.editBufferGetEOL(this.bufferPtr);
+    return {
+      line: boundary.row,
+      visualColumn: boundary.col,
+      offset: boundary.offset
+    };
+  }
   debugLogRope() {
     this.guard();
     this.lib.editBufferDebugLogRope(this.bufferPtr);
@@ -582,6 +613,18 @@ class EditorView {
     this.guard();
     this.lib.editorViewSetCursorByOffset(this.viewPtr, offset);
   }
+  getNextWordBoundary() {
+    this.guard();
+    return this.lib.editorViewGetNextWordBoundary(this.viewPtr);
+  }
+  getPrevWordBoundary() {
+    this.guard();
+    return this.lib.editorViewGetPrevWordBoundary(this.viewPtr);
+  }
+  getEOL() {
+    this.guard();
+    return this.lib.editorViewGetEOL(this.viewPtr);
+  }
   getLineInfo() {
     this.guard();
     const textBufferViewPtr = this.lib.editorViewGetTextBufferView(this.viewPtr);
@@ -5026,8 +5069,12 @@ class EditBufferRenderable extends Renderable {
   get visualCursor() {
     return this.editorView.getVisualCursor();
   }
+  get cursorOffset() {
+    return this.editorView.getVisualCursor().offset;
+  }
   set cursorOffset(offset) {
     this.editorView.setCursorByOffset(offset);
+    this.requestRender();
   }
   get textColor() {
     return this._textColor;
@@ -5247,9 +5294,94 @@ class EditBufferRenderable extends Renderable {
     this.editBuffer.setSyntaxStyle(style);
     this.requestRender();
   }
+  addHighlight(lineIdx, highlight) {
+    this.editBuffer.addHighlight(lineIdx, highlight);
+    this.requestRender();
+  }
+  addHighlightByCharRange(highlight) {
+    this.editBuffer.addHighlightByCharRange(highlight);
+    this.requestRender();
+  }
+  removeHighlightsByRef(hlRef) {
+    this.editBuffer.removeHighlightsByRef(hlRef);
+    this.requestRender();
+  }
+  clearLineHighlights(lineIdx) {
+    this.editBuffer.clearLineHighlights(lineIdx);
+    this.requestRender();
+  }
+  clearAllHighlights() {
+    this.editBuffer.clearAllHighlights();
+    this.requestRender();
+  }
+  getLineHighlights(lineIdx) {
+    return this.editBuffer.getLineHighlights(lineIdx);
+  }
+}
+
+// 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}:${!!binding.shift}:${!!binding.meta}`;
+}
+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" },
+  { name: "right", action: "move-right" },
+  { name: "up", action: "move-up" },
+  { name: "down", action: "move-down" },
+  { name: "left", shift: true, action: "select-left" },
+  { name: "right", shift: true, action: "select-right" },
+  { name: "up", shift: true, action: "select-up" },
+  { name: "down", shift: true, action: "select-down" },
+  { name: "home", action: "line-home" },
+  { name: "end", action: "line-end" },
+  { name: "home", shift: true, action: "select-line-home" },
+  { 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: "k", ctrl: true, action: "delete-to-line-end" },
+  { name: "backspace", action: "backspace" },
+  { name: "delete", action: "delete" },
+  { name: "return", action: "newline" },
+  { name: "enter", action: "newline" },
+  { name: "z", ctrl: true, action: "undo" },
+  { name: "Z", ctrl: true, shift: true, action: "redo" },
+  { name: "y", ctrl: 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: "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" }
+];
+
 class TextareaRenderable extends EditBufferRenderable {
   _placeholder;
   _unfocusedBackgroundColor;
@@ -5257,6 +5389,8 @@ class TextareaRenderable extends EditBufferRenderable {
   _focusedBackgroundColor;
   _focusedTextColor;
   _placeholderColor;
+  _keyBindingsMap;
+  _actionHandlers;
   static defaults = {
     value: "",
     backgroundColor: "transparent",
@@ -5280,11 +5414,45 @@ class TextareaRenderable extends EditBufferRenderable {
     this._focusedTextColor = parseColor(options.focusedTextColor || options.textColor || defaults.focusedTextColor);
     this._placeholder = options.placeholder ?? defaults.placeholder;
     this._placeholderColor = parseColor(options.placeholderColor || defaults.placeholderColor);
+    const mergedBindings = mergeKeyBindings(defaultTextareaKeybindings, options.keyBindings || []);
+    this._keyBindingsMap = buildKeyBindingsMap(mergedBindings);
+    this._actionHandlers = this.buildActionHandlers();
     this.updateValue(options.value ?? defaults.value);
     this.updateColors();
     this.editBuffer.setPlaceholder(this._placeholder);
     this.editBuffer.setPlaceholderColor(this._placeholderColor);
   }
+  buildActionHandlers() {
+    return new Map([
+      ["move-left", () => this.moveCursorLeft()],
+      ["move-right", () => this.moveCursorRight()],
+      ["move-up", () => this.moveCursorUp()],
+      ["move-down", () => this.moveCursorDown()],
+      ["select-left", () => this.moveCursorLeft({ select: true })],
+      ["select-right", () => this.moveCursorRight({ select: true })],
+      ["select-up", () => this.moveCursorUp({ select: true })],
+      ["select-down", () => this.moveCursorDown({ select: true })],
+      ["line-home", () => this.gotoLineHome()],
+      ["line-end", () => this.gotoLineEnd()],
+      ["select-line-home", () => this.gotoLineHome({ select: true })],
+      ["select-line-end", () => this.gotoLineEnd({ select: true })],
+      ["buffer-home", () => this.gotoBufferHome()],
+      ["buffer-end", () => this.gotoBufferEnd()],
+      ["delete-line", () => this.deleteLine()],
+      ["delete-to-line-end", () => this.deleteToLineEnd()],
+      ["backspace", () => this.deleteCharBackward()],
+      ["delete", () => this.deleteChar()],
+      ["newline", () => this.newLine()],
+      ["undo", () => this.undo()],
+      ["redo", () => this.redo()],
+      ["word-forward", () => this.moveWordForward()],
+      ["word-backward", () => this.moveWordBackward()],
+      ["select-word-forward", () => this.moveWordForward({ select: true })],
+      ["select-word-backward", () => this.moveWordBackward({ select: true })],
+      ["delete-word-forward", () => this.deleteWordForward()],
+      ["delete-word-backward", () => this.deleteWordBackward()]
+    ]);
+  }
   handlePaste(text) {
     this.insertText(text);
   }
@@ -5294,65 +5462,21 @@ 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;
-    if (keyCtrl && keyName === "z" && !keyShift) {
-      this.undo();
-      return true;
-    } else if (keyCtrl && keyName === "y" || keyCtrl && keyShift && keyName === "z") {
-      this.redo();
-      return true;
-    } else if (keyName === "left") {
-      this.handleShiftSelection(keyShift, true);
-      this.moveCursorLeft();
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyName === "right") {
-      this.handleShiftSelection(keyShift, true);
-      this.moveCursorRight();
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyName === "up") {
-      this.handleShiftSelection(keyShift, true);
-      this.moveCursorUp();
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyName === "down") {
-      this.handleShiftSelection(keyShift, true);
-      this.moveCursorDown();
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyName === "home") {
-      this.handleShiftSelection(keyShift, true);
-      const cursor = this.editorView.getCursor();
-      this.editBuffer.setCursor(cursor.row, 0);
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyName === "end") {
-      this.handleShiftSelection(keyShift, true);
-      this.gotoLineEnd();
-      this.handleShiftSelection(keyShift, false);
-      return true;
-    } else if (keyCtrl && keyName === "a") {
-      this.editBuffer.setCursor(0, 0);
-      return true;
-    } else if (keyCtrl && keyName === "e") {
-      this.gotoBufferEnd();
-      return true;
-    } else if (keyCtrl && keyName === "d") {
-      this.deleteLine();
-      return true;
-    } else if (keyCtrl && keyName === "k") {
-      this.deleteToLineEnd();
-      return true;
-    } else if (keyName === "backspace") {
-      this.deleteCharBackward();
-      return true;
-    } else if (keyName === "delete") {
-      this.deleteChar();
-      return true;
-    } else if (keyName === "return" || keyName === "enter") {
-      this.newLine();
-      return true;
-    } else if (keySequence && !keyCtrl && !keyMeta) {
+    const bindingKey = getKeyBindingKey({
+      name: keyName,
+      ctrl: keyCtrl,
+      shift: keyShift,
+      meta: keyMeta,
+      action: "move-left"
+    });
+    const action = this._keyBindingsMap.get(bindingKey);
+    if (action) {
+      const handler = this._actionHandlers.get(action);
+      if (handler) {
+        return handler();
+      }
+    }
+    if (keySequence && !keyCtrl && !keyMeta) {
       const firstCharCode = keySequence.charCodeAt(0);
       if (firstCharCode < 32) {
         return false;
@@ -5399,20 +5523,22 @@ class TextareaRenderable extends EditBufferRenderable {
   deleteChar() {
     if (this.hasSelection()) {
       this.deleteSelectedText();
-      return;
+      return true;
     }
     this._ctx.clearSelection();
     this.editBuffer.deleteChar();
     this.requestRender();
+    return true;
   }
   deleteCharBackward() {
     if (this.hasSelection()) {
       this.deleteSelectedText();
-      return;
+      return true;
     }
     this._ctx.clearSelection();
     this.editBuffer.deleteCharBackward();
     this.requestRender();
+    return true;
   }
   deleteSelectedText() {
     this.editorView.deleteSelectedText();
@@ -5423,69 +5549,144 @@ class TextareaRenderable extends EditBufferRenderable {
     this._ctx.clearSelection();
     this.editBuffer.newLine();
     this.requestRender();
+    return true;
   }
   deleteLine() {
     this._ctx.clearSelection();
     this.editBuffer.deleteLine();
     this.requestRender();
+    return true;
   }
-  moveCursorLeft() {
+  moveCursorLeft(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
     this.editBuffer.moveCursorLeft();
+    this.handleShiftSelection(select, false);
     this.requestRender();
+    return true;
   }
-  moveCursorRight() {
+  moveCursorRight(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
     this.editBuffer.moveCursorRight();
+    this.handleShiftSelection(select, false);
     this.requestRender();
+    return true;
   }
-  moveCursorUp() {
+  moveCursorUp(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
     this.editorView.moveUpVisual();
+    this.handleShiftSelection(select, false);
     this.requestRender();
+    return true;
   }
-  moveCursorDown() {
+  moveCursorDown(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
     this.editorView.moveDownVisual();
+    this.handleShiftSelection(select, false);
     this.requestRender();
+    return true;
   }
   gotoLine(line) {
     this.editBuffer.gotoLine(line);
     this.requestRender();
   }
-  gotoLineEnd() {
+  gotoLineHome(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
     const cursor = this.editorView.getCursor();
-    this.editBuffer.gotoLine(9999);
-    const afterCursor = this.editorView.getCursor();
-    if (afterCursor.row !== cursor.row) {
-      this.editBuffer.setCursor(cursor.row, 9999);
-    }
+    this.editBuffer.setCursor(cursor.row, 0);
+    this.handleShiftSelection(select, false);
+    this.requestRender();
+    return true;
+  }
+  gotoLineEnd(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
+    const eol = this.editBuffer.getEOL();
+    this.editBuffer.setCursor(eol.line, eol.visualColumn);
+    this.handleShiftSelection(select, false);
+    this.requestRender();
+    return true;
+  }
+  gotoBufferHome() {
+    this.editBuffer.setCursor(0, 0);
     this.requestRender();
+    return true;
   }
   gotoBufferEnd() {
     this.editBuffer.gotoLine(999999);
     this.requestRender();
+    return true;
   }
   deleteToLineEnd() {
     const cursor = this.editorView.getCursor();
-    const startCol = cursor.col;
-    const tempCursor = this.editorView.getCursor();
-    this.editBuffer.setCursor(tempCursor.row, 9999);
-    const endCursor = this.editorView.getCursor();
-    const endCol = endCursor.col;
-    this.editBuffer.setCursor(cursor.row, startCol);
-    if (endCol > startCol) {
-      for (let i = 0;i < endCol - startCol; i++) {
-        this.deleteChar();
-      }
+    const eol = this.editBuffer.getEOL();
+    if (eol.visualColumn > cursor.col) {
+      this.editBuffer.deleteRange(cursor.row, cursor.col, eol.line, eol.visualColumn);
     }
     this.requestRender();
+    return true;
   }
   undo() {
     this._ctx.clearSelection();
     this.editBuffer.undo();
     this.requestRender();
+    return true;
   }
   redo() {
     this._ctx.clearSelection();
     this.editBuffer.redo();
     this.requestRender();
+    return true;
+  }
+  moveWordForward(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
+    const nextWord = this.editBuffer.getNextWordBoundary();
+    this.editBuffer.setCursorByOffset(nextWord.offset);
+    this.handleShiftSelection(select, false);
+    this.requestRender();
+    return true;
+  }
+  moveWordBackward(options) {
+    const select = options?.select ?? false;
+    this.handleShiftSelection(select, true);
+    const prevWord = this.editBuffer.getPrevWordBoundary();
+    this.editBuffer.setCursorByOffset(prevWord.offset);
+    this.handleShiftSelection(select, false);
+    this.requestRender();
+    return true;
+  }
+  deleteWordForward() {
+    if (this.hasSelection()) {
+      this.deleteSelectedText();
+      return true;
+    }
+    const currentCursor = this.editBuffer.getCursorPosition();
+    const nextWord = this.editBuffer.getNextWordBoundary();
+    if (nextWord.offset > currentCursor.offset) {
+      this.editBuffer.deleteRange(currentCursor.line, currentCursor.visualColumn, nextWord.line, nextWord.visualColumn);
+    }
+    this._ctx.clearSelection();
+    this.requestRender();
+    return true;
+  }
+  deleteWordBackward() {
+    if (this.hasSelection()) {
+      this.deleteSelectedText();
+      return true;
+    }
+    const currentCursor = this.editBuffer.getCursorPosition();
+    const prevWord = this.editBuffer.getPrevWordBoundary();
+    if (prevWord.offset < currentCursor.offset) {
+      this.editBuffer.deleteRange(prevWord.line, prevWord.visualColumn, currentCursor.line, currentCursor.visualColumn);
+    }
+    this._ctx.clearSelection();
+    this.requestRender();
+    return true;
   }
   handleShiftSelection(shiftPressed, isBeforeMovement) {
     if (!this.selectable)
@@ -5566,36 +5767,6 @@ class TextareaRenderable extends EditBufferRenderable {
       this.requestRender();
     }
   }
-  get cursorOffset() {
-    return this.editorView.getVisualCursor().offset;
-  }
-  set cursorOffset(offset) {
-    this.editorView.setCursorByOffset(offset);
-    this.requestRender();
-  }
-  addHighlight(lineIdx, highlight) {
-    this.editBuffer.addHighlight(lineIdx, highlight);
-    this.requestRender();
-  }
-  addHighlightByCharRange(highlight) {
-    this.editBuffer.addHighlightByCharRange(highlight);
-    this.requestRender();
-  }
-  removeHighlightsByRef(hlRef) {
-    this.editBuffer.removeHighlightsByRef(hlRef);
-    this.requestRender();
-  }
-  clearLineHighlights(lineIdx) {
-    this.editBuffer.clearLineHighlights(lineIdx);
-    this.requestRender();
-  }
-  clearAllHighlights() {
-    this.editBuffer.clearAllHighlights();
-    this.requestRender();
-  }
-  getLineHighlights(lineIdx) {
-    return this.editBuffer.getLineHighlights(lineIdx);
-  }
 }
 export {
   yellow,
@@ -5777,5 +5948,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=B4995BB40805F64B64756E2164756E21
+//# debugId=C45C47BFE87C68C464756E2164756E21
 //# sourceMappingURL=index.js.map