Add Split Item

src/CliMenu.php

@@ -12,6 +12,7 @@
 use PhpSchool\CliMenu\Input\Text;
 use PhpSchool\CliMenu\MenuItem\LineBreakItem;
 use PhpSchool\CliMenu\MenuItem\MenuItemInterface;
+use PhpSchool\CliMenu\MenuItem\SplitItem;
 use PhpSchool\CliMenu\MenuItem\StaticItem;
 use PhpSchool\CliMenu\Dialogue\Confirm;
 use PhpSchool\CliMenu\Dialogue\Flash;
@@ -256,6 +257,8 @@ private function display() : void
             switch ($char->getControl()) {
                 case InputCharacter::UP:
                 case InputCharacter::DOWN:
+                case InputCharacter::LEFT:
+                case InputCharacter::RIGHT:
                     $this->moveSelection($char->getControl());
                     $this->draw();
                     break;
@@ -272,25 +275,57 @@ private function display() : void
     protected function moveSelection(string $direction) : void
     {
         do {
-            $itemKeys = array_keys($this->items);
-
-            $direction === 'UP'
-                ? $this->selectedItem--
-                : $this->selectedItem++;
-
-            if (!array_key_exists($this->selectedItem, $this->items)) {
-                $this->selectedItem  = $direction === 'UP'
-                    ? end($itemKeys)
-                    : reset($itemKeys);
-            } elseif ($this->getSelectedItem()->canSelect()) {
-                return;
+            if ($direction === 'UP' || $direction === 'DOWN') {
+                $itemKeys = array_keys($this->items);
+
+                $direction === 'UP'
+                    ? $this->selectedItem--
+                    : $this->selectedItem++;
+
+                if (!array_key_exists($this->selectedItem, $this->items)) {
+                    $this->selectedItem  = $direction === 'UP'
+                        ? end($itemKeys)
+                        : reset($itemKeys);
+                } elseif ($this->getSelectedItem()->canSelect()) {
+                    return;
+                }
+            } else {
+                $item = $this->getSelectedItem(true);
+                if (!$item instanceof SplitItem) {
+                    return;
+                }
+
+                $itemKeys = array_keys($item->getItems());
+                $selectedItemIndex = $item->getSelectedItemIndex();
+                $direction === 'LEFT'
+                    ? $selectedItemIndex--
+                    : $selectedItemIndex++;
+                $item->setSelectedItemIndex($selectedItemIndex);
+
+                if (!array_key_exists($selectedItemIndex, $item->getItems())) {
+                    $selectedItemIndex = $direction === 'LEFT'
+                        ? end($itemKeys)
+                        : reset($itemKeys);
+                    $item->setSelectedItemIndex($selectedItemIndex);
+                } elseif ($item->getItems()[$item->getSelectedItemIndex()]->canSelect()) {
+                    return;
+                }
             }
         } while (!$this->getSelectedItem()->canSelect());
     }
 
-    public function getSelectedItem() : MenuItemInterface
+    public function getSelectedItem(bool $oneLevelDeep = false) : MenuItemInterface
     {
-        return $this->items[$this->selectedItem];
+        if ($oneLevelDeep) {
+            return $this->items[$this->selectedItem];
+        } else {
+            $item = $this->items[$this->selectedItem];
+            if ($item instanceof SplitItem) {
+                $item = $item->getItems()[$item->getSelectedItemIndex()];
+            }
+
+            return $item;
+        }
     }
 
     /**
@@ -385,6 +420,10 @@ protected function draw() : void
     protected function drawMenuItem(MenuItemInterface $item, bool $selected = false) : array
     {
         $rows = $item->getRows($this->style, $selected);
+
+        if ($item instanceof SplitItem) {
+            $selected = false;
+        }
 
         $invertedColoursSetCode = $selected
             ? $this->style->getInvertedColoursSetCode()

src/CliMenuBuilder.php

@@ -9,6 +9,7 @@
 use PhpSchool\CliMenu\MenuItem\MenuItemInterface;
 use PhpSchool\CliMenu\MenuItem\MenuMenuItem;
 use PhpSchool\CliMenu\MenuItem\SelectableItem;
+use PhpSchool\CliMenu\MenuItem\SplitItem;
 use PhpSchool\CliMenu\MenuItem\StaticItem;
 use PhpSchool\CliMenu\Terminal\TerminalFactory;
 use PhpSchool\CliMenu\Util\ColourUtil;
@@ -31,6 +32,8 @@ class CliMenuBuilder
      */
     private $parent;
 
+    private $previousBuilder = null;
+
     /**
      * @var self[]
      */
@@ -81,9 +84,10 @@ class CliMenuBuilder
      */
     private $disabled = false;
 
-    public function __construct(CliMenuBuilder $parent = null)
+    public function __construct(CliMenuBuilder $parent = null, $previousBuilder = null)
     {
         $this->parent   = $parent;
+        $this->previousBuilder = $previousBuilder;
         $this->terminal = $this->parent !== null
             ? $this->parent->getTerminal()
             : TerminalFactory::fromSystem();
@@ -161,6 +165,27 @@ public function addSubMenu(string $id, CliMenuBuilder $subMenuBuilder = null) :
         return $this;
     }
 
+    /**
+     * Injects a submenu directly (without going through the builder
+     */
+    public function injectSubMenu(string $id, CliMenu $subMenu) : CliMenuBuilder
+    {
+        $this->subMenus[$id] = $subMenu;
+
+        return $this;
+    }
+
+    /**
+     * Add a split item
+     */
+    public function addSplitItem() : SplitItem
+    {
+        $splitItem = new SplitItem($this);
+        $this->addMenuItem($splitItem);
+
+        return $splitItem;
+    }
+
     /**
      * Disable a submenu
      *
@@ -411,8 +436,12 @@ private function buildStyle() : MenuStyle
      *
      * @throws RuntimeException
      */
-    public function end() : CliMenuBuilder
+    public function end()
     {
+        if (null !== $this->previousBuilder) {
+            return $this->previousBuilder;
+        }
+
         if (null === $this->parent) {
             throw new RuntimeException('No parent builder to return to');
         }