Merge pull request #193 from jtreminio/feature/checkable-getSelectAction

Auto-toggle CheckableItem

Author: AydinHassan

README.md

@@ -555,9 +555,7 @@ use PhpSchool\CliMenu\Builder\CliMenuBuilder;
 use PhpSchool\CliMenu\CliMenu;
 
 $callable = function (CliMenu $menu) {
-    $item = $menu->getSelectedItem();
-    $item->toggle();
-    $menu->redraw();
+    echo $menu->getSelectedItem()->getText();
 };
 
 $menu = (new CliMenuBuilder)

examples/checkable-item.php

@@ -2,17 +2,11 @@
 
 use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\Builder\CliMenuBuilder;
-use PhpSchool\CliMenu\MenuItem\CheckableItem;
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 
 $itemCallable = function (CliMenu $menu) {
-    /** @var CheckableItem $item */
-    $item = $menu->getSelectedItem();
-
-    $item->toggle();
-
-    $menu->redraw();
+    echo $menu->getSelectedItem()->getText();
 };
 
 $menu = (new CliMenuBuilder)

src/MenuItem/CheckableItem.php

@@ -2,6 +2,7 @@
 
 namespace PhpSchool\CliMenu\MenuItem;
 
+use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\MenuStyle;
 use PhpSchool\CliMenu\Util\StringUtil;
 
@@ -49,7 +50,12 @@ public function __construct(
      */
     public function getSelectAction() : ?callable
     {
-        return $this->selectAction;
+        return function (CliMenu $cliMenu) {
+            $this->toggle();
+            $cliMenu->redraw();
+
+            return ($this->selectAction)($cliMenu);
+        };
     }
 
     /**

test/MenuItem/CheckableItemTest.php

@@ -2,6 +2,7 @@
 
 namespace PhpSchool\CliMenuTest\MenuItem;
 
+use PhpSchool\CliMenu\CliMenu;
 use PhpSchool\CliMenu\MenuItem\CheckableItem;
 use PhpSchool\CliMenu\MenuStyle;
 use PhpSchool\Terminal\Terminal;
@@ -19,9 +20,15 @@ public function testCanSelectIsTrue() : void
     public function testGetSelectAction() : void
     {
         $callable = function () {
+            return 'callable is called';
         };
         $item = new CheckableItem('Item', $callable);
-        $this->assertSame($callable, $item->getSelectAction());
+
+        $cliMenu = $this->getMockBuilder(CLiMenu::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->assertSame($callable(), $item->getSelectAction()($cliMenu));
     }
 
     public function testShowsItemExtra() : void