Fix for up/down arrows + cursor position when textarea content contai…

…ns multi-byte strings (#137) * fix for up and down arrows for multi byte strings * Fix code styling * mb_strlen instead of whatever i was doing before --------- Co-authored-by: joetannenbaum <[email protected]>
laravel · Apr 18, 2024 · bf9a360 · bf9a360
1 parent dd33b5e
commit bf9a360
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 4 deletions.
diff --git a/src/TextareaPrompt.php b/src/TextareaPrompt.php
@@ -113,7 +113,7 @@ protected function handleUpKey(): void
         $lines = collect($this->lines());
 
         // Line length + 1 for the newline character
-        $lineLengths = $lines->map(fn ($line, $index) => mb_strwidth($line) + ($index === $lines->count() - 1 ? 0 : 1));
+        $lineLengths = $lines->map(fn ($line, $index) => mb_strlen($line) + ($index === $lines->count() - 1 ? 0 : 1));
 
         $currentLineIndex = $this->currentLineIndex();
 
@@ -145,13 +145,13 @@ protected function handleDownKey(): void
         $lines = collect($this->lines());
 
         // Line length + 1 for the newline character
-        $lineLengths = $lines->map(fn ($line, $index) => mb_strwidth($line) + ($index === $lines->count() - 1 ? 0 : 1));
+        $lineLengths = $lines->map(fn ($line, $index) => mb_strlen($line) + ($index === $lines->count() - 1 ? 0 : 1));
 
         $currentLineIndex = $this->currentLineIndex();
 
         if ($currentLineIndex === $lines->count() - 1) {
             // They're already at the last line, jump them to the last position
-            $this->cursorPosition = mb_strwidth($lines->implode(PHP_EOL));
+            $this->cursorPosition = mb_strlen($lines->implode(PHP_EOL));
 
             return;
         }
@@ -205,7 +205,7 @@ protected function currentLineIndex(): int
         $totalLineLength = 0;
 
         return (int) collect($this->lines())->search(function ($line) use (&$totalLineLength) {
-            $totalLineLength += mb_strwidth($line) + 1;
+            $totalLineLength += mb_strlen($line) + 1;
 
             return $totalLineLength > $this->cursorPosition;
         }) ?: 0;

diff --git a/tests/Feature/TextareaPromptTest.php b/tests/Feature/TextareaPromptTest.php
@@ -198,3 +198,50 @@
 
     expect($result)->toBe("abc\ndeg\nf");
 });
+
+it('correctly handles multi-byte strings for the down arrow', function () {
+    Prompt::fake([
+        'ａ', 'ｂ', Key::ENTER,
+        'ｃ', 'ｄ', 'ｅ', 'ｆ', Key::ENTER,
+        'ｇ', 'ｈ', 'ｉ', 'j', 'k', 'l', 'm', 'n', 'n', 'o', 'p', 'q', 'r', 's', Key::ENTER,
+        't', 'u', 'v', 'w', 'x', 'y', 'z',
+        Key::UP,
+        Key::UP,
+        Key::UP,
+        Key::UP,
+        Key::RIGHT,
+        Key::DOWN,
+        'y', 'o',
+        Key::CTRL_D,
+    ]);
+
+    $result = textarea(label: 'What is your name?');
+
+    expect($result)->toBe(
+        "ａｂ\nｃyoｄｅｆ\nｇｈｉjklmnnopqrs\ntuvwxyz"
+    );
+});
+
+it('correctly handles multi-byte strings for the up arrow', function () {
+    Prompt::fake([
+        'ａ', 'ｂ', Key::ENTER,
+        'ｃ', 'ｄ', 'ｅ', 'ｆ', Key::ENTER,
+        'ｇ', 'ｈ', 'ｉ', 'j', 'k', 'l', 'm', 'n', 'n', 'o', 'p', 'q', 'r', 's', Key::ENTER,
+        't', 'u', 'v', 'w', 'x', 'y', 'z',
+        Key::UP,
+        Key::UP,
+        Key::UP,
+        Key::UP,
+        Key::RIGHT,
+        Key::DOWN,
+        Key::UP,
+        'y', 'o',
+        Key::CTRL_D,
+    ]);
+
+    $result = textarea(label: 'What is your name?');
+
+    expect($result)->toBe(
+        "ａyoｂ\nｃｄｅｆ\nｇｈｉjklmnnopqrs\ntuvwxyz"
+    );
+});