Merge pull request #208 from jtreminio/feature/item-style-2

SplitItemBuilder should reference menu styles

Author: AydinHassan

src/Builder/CliMenuBuilder.php

@@ -320,21 +320,15 @@ private function processIndividualShortcut(MenuItemInterface $item, callable $ca
     public function addSplitItem(\Closure $callback) : self
     {
         $builder = new SplitItemBuilder($this->menu);
+        $builder->setCheckboxStyle(clone $this->menu->getCheckboxStyle())
+            ->setRadioStyle(clone $this->menu->getRadioStyle());
 
         if ($this->autoShortcuts) {
             $builder->enableAutoShortcuts($this->autoShortcutsRegex);
         }
 
         $callback($builder);
 
-        if (!$builder->getCheckboxStyle()->hasChangedFromDefaults()) {
-            $builder->setCheckboxStyle(clone $this->menu->getCheckboxStyle());
-        }
-
-        if (!$builder->getRadioStyle()->hasChangedFromDefaults()) {
-            $builder->setRadioStyle(clone $this->menu->getRadioStyle());
-        }
-        
         $this->menu->addItem($splitItem = $builder->build());
 
         $this->processSplitItemShortcuts($splitItem);

src/Builder/SplitItemBuilder.php

@@ -44,23 +44,10 @@ class SplitItemBuilder
      */
     private $autoShortcutsRegex = '/\[(.)\]/';
 
-    /**
-     * @var CheckboxStyle
-     */
-    private $checkboxStyle;
-
-    /**
-     * @var RadioStyle
-     */
-    private $radioStyle;
-
     public function __construct(CliMenu $menu)
     {
         $this->menu = $menu;
         $this->splitItem = new SplitItem();
-
-        $this->checkboxStyle  = new CheckboxStyle();
-        $this->radioStyle      = new RadioStyle();
     }
 
     public function addItem(
@@ -171,12 +158,12 @@ public function build() : SplitItem
 
     public function getCheckboxStyle() : CheckboxStyle
     {
-        return $this->checkboxStyle;
+        return $this->menu->getCheckboxStyle();
     }
 
     public function setCheckboxStyle(CheckboxStyle $style) : self
     {
-        $this->checkboxStyle = $style;
+        $this->menu->setCheckboxStyle($style);
 
         return $this;
     }
@@ -190,12 +177,12 @@ public function modifyCheckboxStyle(callable $itemCallable) : self
 
     public function getRadioStyle() : RadioStyle
     {
-        return $this->radioStyle;
+        return $this->menu->getRadioStyle();
     }
 
     public function setRadioStyle(RadioStyle $style) : self
     {
-        $this->radioStyle = $style;
+        $this->menu->setRadioStyle($style);
 
         return $this;
     }