Improve the formatting of disabled menu items in different terminals (#236)

* Improve the formatting of disabled menu items

Disabled items are now modified to use the ANSI "bright" equivalent of the same colour as their foreground text, as well as the dim escape sequence modifier.

* Added return types

* Corrected typo

* Fixed broken test

* Corrected mismatched types found in static analysis

Author: jackwh

src/MenuStyle.php

@@ -277,34 +277,74 @@ public function hasChangedFromDefaults() : bool
         return $currentValues !== array_values($defaultStyleValues);
     }
 
+    /**
+     * Get text for a disabled menu item.
+     *
+     * This sets the foreground colour to the ansi bright equivalent,
+     * and on supported terminals, adds additional dim formatting.
+     *
+     * @return string
+     */
     public function getDisabledItemText(string $text) : string
     {
         return sprintf(
-            "\033[%sm%s\033[%sm",
+            "\033[%sm\033[%sm%s\033[%sm\033[%sm",
             self::$availableOptions['dim']['set'],
+            $this->getForegroundColourCode(true),
             $text,
+            $this->getForegroundColourCode(),
             self::$availableOptions['dim']['unset']
         );
     }
 
     /**
-     * Generates the ansi escape sequence to set the colours
+     * Get the ansi escape sequence for the foreground colour.
+     *
+     * @param bool $bright Whether to modify to the ansi bright variation
+     *
+     * @return string
      */
-    private function generateColoursSetCode() : void
+    private function getForegroundColourCode(bool $bright = false) : string
     {
         if (!ctype_digit($this->fg)) {
-            $fgCode = self::$availableForegroundColors[$this->fg];
+            $fgCode = (int)self::$availableForegroundColors[$this->fg];
+            $fgCode += ($bright ? 60 : 0);
         } else {
-            $fgCode = sprintf("38;5;%s", $this->fg);
+            $fgCode = sprintf("38;5;%s", ((int)$this->fg + ($bright ? 60 : 0)));
         }
 
+        return (string)$fgCode;
+    }
+
+    /**
+     * Get the ansi escape sequence for the background colour.
+     *
+     * @param bool $bright Whether to modify to the ansi bright variation
+     *
+     * @return string
+     */
+    private function getBackgroundColourCode(bool $bright = false) : string
+    {
         if (!ctype_digit($this->bg)) {
-            $bgCode = self::$availableBackgroundColors[$this->bg];
+            $bgCode = (int)self::$availableBackgroundColors[$this->bg];
+            $bgCode += ($bright ? 60 : 0);
         } else {
-            $bgCode = sprintf("48;5;%s", $this->bg);
+            $bgCode = sprintf("48;5;%s", ((int)$this->bg + ($bright ? 60 : 0)));
         }
 
-        $this->coloursSetCode = sprintf("\033[%s;%sm", $fgCode, $bgCode);
+        return (string)$bgCode;
+    }
+
+    /**
+     * Generates the ansi escape sequence to set the colours
+     */
+    private function generateColoursSetCode() : void
+    {
+        $this->coloursSetCode = sprintf(
+            "\033[%s;%sm",
+            $this->getForegroundColourCode(),
+            $this->getBackgroundColourCode()
+        );
     }
 
     /**

test/MenuItem/SelectableItemRendererTest.php

@@ -84,16 +84,14 @@ public function testRenderDisabled() : void
         $menuStyle->setWidth(35);
         $style = (new SelectableStyle())->setItemExtra('[DONE]');
 
-        $item = new SelectableItem('SOME TEXT', function () {
+        $item = new SelectableItem($testString = 'SOME TEXT', function () {
         });
         $item->setStyle($style);
         $item->showItemExtra();
 
         self::assertEquals(
-            [
-                "\033[2m● SOME TEXT\033[22m              [DONE]",
-            ],
-            $renderer->render($menuStyle, $item, true, true)
+            escapeshellcmd("\033[2m\033[97m● " . $testString . "\033[37m\033[22m              [DONE]"),
+            escapeshellcmd($renderer->render($menuStyle, $item, true, true)[0])
         );
     }
     public function testWrapAndIndentText() : void