@opentui/core 0.1.60 → 0.1.61

package/index.js

@@ -61,6 +61,7 @@ import {
   brightRed,
   brightWhite,
   brightYellow,
+  buildKeyBindingsMap,
   buildKittyKeyboardFlags,
   capture,
   clearEnvCache,
@@ -71,6 +72,7 @@ import {
   createTerminalPalette,
   createTextAttributes,
   cyan,
+  defaultKeyAliases,
   delegate,
   dim,
   env,
@@ -85,6 +87,7 @@ import {
   getBorderSides,
   getCharacterPositions,
   getDataPaths,
+  getKeyBindingKey,
   getObjectsInViewport,
   getTreeSitterClient,
   green,
@@ -102,6 +105,8 @@ import {
   main,
   maybeMakeRenderable,
   measureText,
+  mergeKeyAliases,
+  mergeKeyBindings,
   nonAlphanumericKeys,
   parseAlign,
   parseBoxSizing,
@@ -138,7 +143,7 @@ import {
   white,
   wrapWithDelegates,
   yellow
-} from "./index-916mvx7m.js";
+} from "./index-rysm4rsr.js";
 // src/text-buffer-view.ts
 class TextBufferView {
   lib;
@@ -692,6 +697,14 @@ class EditorView {
     this.guard();
     return this.lib.editorViewGetEOL(this.viewPtr);
   }
+  getVisualSOL() {
+    this.guard();
+    return this.lib.editorViewGetVisualSOL(this.viewPtr);
+  }
+  getVisualEOL() {
+    this.guard();
+    return this.lib.editorViewGetVisualEOL(this.viewPtr);
+  }
   getLineInfo() {
     this.guard();
     return this.lib.editorViewGetLineInfo(this.viewPtr);
@@ -5439,46 +5452,6 @@ class DiffRenderable extends Renderable {
     }
   }
 }
-// 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" },
@@ -5680,19 +5653,12 @@ class InputRenderable extends Renderable {
     }
   }
   handleKeyPress(key) {
-    const keyName = typeof key === "string" ? key : key.name;
-    const keySequence = typeof key === "string" ? key : key.sequence;
-    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,
+      name: key.name,
+      ctrl: key.ctrl,
+      shift: key.shift,
+      meta: key.meta,
+      super: key.super,
       action: "move-left"
     });
     const action = this._keyBindingsMap.get(bindingKey);
@@ -5725,13 +5691,13 @@ class InputRenderable extends Renderable {
           return true;
       }
     }
-    if (!keyCtrl && !keyMeta && !keySuper && !keyHyper) {
-      if (keyName === "space") {
+    if (!key.ctrl && !key.meta && !key.super && !key.hyper) {
+      if (key.name === "space") {
         this.insertText(" ");
         return true;
       }
-      if (keySequence && keySequence.length === 1 && keySequence.charCodeAt(0) >= 32 && keySequence.charCodeAt(0) <= 126) {
-        this.insertText(keySequence);
+      if (key.sequence && key.sequence.length === 1 && key.sequence.charCodeAt(0) >= 32 && key.sequence.charCodeAt(0) <= 126) {
+        this.insertText(key.sequence);
         return true;
       }
     }
@@ -6278,8 +6244,7 @@ class ScrollBarRenderable extends Renderable {
     }
   }
   handleKeyPress(key) {
-    const keyName = typeof key === "string" ? key : key.name;
-    switch (keyName) {
+    switch (key.name) {
       case "left":
       case "h":
         if (this.orientation !== "horizontal")
@@ -7198,17 +7163,12 @@ class SelectRenderable extends Renderable {
     this.requestRender();
   }
   handleKeyPress(key) {
-    const keyName = typeof key === "string" ? key : key.name;
-    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,
+      name: key.name,
+      ctrl: key.ctrl,
+      shift: key.shift,
+      meta: key.meta,
+      super: key.super,
       action: "move-up"
     });
     const action = this._keyBindingsMap.get(bindingKey);
@@ -7571,17 +7531,12 @@ class TabSelectRenderable extends Renderable {
     return this._tabWidth;
   }
   handleKeyPress(key) {
-    const keyName = typeof key === "string" ? key : key.name;
-    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,
+      name: key.name,
+      ctrl: key.ctrl,
+      shift: key.shift,
+      meta: key.meta,
+      super: key.super,
       action: "move-left"
     });
     const action = this._keyBindingsMap.get(bindingKey);
@@ -8209,10 +8164,20 @@ var defaultTextareaKeybindings = [
   { name: "end", shift: true, action: "select-buffer-end" },
   { name: "a", ctrl: true, action: "line-home" },
   { name: "e", ctrl: true, action: "line-end" },
+  { name: "a", ctrl: true, shift: true, action: "select-line-home" },
+  { name: "e", ctrl: true, shift: true, action: "select-line-end" },
+  { name: "a", meta: true, action: "visual-line-home" },
+  { name: "e", meta: true, action: "visual-line-end" },
+  { name: "a", meta: true, shift: true, action: "select-visual-line-home" },
+  { name: "e", meta: true, shift: true, action: "select-visual-line-end" },
   { name: "f", ctrl: true, action: "move-right" },
   { name: "b", ctrl: true, action: "move-left" },
-  { name: "w", ctrl: true, shift: true, action: "delete-word-forward" },
   { name: "w", ctrl: true, action: "delete-word-backward" },
+  { name: "backspace", ctrl: true, action: "delete-word-backward" },
+  { name: "d", meta: true, action: "delete-word-forward" },
+  { name: "delete", meta: true, action: "delete-word-forward" },
+  { name: "delete", ctrl: true, action: "delete-word-forward" },
+  { name: "d", ctrl: true, shift: true, action: "delete-line" },
   { name: "k", ctrl: true, action: "delete-to-line-end" },
   { name: "u", ctrl: true, action: "delete-to-line-start" },
   { name: "backspace", action: "backspace" },
@@ -8231,11 +8196,12 @@ var defaultTextareaKeybindings = [
   { name: "b", meta: true, action: "word-backward" },
   { name: "right", meta: true, action: "word-forward" },
   { name: "left", meta: true, action: "word-backward" },
+  { name: "right", ctrl: true, action: "word-forward" },
+  { name: "left", ctrl: 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-line" },
   { name: "backspace", meta: true, action: "delete-word-backward" }
 ];
 
@@ -8311,6 +8277,10 @@ class TextareaRenderable extends EditBufferRenderable {
       ["line-end", () => this.gotoLineEnd()],
       ["select-line-home", () => this.gotoLineHome({ select: true })],
       ["select-line-end", () => this.gotoLineEnd({ select: true })],
+      ["visual-line-home", () => this.gotoVisualLineHome()],
+      ["visual-line-end", () => this.gotoVisualLineEnd()],
+      ["select-visual-line-home", () => this.gotoVisualLineHome({ select: true })],
+      ["select-visual-line-end", () => this.gotoVisualLineEnd({ select: true })],
       ["select-buffer-home", () => this.gotoBufferHome({ select: true })],
       ["select-buffer-end", () => this.gotoBufferEnd({ select: true })],
       ["buffer-home", () => this.gotoBufferHome()],
@@ -8336,19 +8306,12 @@ class TextareaRenderable extends EditBufferRenderable {
     this.insertText(event.text);
   }
   handleKeyPress(key) {
-    const keyName = typeof key === "string" ? key : key.name;
-    const keySequence = typeof key === "string" ? key : key.sequence;
-    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,
+      name: key.name,
+      ctrl: key.ctrl,
+      shift: key.shift,
+      meta: key.meta,
+      super: key.super,
       action: "move-left"
     });
     const action = this._keyBindingsMap.get(bindingKey);
@@ -8358,20 +8321,20 @@ class TextareaRenderable extends EditBufferRenderable {
         return handler();
       }
     }
-    if (!keyCtrl && !keyMeta && !keySuper && !keyHyper) {
-      if (keyName === "space") {
+    if (!key.ctrl && !key.meta && !key.super && !key.hyper) {
+      if (key.name === "space") {
         this.insertText(" ");
         return true;
       }
-      if (keySequence) {
-        const firstCharCode = keySequence.charCodeAt(0);
+      if (key.sequence) {
+        const firstCharCode = key.sequence.charCodeAt(0);
         if (firstCharCode < 32) {
           return false;
         }
         if (firstCharCode === 127) {
           return false;
         }
-        this.insertText(keySequence);
+        this.insertText(key.sequence);
         return true;
       }
     }
@@ -8500,6 +8463,24 @@ class TextareaRenderable extends EditBufferRenderable {
     this.requestRender();
     return true;
   }
+  gotoVisualLineHome(options) {
+    const select = options?.select ?? false;
+    this.updateSelectionForMovement(select, true);
+    const sol = this.editorView.getVisualSOL();
+    this.editBuffer.setCursor(sol.logicalRow, sol.logicalCol);
+    this.updateSelectionForMovement(select, false);
+    this.requestRender();
+    return true;
+  }
+  gotoVisualLineEnd(options) {
+    const select = options?.select ?? false;
+    this.updateSelectionForMovement(select, true);
+    const eol = this.editorView.getVisualEOL();
+    this.editBuffer.setCursor(eol.logicalRow, eol.logicalCol);
+    this.updateSelectionForMovement(select, false);
+    this.requestRender();
+    return true;
+  }
   gotoBufferHome(options) {
     const select = options?.select ?? false;
     this.updateSelectionForMovement(select, true);
@@ -8865,5 +8846,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=8034F385F70736E264756E2164756E21
+//# debugId=7F98B9DEC58574A464756E2164756E21
 //# sourceMappingURL=index.js.map