Support nested submenus with active classes

Author: sileence

spec/Menu/MenuGeneratorSpec.php

@@ -344,6 +344,62 @@ function it_generates_submenu_items()
         $menu->getItems()->shouldReturn($items);
     }
 
+    function it_generates_nested_submenu_items_with_active_classes()
+    {
+        // Generate new menu
+        $menu = $this->make([
+            'home' => [],
+            'pages' => [
+                'submenu' => [
+                    'about' => [
+                        'submenu' => [
+                            'company' => ['url' => 'company']
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $items = [
+            'home' => [
+                'class' => '',
+                'submenu' => null,
+                'id' => 'home',
+                'active' => false,
+                'title' => 'Home',
+                'url' => '#'
+            ],
+            'pages' => [
+                'class' => 'active dropdown',
+                'submenu' =>[
+                    'about' => [
+                        'class' => 'active dropdown',
+                        'submenu' => [
+                            'company' => [
+                                'class' => 'active',
+                                'submenu' => null,
+                                'id' => 'company',
+                                'active' => true,
+                                'url' => null,
+                                'title' => 'Company'
+                            ],
+                        ],
+                        'id' => 'about',
+                        'active' => true,
+                        'title' => 'About',
+                        'url' => '#',
+                        'id'  => 'about'
+                    ],
+                ],
+                'id' => 'pages',
+                'active' => true,
+                'title' => 'Pages',
+                'url' => '#'
+            ]
+        ];
+        $menu->getItems()->shouldReturn($items);
+    }
+
     function it_supports_the_exact_option_to_set_active_menu_items($url)
     {
         $url->current()->shouldBeCalled()->willReturn('http://example/contact/london');

src/Menu/Menu.php

@@ -292,10 +292,9 @@ public function checkAccess(array $options)
      * This method will called itself if an item has a 'submenu' key.
      *
      * @param array $items
-     * @param array|null $parentItem
      * @return array
      */
-    protected function generateItems($items, &$parentItem = null)
+    protected function generateItems($items)
     {
         foreach ($items as $id => &$values) {
             $values = $this->setDefaultValues($id, $values);
@@ -309,13 +308,22 @@ protected function generateItems($items, &$parentItem = null)
 
             $values['url'] = $this->generateUrl($values);
 
-            if ($this->isActiveUrl($values)) {
-                $this->markAsActive($values, $parentItem);
-                $this->currentId = $id;
+            if (isset($values['submenu'])) {
+                $values['submenu'] = $this->generateItems($values['submenu']);
             }
 
-            if (isset($values['submenu'])) {
-                $values['submenu'] = $this->generateItems($values['submenu'], $values);
+            if ($this->isActiveUrl($values)) {
+                $values['active'] = true;
+                $this->currentId = $id;
+            } elseif (isset ($values['submenu'])) {
+                // Check if there is an active item in the submenu, if
+                // so it'll mark the current item as active as well.
+                foreach ($values['submenu'] as $subitem) {
+                    if ($subitem['active']) {
+                        $values['active'] = true;
+                        break;
+                    }
+                }
             }
 
             if ($values['active']) {
@@ -377,22 +385,6 @@ protected function isActiveUrl(array $values)
         return strpos($this->activeUrl, $values['url']) === 0;
     }
 
-    /**
-     * Marks an item an it's optional parent item as active
-     *
-     * @param array $values
-     * @param array|null $parentItem
-     */
-    protected function markAsActive(&$values, &$parentItem = null)
-    {
-        // Set this item as active
-        $values['active'] = true;
-        // If this is a submenu, set the parent's item as active as well
-        if ($parentItem != null) {
-            $parentItem['active'] = true;
-        }
-    }
-
     /**
      * Returns the menu's title. The title is determined following this order:
      *