Checkbox + Radio item-level styling - CR Changes

examples/checkbox-item.php

@@ -23,7 +23,7 @@
     })
     ->addSubMenu('Interpreted', function (CliMenuBuilder $b) use ($itemCallable) {
         $b->setTitle('Interpreted Languages')
-            ->checkboxStyle(function (CheckboxStyle $style) {
+            ->modifyCheckboxStyle(function (CheckboxStyle $style) {
                 $style->setMarkerOff('[○] ')
                     ->setMarkerOn('[●] ');
             })

examples/radio-item.php

@@ -23,7 +23,7 @@
     })
     ->addSubMenu('Interpreted', function (CliMenuBuilder $b) use ($itemCallable) {
         $b->setTitle('Interpreted Languages')
-            ->radioStyle(function (RadioStyle $style) {
+            ->modifyRadioStyle(function (RadioStyle $style) {
                 $style->setMarkerOff('[ ] ')
                     ->setMarkerOn('[✔] ');
             })

src/Builder/CliMenuBuilder.php

@@ -202,16 +202,12 @@ public function addSubMenu(string $text, \Closure $callback) : self
             $menu->setStyle($this->menu->getStyle());
         }
 
-        if (!$menu->getCheckboxStyle()->getIsCustom()) {
-            $menu->checkboxStyle(function (CheckboxStyle $style) {
-                $style->fromArray($this->menu->getCheckboxStyle()->toArray());
-            });
+        if (!$menu->getCheckboxStyle()->hasChangedFromDefaults()) {
+            $menu->setCheckboxStyle(clone $this->menu->getCheckboxStyle());
         }
 
-        if (!$menu->getRadioStyle()->getIsCustom()) {
-            $menu->radioStyle(function (RadioStyle $style) {
-                $style->fromArray($this->menu->getRadioStyle()->toArray());
-            });
+        if (!$menu->getRadioStyle()->hasChangedFromDefaults()) {
+            $menu->setRadioStyle(clone $this->menu->getRadioStyle());
         }
 
         $this->menu->addItem($item = new MenuMenuItem(
@@ -236,13 +232,13 @@ public function addSubMenuFromBuilder(string $text, CliMenuBuilder $builder) : s
             $menu->setStyle($this->menu->getStyle());
         }
 
-        $menu->checkboxStyle(function (CheckboxStyle $style) {
-            $style->fromArray($this->menu->getCheckboxStyle()->toArray());
-        });
+        if (!$menu->getCheckboxStyle()->hasChangedFromDefaults()) {
+            $menu->setCheckboxStyle(clone $this->menu->getCheckboxStyle());
+        }
 
-        $menu->radioStyle(function (RadioStyle $style) {
-            $style->fromArray($this->menu->getRadioStyle()->toArray());
-        });
+        if (!$menu->getRadioStyle()->hasChangedFromDefaults()) {
+            $menu->setRadioStyle(clone $this->menu->getRadioStyle());
+        }
 
         $this->menu->addItem($item = new MenuMenuItem(
             $text,
@@ -331,13 +327,13 @@ public function addSplitItem(\Closure $callback) : self
 
         $callback($builder);
 
-        $builder->checkboxStyle(function (CheckboxStyle $style) {
-            $style->fromArray($this->menu->getCheckboxStyle()->toArray());
-        });
+        if (!$builder->getCheckboxStyle()->hasChangedFromDefaults()) {
+            $builder->setCheckboxStyle(clone $this->menu->getCheckboxStyle());
+        }
 
-        $builder->radioStyle(function (RadioStyle $style) {
-            $style->fromArray($this->menu->getRadioStyle()->toArray());
-        });
+        if (!$builder->getRadioStyle()->hasChangedFromDefaults()) {
+            $builder->setRadioStyle(clone $this->menu->getRadioStyle());
+        }
 
         $this->menu->addItem($splitItem = $builder->build());
 
@@ -567,16 +563,40 @@ public function build() : CliMenu
         return $this->menu;
     }
 
-    public function checkboxStyle(callable $itemCallable) : self
+    public function getCheckboxStyle() : CheckboxStyle
+    {
+        return $this->menu->getCheckboxStyle();
+    }
+
+    public function setCheckboxStyle(CheckboxStyle $style) : self
+    {
+        $this->menu->setCheckboxStyle($style);
+
+        return $this;
+    }
+
+    public function modifyCheckboxStyle(callable $itemCallable) : self
+    {
+        $itemCallable($this->menu->getCheckboxStyle());
+
+        return $this;
+    }
+
+    public function getRadioStyle() : RadioStyle
+    {
+        return $this->menu->getRadioStyle();
+    }
+
+    public function setRadioStyle(RadioStyle $style) : self
     {
-        $this->menu->checkboxStyle($itemCallable);
+        $this->menu->setRadioStyle($style);
 
         return $this;
     }
 
-    public function radioStyle(callable $itemCallable) : self
+    public function modifyRadioStyle(callable $itemCallable) : self
     {
-        $this->menu->radioStyle($itemCallable);
+        $itemCallable($this->menu->getRadioStyle());
 
         return $this;
     }

src/Builder/SplitItemBuilder.php

@@ -129,13 +129,13 @@ public function addSubMenu(string $text, \Closure $callback) : self
         $menu = $builder->build();
         $menu->setParent($this->menu);
 
-        $menu->checkboxStyle(function (CheckboxStyle $style) {
-            $style->fromArray($this->menu->getCheckboxStyle()->toArray());
-        });
+        if (!$menu->getCheckboxStyle()->hasChangedFromDefaults()) {
+            $menu->setCheckboxStyle(clone $this->menu->getCheckboxStyle());
+        }
 
-        $menu->radioStyle(function (RadioStyle $style) {
-            $style->fromArray($this->menu->getRadioStyle()->toArray());
-        });
+        if (!$menu->getRadioStyle()->hasChangedFromDefaults()) {
+            $menu->setRadioStyle(clone $this->menu->getRadioStyle());
+        }
 
         $this->splitItem->addItem(new MenuMenuItem(
             $text,
@@ -169,16 +169,40 @@ public function build() : SplitItem
         return $this->splitItem;
     }
 
-    public function checkboxStyle(callable $itemCallable) : self
+    public function getCheckboxStyle() : CheckboxStyle
+    {
+        return $this->checkboxStyle;
+    }
+
+    public function setCheckboxStyle(CheckboxStyle $style) : self
+    {
+        $this->checkboxStyle = $style;
+
+        return $this;
+    }
+
+    public function modifyCheckboxStyle(callable $itemCallable) : self
+    {
+        $itemCallable($this->menu->getCheckboxStyle());
+
+        return $this;
+    }
+
+    public function getRadioStyle() : RadioStyle
+    {
+        return $this->radioStyle;
+    }
+
+    public function setRadioStyle(RadioStyle $style) : self
     {
-        $this->menu->checkboxStyle($itemCallable);
+        $this->radioStyle = $style;
 
         return $this;
     }
 
-    public function radioStyle(callable $itemCallable) : self
+    public function modifyRadioStyle(callable $itemCallable) : self
     {
-        $this->menu->radioStyle($itemCallable);
+        $itemCallable($this->menu->getRadioStyle());
 
         return $this;
     }

src/CliMenu.php

@@ -660,9 +660,9 @@ public function getCheckboxStyle() : CheckboxStyle
         return $this->checkboxStyle;
     }
 
-    public function checkboxStyle(callable $itemCallable) : self
+    public function setCheckboxStyle(CheckboxStyle $style) : self
     {
-        $itemCallable($this->checkboxStyle);
+        $this->checkboxStyle = $style;
 
         return $this;
     }
@@ -672,9 +672,9 @@ public function getRadioStyle() : RadioStyle
         return $this->radioStyle;
     }
 
-    public function radioStyle(callable $itemCallable) : self
+    public function setRadioStyle(RadioStyle $style) : self
     {
-        $itemCallable($this->radioStyle);
+        $this->radioStyle = $style;
 
         return $this;
     }

src/MenuItem/CheckboxItem.php

@@ -9,7 +9,18 @@
 
 class CheckboxItem implements MenuItemInterface, ToggableItemInterface
 {
-    use ToggableTrait;
+    /**
+     * @var callable
+     */
+    private $selectAction;
+
+    private $text = '';
+
+    private $showItemExtra = false;
+
+    private $disabled = false;
+
+    private $checked = false;
 
     /**
      * @var CheckboxStyle;
@@ -89,4 +100,81 @@ public function setStyle(CheckboxStyle $style) : self
 
         return $this;
     }
+
+    /**
+     * Toggles checked state
+     */
+    public function toggle() : void
+    {
+        $this->checked = !$this->checked;
+    }
+
+    /**
+     * Sets checked state to true
+     */
+    public function setChecked() : void
+    {
+        $this->checked = true;
+    }
+
+    /**
+     * Sets checked state to false
+     */
+    public function setUnchecked() : void
+    {
+        $this->checked = false;
+    }
+
+    /**
+     * Whether or not the item is checked
+     */
+    public function getChecked() : bool
+    {
+        return $this->checked;
+    }
+
+    /**
+     * Return the raw string of text
+     */
+    public function getText() : string
+    {
+        return $this->text;
+    }
+
+    /**
+     * Set the raw string of text
+     */
+    public function setText(string $text) : void
+    {
+        $this->text = $text;
+    }
+
+    /**
+     * Can the item be selected
+     */
+    public function canSelect() : bool
+    {
+        return !$this->disabled;
+    }
+
+    public function showsItemExtra() : bool
+    {
+        return $this->showItemExtra;
+    }
+
+    /**
+     * Enable showing item extra
+     */
+    public function showItemExtra() : void
+    {
+        $this->showItemExtra = true;
+    }
+
+    /**
+     * Disable showing item extra
+     */
+    public function hideItemExtra() : void
+    {
+        $this->showItemExtra = false;
+    }
 }