Fix use of buildTree

novius · Jan 26, 2024 · 7deb084 · 7deb084
1 parent 1b6b183
commit 7deb084
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/Helpers/MenuHelper.php b/src/Helpers/MenuHelper.php
@@ -104,13 +104,7 @@ public static function displayMenu(Menu|string $slug_or_menu, string $view = nul
         }
 
         $tree = Cache::rememberForever($menu->getTreeCacheName(), static function () use ($menu) {
-            $items = MenuItem::scoped(['menu_id' => $menu->id])
-                ->withDepth()
-                ->defaultOrder()
-                ->get()
-                ->toTree();
-
-            return app()->get('laravel-nova-menu')->buildTree($items);
+            return app()->get('laravel-nova-menu')->buildTree($menu);
         });
 
         return (string) view($view ?? 'laravel-nova-menu::front/menu', [
@@ -119,7 +113,18 @@ public static function displayMenu(Menu|string $slug_or_menu, string $view = nul
         ]);
     }
 
-    public static function getTree(Collection $items): array
+    public static function buildTree(Menu $menu): array
+    {
+        $items = MenuItem::scoped(['menu_id' => $menu->id])
+            ->withDepth()
+            ->defaultOrder()
+            ->get()
+            ->toTree();
+
+        return static::getTree($items);
+    }
+
+    protected static function getTree(Collection $items): array
     {
         $tree = [];
         foreach ($items as $menuItem) {

diff --git a/src/LaravelNovaMenuService.php b/src/LaravelNovaMenuService.php
@@ -19,7 +19,7 @@ class LaravelNovaMenuService
     /**
      * The callback that should be used to build tree
      *
-     * @var (Closure(Collection):array)|null
+     * @var (Closure(Menu):array)|null
      */
     protected ?Closure $buildTreeUsing = null;
 
@@ -39,7 +39,7 @@ public function setTreeUsing(Closure $callback): self
     /**
      *  Register callback that should be used to build tree
      *
-     * @param  Closure(Collection):array  $callback
+     * @param  Closure(Menu):array  $callback
      * @return $this
      */
     public function setBuildTreeUsing(Closure $callback): self
@@ -62,8 +62,8 @@ public function tree(Menu $menu, array $tree): array
     /**
      * Return the tree that will be passed to the view
      */
-    public function buildTree(Collection $items): array
+    public function buildTree(Menu $menu): array
     {
-        return ($this->buildTreeUsing ?: [MenuHelper::class, 'getTree'])($items);
+        return ($this->buildTreeUsing ?: [MenuHelper::class, 'buildTree'])($menu);
     }
 }