hide overflow

knobik · Mar 22, 2024 · 0a65e13 · 0a65e13
1 parent 7ae1ab6
commit 0a65e13
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/ExplorerPrompt.php b/src/ExplorerPrompt.php
@@ -307,7 +307,7 @@ protected function calculateSelectedValue(): void
         if (empty($keys)) {
             $this->selectedValue = null;
         } else {
-            $this->selectedValue = array_search($filteredItems[$keys[$this->highlighted]], $filteredItems);
+            $this->selectedValue = array_search($filteredItems[$keys[$this->highlighted]], $filteredItems, true);
         }
     }
 
@@ -350,7 +350,7 @@ protected function keyEnter(): void
         $this->submit();
     }
 
-    protected function keyForwardSlash()
+    protected function keyForwardSlash(): void
     {
         if ($this->filteringEnabled) {
             $this->setFilteringState();
@@ -401,7 +401,7 @@ protected function setActiveState(): self
         return $this;
     }
 
-    protected function recalculateScroll()
+    protected function recalculateScroll(): void
     {
         $this->setVisibleItems($this->userScroll);
     }

diff --git a/src/Themes/Default/ExplorerPromptRenderer.php b/src/Themes/Default/ExplorerPromptRenderer.php
@@ -50,6 +50,8 @@ public function __invoke(ExplorerPrompt $prompt): string
                     return $this->prompt->highlighted === $index ? $this->inverse($label) : $label;
                 });
 
+            $this->minWidth = $this->prompt->terminal()->cols();
+
             if ($this->prompt->header) {
                 $body->prepend(
                     $this->makeColumn(
@@ -59,8 +61,6 @@ public function __invoke(ExplorerPrompt $prompt): string
                 );
             }
 
-            $this->minWidth = $this->prompt->terminal()->cols();
-
             $this->when(
                 $this->prompt->showFilterBox(),
                 fn() => $this->box(
@@ -77,13 +77,17 @@ public function __invoke(ExplorerPrompt $prompt): string
 
     protected function makeColumn(array $values): string
     {
-        return collect($values)
-            ->values()
-            ->map(function ($item, $index) {
-                $width = $this->calculateColumnWidth($index);
-                return mb_str_pad($item ?? '', $width, ' ', $this->prompt->getColumnAlignment($index)->toPadding());
-            })
-            ->join(' ');
+        return mb_substr(
+            collect($values)
+                ->values()
+                ->map(function ($item, $index) {
+                    $width = $this->calculateColumnWidth($index);
+                    return mb_str_pad($item ?? '', $width, ' ', $this->prompt->getColumnAlignment($index)->toPadding());
+                })
+                ->join(' '),
+            0,
+            $this->widthToFill()
+        );
     }
 
     protected function getTitle(): string
@@ -98,7 +102,7 @@ protected function getTitle(): string
 
     protected function widthToFill(): int
     {
-        return $this->prompt->terminal()->cols() - 11;
+        return $this->prompt->terminal()->cols() - 8;
     }
 
     protected function calculateColumnWidth(int $column): int
@@ -113,7 +117,7 @@ protected function calculateColumnWidth(int $column): int
         $columnsWithCustomWidth = $this->prompt->countColumnsWithFixedWidth();
         $widthPerColumn = floor($widthToFill / ($this->columnCount($this->prompt) - $columnsWithCustomWidth));
 
-        return $this->prompt->getColumnMinWidth($column) + $widthPerColumn;
+        return $this->prompt->getColumnMinWidth($column) + ($widthPerColumn > 0 ? $widthPerColumn : 0);
     }
 
     protected function columnCount(): int