From ff8f280bbb906b95fad4fcad16c57a932ba3fda1 Mon Sep 17 00:00:00 2001
From: Aydin Hassan <aydin@hotmail.co.uk>
Date: Mon, 16 Dec 2019 10:01:20 +0100
Subject: [PATCH 1/3] Item extra toggling support

---
 examples/item-extra-toggling.php | 28 ++++++++++++++++++++++++++++
 src/Builder/CliMenuBuilder.php   | 14 +++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 examples/item-extra-toggling.php

diff --git a/examples/item-extra-toggling.php b/examples/item-extra-toggling.php
new file mode 100644
index 00000000..87a503ed
--- /dev/null
+++ b/examples/item-extra-toggling.php
@@ -0,0 +1,28 @@
+<?php
+
+use PhpSchool\CliMenu\CliMenu;
+use PhpSchool\CliMenu\Builder\CliMenuBuilder;
+
+require_once(__DIR__ . '/../vendor/autoload.php');
+
+$itemCallable = function (CliMenu $menu) {
+    if ($menu->getSelectedItem()->showsItemExtra()) {
+        $menu->getSelectedItem()->hideItemExtra();
+    } else {
+        $menu->getSelectedItem()->showItemExtra();
+    }
+    $menu->redraw();
+    echo $menu->getSelectedItem()->getText();
+};
+
+$menu = (new CliMenuBuilder)
+    ->setTitle('Basic CLI Menu Custom Item Extra')
+    ->addItem('First Item', $itemCallable)
+    ->addItem('Second Item', $itemCallable)
+    ->addItem('Third Item', $itemCallable)
+    ->setItemExtra('[COMPLETE!]')
+    ->displayExtra()
+    ->addLineBreak('-')
+    ->build();
+
+$menu->open();
diff --git a/src/Builder/CliMenuBuilder.php b/src/Builder/CliMenuBuilder.php
index 7bd4188d..a821ae42 100644
--- a/src/Builder/CliMenuBuilder.php
+++ b/src/Builder/CliMenuBuilder.php
@@ -425,6 +425,9 @@ public function setItemExtra(string $extra) : self
     {
         $this->style->setItemExtra($extra);
 
+        //if we customise item extra, it means we most likely want to display it
+        $this->displayExtra();
+
         return $this;
     }
 
@@ -505,6 +508,13 @@ public function disableDefaultItems() : self
         return $this;
     }
 
+    public function displayExtra() : self
+    {
+        $this->style->setDisplaysExtra(true);
+
+        return $this;
+    }
+
     private function itemsHaveExtra(array $items) : bool
     {
         return !empty(array_filter($items, function (MenuItemInterface $item) {
@@ -518,7 +528,9 @@ public function build() : CliMenu
             $this->menu->addItems($this->getDefaultItems());
         }
 
-        $this->style->setDisplaysExtra($this->itemsHaveExtra($this->menu->getItems()));
+        if (!$this->style->getDisplaysExtra()) {
+            $this->style->setDisplaysExtra($this->itemsHaveExtra($this->menu->getItems()));
+        }
 
         return $this->menu;
     }

From 0c874d83cef128bbf8d9f028ce5f60e18eed2e60 Mon Sep 17 00:00:00 2001
From: Aydin Hassan <aydin@hotmail.co.uk>
Date: Tue, 17 Dec 2019 10:15:35 +0100
Subject: [PATCH 2/3] Add tests

---
 test/Builder/CliMenuBuilderTest.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/test/Builder/CliMenuBuilderTest.php b/test/Builder/CliMenuBuilderTest.php
index 70e72c68..fd1fc879 100644
--- a/test/Builder/CliMenuBuilderTest.php
+++ b/test/Builder/CliMenuBuilderTest.php
@@ -820,6 +820,35 @@ public function testAddSplitItemWithClosureBinding() : void
         $this->checkItems($menu->getItems()[0]->getItems(), $expected);
     }
 
+    public function testDisplayExtraForcesExtraToBeDisplayedWhenNoItemsDisplayExtra() : void
+    {
+        $cb = function () {
+        };
+        $builder = new CliMenuBuilder;
+        $builder->addItem('Item 1', $cb);
+        $builder->addItem('Item 2', $cb);
+        $builder->displayExtra();
+
+        $menu = $builder->build();
+
+        self::assertTrue($menu->getStyle()->getDisplaysExtra());
+    }
+
+    public function testModifyingItemExtraForcesExtraToBeDisplayedWhenNoItemsDisplayExtra() : void
+    {
+        $cb = function () {
+        };
+        $builder = new CliMenuBuilder;
+        $builder->addItem('Item 1', $cb);
+        $builder->addItem('Item 2', $cb);
+        $builder->setItemExtra('DONE');
+
+        $menu = $builder->build();
+
+        self::assertTrue($menu->getStyle()->getDisplaysExtra());
+    }
+
+
     private function checkMenuItems(CliMenu $menu, array $expected) : void
     {
         $this->checkItems($menu->getItems(), $expected);

From b2febc9b6561084ceb3da1dc8199686d72ccf536 Mon Sep 17 00:00:00 2001
From: Aydin Hassan <aydin@hotmail.co.uk>
Date: Tue, 17 Dec 2019 10:21:17 +0100
Subject: [PATCH 3/3] Docs

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index 0cea2d90..59f814eb 100644
--- a/README.md
+++ b/README.md
@@ -791,6 +791,32 @@ $menu = (new CliMenuBuilder)
     ->build();
 ```
 
+If no items have display extra set to true, then the item extra will not be displayed. If you toggle the item to show
+it's item extra in a callback or at runtime it will render incorrectly.
+
+In order to fix that you need to tell the menu to display item extra explicitly. You can do this when constructing the
+menu like so:
+
+```php
+<?php
+
+use PhpSchool\CliMenu\Builder\CliMenuBuilder;
+use PhpSchool\CliMenu\CliMenu;
+
+$menu = (new CliMenuBuilder)
+    ->setItemExtra('✔')
+    ->addItem('Exercise 1', function (CliMenu $menu) { 
+        $selectedItem = $menu->getSelectedItem();
+        if ($selectedItem->showsItemExtra()) {
+            $selectedItem->hideItemExtra();
+        } else {
+            $selectedItem->showItemExtra();
+        }       
+    })
+    ->displayExtra()
+    ->build();
+```
+
 ## Menu Methods
 
 The next set of documentation applies to methods available directly on the `\PhpSchool\CliMenu\CliMenu` instance. Typically