Add support for alternative arrow keys (#40)

laravel · Aug 7, 2023 · e65a276 · e65a276
1 parent a7fc438
commit e65a276
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/src/Concerns/TypedValue.php b/src/Concerns/TypedValue.php
@@ -30,8 +30,8 @@ protected function trackTypedValue(string $default = '', bool $submit = true): v
         $this->on('key', function ($key) use ($submit) {
             if ($key[0] === "\e") {
                 match ($key) {
-                    Key::LEFT => $this->cursorPosition = max(0, $this->cursorPosition - 1),
-                    Key::RIGHT => $this->cursorPosition = min(mb_strlen($this->typedValue), $this->cursorPosition + 1),
+                    Key::LEFT, Key::LEFT_ARROW => $this->cursorPosition = max(0, $this->cursorPosition - 1),
+                    Key::RIGHT, Key::RIGHT_ARROW => $this->cursorPosition = min(mb_strlen($this->typedValue), $this->cursorPosition + 1),
                     Key::DELETE => $this->typedValue = mb_substr($this->typedValue, 0, $this->cursorPosition).mb_substr($this->typedValue, $this->cursorPosition + 1),
                     default => null,
                 };

diff --git a/src/ConfirmPrompt.php b/src/ConfirmPrompt.php
@@ -27,7 +27,7 @@ public function __construct(
         $this->on('key', fn ($key) => match ($key) {
             'y' => $this->confirmed = true,
             'n' => $this->confirmed = false,
-            Key::TAB, Key::UP, Key::DOWN, Key::LEFT, Key::RIGHT, 'h', 'j', 'k', 'l' => $this->confirmed = ! $this->confirmed,
+            Key::TAB, Key::UP, Key::UP_ARROW, Key::DOWN, Key::DOWN_ARROW, Key::LEFT, Key::LEFT_ARROW, Key::RIGHT, Key::RIGHT_ARROW, 'h', 'j', 'k', 'l' => $this->confirmed = ! $this->confirmed,
             Key::ENTER => $this->submit(),
             default => null,
         });

diff --git a/src/Key.php b/src/Key.php
@@ -12,6 +12,14 @@ class Key
 
     const LEFT = "\e[D";
 
+    const UP_ARROW = "\eOA";
+
+    const DOWN_ARROW = "\eOB";
+
+    const RIGHT_ARROW = "\eOC";
+
+    const LEFT_ARROW = "\eOD";
+
     const DELETE = "\e[3~";
 
     const BACKSPACE = "\177";

diff --git a/src/MultiSelectPrompt.php b/src/MultiSelectPrompt.php
@@ -52,8 +52,8 @@ public function __construct(
         $this->values = $this->default;
 
         $this->on('key', fn ($key) => match ($key) {
-            Key::UP, Key::LEFT, Key::SHIFT_TAB, 'k', 'h' => $this->highlightPrevious(),
-            Key::DOWN, Key::RIGHT, Key::TAB, 'j', 'l' => $this->highlightNext(),
+            Key::UP, Key::UP_ARROW, Key::LEFT, Key::LEFT_ARROW, Key::SHIFT_TAB, 'k', 'h' => $this->highlightPrevious(),
+            Key::DOWN, Key::DOWN_ARROW, Key::RIGHT, Key::RIGHT_ARROW, Key::TAB, 'j', 'l' => $this->highlightNext(),
             Key::SPACE => $this->toggleHighlighted(),
             Key::ENTER => $this->submit(),
             default => null,

diff --git a/src/SearchPrompt.php b/src/SearchPrompt.php
@@ -36,10 +36,10 @@ public function __construct(
         $this->trackTypedValue(submit: false);
 
         $this->on('key', fn ($key) => match ($key) {
-            Key::UP, Key::SHIFT_TAB => $this->highlightPrevious(),
-            Key::DOWN, Key::TAB => $this->highlightNext(),
+            Key::UP, Key::UP_ARROW, Key::SHIFT_TAB => $this->highlightPrevious(),
+            Key::DOWN, Key::DOWN_ARROW, Key::TAB => $this->highlightNext(),
             Key::ENTER => $this->highlighted !== null ? $this->submit() : $this->search(),
-            Key::LEFT, Key::RIGHT => $this->highlighted = null,
+            Key::LEFT, Key::LEFT_ARROW, Key::RIGHT, Key::RIGHT_ARROW => $this->highlighted = null,
             default => $this->search(),
         });
     }

diff --git a/src/SelectPrompt.php b/src/SelectPrompt.php
@@ -42,8 +42,8 @@ public function __construct(
         }
 
         $this->on('key', fn ($key) => match ($key) {
-            Key::UP, Key::LEFT, Key::SHIFT_TAB, 'k', 'h' => $this->highlightPrevious(),
-            Key::DOWN, Key::RIGHT, Key::TAB, 'j', 'l' => $this->highlightNext(),
+            Key::UP, Key::UP_ARROW, Key::LEFT, Key::LEFT_ARROW, Key::SHIFT_TAB, 'k', 'h' => $this->highlightPrevious(),
+            Key::DOWN, Key::DOWN_ARROW, Key::RIGHT, Key::RIGHT_ARROW, Key::TAB, 'j', 'l' => $this->highlightNext(),
             Key::ENTER => $this->submit(),
             default => null,
         });

diff --git a/src/SuggestPrompt.php b/src/SuggestPrompt.php
@@ -46,10 +46,10 @@ public function __construct(
         $this->options = $options instanceof Collection ? $options->all() : $options;
 
         $this->on('key', fn ($key) => match ($key) {
-            Key::UP, Key::SHIFT_TAB => $this->highlightPrevious(),
-            Key::DOWN, Key::TAB => $this->highlightNext(),
+            Key::UP, Key::UP_ARROW, Key::SHIFT_TAB => $this->highlightPrevious(),
+            Key::DOWN, Key::DOWN_ARROW, Key::TAB => $this->highlightNext(),
             Key::ENTER => $this->selectHighlighted(),
-            Key::LEFT, Key::RIGHT => $this->highlighted = null,
+            Key::LEFT, Key::LEFT_ARROW, Key::RIGHT, Key::RIGHT_ARROW => $this->highlighted = null,
             default => (function () {
                 $this->highlighted = null;
                 $this->matches = null;