Made MenuBuilder items also hideable in the event an entire section needed to be hidden

Author: KyleMassacre

Tests/MenuTest.php

@@ -133,4 +133,47 @@ public function it_can_destroy_all_menus()
         $this->menu->destroy();
         $this->assertCount(0, $this->menu->all());
     }
+
+    /** @test */
+    public function it_still_generates_empty_menu_after_adding_dropdown()
+    {
+        $this->menu->create('test', function (MenuBuilder $menu) {
+            $menu->dropdown('Test', function($sub) {
+
+            })->hideWhen(function() {
+                return true;
+            });
+        });
+
+        $expected = <<<TEXT
+
+<ul class="nav navbar-nav">
+
+</ul>
+
+TEXT;
+
+        self::assertEquals($expected, $this->menu->get('test'));
+    }
+
+    /** @test */
+    public function it_still_generates_empty_menu_after_adding_item()
+    {
+        $this->menu->create('test', function (MenuBuilder $menu) {
+            $menu->url('/', 'Test')
+                ->hideWhen(function() {
+                    return true;
+                });
+        });
+
+        $expected = <<<TEXT
+
+<ul class="nav navbar-nav">
+
+</ul>
+
+TEXT;
+
+        self::assertEquals($expected, $this->menu->get('test'));
+    }
 }

src/MenuBuilder.php

@@ -3,12 +3,14 @@
 namespace Nwidart\Menus;
 
 use Countable;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Support\Arr;
+use Nwidart\Menus\Traits\CanHide;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\View\Factory as ViewFactory;
 
 class MenuBuilder implements Countable
 {
+    use CanHide;
     /**
      * Menu name.
      *
@@ -634,7 +636,7 @@ protected function renderMenu()
         $menu = $presenter->getOpenTagWrapper();
 
         foreach ($this->getOrderedItems() as $item) {
-            if ($item->hidden()) {
+            if ($item->hidden() || $this->hidden()) {
                 continue;
             }
 

src/MenuItem.php

@@ -2,12 +2,12 @@
 
 namespace Nwidart\Menus;
 
-use Closure;
-use Collective\Html\HtmlFacade as HTML;
-use Illuminate\Contracts\Support\Arrayable as ArrayableContract;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Str;
+use Nwidart\Menus\Traits\CanHide;
+use Collective\Html\HtmlFacade as HTML;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Contracts\Support\Arrayable as ArrayableContract;
 
 /**
  * @property string url
@@ -22,6 +22,7 @@
  */
 class MenuItem implements ArrayableContract
 {
+    use CanHide;
     /**
      * Array properties.
      *
@@ -54,13 +55,6 @@ class MenuItem implements ArrayableContract
         'hideWhen',
     );
 
-    /**
-     * The hideWhen callback.
-     *
-     * @var Closure
-     */
-    protected $hideWhen;
-
     /**
      * Constructor.
      *
@@ -592,33 +586,6 @@ public function order($order)
         return $this;
     }
 
-    /**
-     * Set hide condition for current menu item.
-     *
-     * @param  Closure
-     * @return boolean
-     */
-    public function hideWhen(Closure $callback)
-    {
-        $this->hideWhen = $callback;
-
-        return $this;
-    }
-
-    /**
-     * Determine whether the menu item is hidden.
-     *
-     * @return boolean
-     */
-    public function hidden()
-    {
-        if (is_null($this->hideWhen)) {
-            return false;
-        }
-
-        return call_user_func($this->hideWhen) == true;
-    }
-
     /**
      * Get the instance as an array.
      *

src/Traits/CanHide.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Nwidart\Menus\Traits;
+
+use Closure;
+
+trait CanHide
+{
+    /**
+     * @var Closure
+     */
+    protected $hideWhen;
+
+    /**
+     * Set hide condition for current menu item.
+     *
+     * @param  Closure
+     * @return boolean
+     */
+    public function hideWhen(Closure $callback)
+    {
+        $this->hideWhen = $callback;
+
+        return $this;
+    }
+
+    /**
+     * Determine whether the menu item is hidden.
+     *
+     * @return boolean
+     */
+    public function hidden()
+    {
+        if (is_null($this->hideWhen)) {
+            return false;
+        }
+
+        return call_user_func($this->hideWhen) == true;
+    }
+}