Merge pull request #1 from hexadog/develop

Develop

Author: gaetan-hexadog

README.md

@@ -304,6 +304,7 @@ php artisan vendor:publish --provider="Hexadog\MenusManager\Providers\PackageSer
 
 <!-- omit in toc -->
 ## Credits
+- This package is inspired by the work of [rinvex/laravel-menus](https://github.com/rinvex/laravel-menus)
 - Logo made by [DesignEvo free logo creator](https://www.designevo.com/logo-maker/)
 
 <!-- omit in toc -->

composer.json

@@ -28,6 +28,11 @@
             "Hexadog\\MenusManager\\": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Hexadog\\MenusManager\\Tests\\": "tests"
+        }
+    },
     "extra": {
         "laravel": {
             "providers": [

resources/views/components/children.blade.php

@@ -1,7 +1,7 @@
 <div x-show="open" {{ $attributes }}>
     @foreach($items as $item)
         @if ($item->isDivider())
-        <x-menus-divider class="py-2 px-16 border-0 bg-gray-500 text-gray-500 h-px" />
+        <x-menus-divider :item="$item" class="py-2 px-16 border-0 bg-gray-500 text-gray-500 h-px" />
         @else
             @if($item->isActive())
             <x-menus-item :item="$item" class="py-2 px-16 block text-sm text-gray-600 hover:bg-blue-500 hover:text-white bg-gray-200 text-gray-700 border-r-4 border-gray-700" />

resources/views/components/menu.blade.php

@@ -1,7 +1,7 @@
 <nav {{ $attributes }}>
 @foreach($items as $item)
     @if($item->isDivider())
-        <x-menus-divider class="border-0 bg-gray-500 text-gray-500 h-px" />
+        <x-menus-divider :item="$item" class="border-0 bg-gray-500 text-gray-500 h-px" />
     @else
         @if($item->isActive())
         <x-menus-item :item="$item" class="w-full flex justify-between items-center py-3 px-6 text-gray-600 cursor-pointer hover:bg-gray-100 hover:text-gray-700 focus:outline-none bg-gray-200 text-gray-700 border-r-4 border-gray-700" />

src/Components/Divider.php

@@ -33,7 +33,7 @@ public function __construct(Item $item)
      */
     public function render()
     {
-        if ($this->item->isVisible()) {
+        if ($this->item && $this->item->isVisible()) {
             return view('menus-manager::components.divider');
         }
 

src/Components/Header.php

@@ -33,7 +33,7 @@ public function __construct(Item $item)
      */
     public function render()
     {
-        if ($this->item->isVisible()) {
+        if ($this->item && $this->item->isVisible()) {
             return view('menus-manager::components.header');
         }
 

src/Components/Icon.php

@@ -12,14 +12,14 @@ class Icon extends Component
      *
      * @var string
      */
-    protected $icon;
+    public $icon;
 
     /**
      * The item
      *
      * @var Item
      */
-    protected $item;
+    public $item;
 
     /**
      * Create the component instance
@@ -28,10 +28,10 @@ class Icon extends Component
      *
      * @return void
      */
-    public function __construct(Item $item = null)
+    public function __construct(Item $item)
     {
         $this->item = $item;
-        $this->icon = $item->hasIcon() ? $item->icon : null;
+        $this->icon = $item && $item->hasIcon() ? $item->icon : null;
     }
 
     /**
@@ -41,7 +41,7 @@ public function __construct(Item $item = null)
      */
     public function render()
     {
-        if ($this->icon) {
+        if ($this->item && $this->icon) {
             return view('menus-manager::components.icon');
         }
 

src/Components/Item.php

@@ -32,7 +32,7 @@ public function __construct(MenusManagerItem $item)
      */
     public function render()
     {
-        if ($this->item->isVisible()) {
+        if ($this->item && $this->item->isVisible()) {
             if ($this->item->isHeader()) {
                 return view('menus-manager::components.header');
             }

src/Components/Menu.php

@@ -42,6 +42,10 @@ public function __construct($name)
      */
     public function render()
     {
-        return view('menus-manager::components.menu');
+        if ($this->menu) {
+            return view('menus-manager::components.menu');
+        }
+
+        return '';
     }
 }

src/Item.php

@@ -74,6 +74,10 @@ public function __construct(array $properties = [], $parent = null)
      */
     public function __get($key)
     {
+        if ($key === 'properties') {
+            return $this->properties;
+        }
+
         return Arr::get($this->properties, $key);
     }
 
@@ -142,13 +146,13 @@ public function fill($properties): Item
     /**
      * Get the item attributes as HTML String
      *
-     * @param array $attributes
+     * @param mixed $except
      *
      * @return string
      */
-    public function getAttributes(array $attributes = [])
+    public function getAttributes($except = null)
     {
-        return $this->htmlAttributes(array_merge($this->attributes, $attributes));
+        return $this->htmlAttributes(Arr::except($this->attributes, $except));
     }
 
     /**