menu

src/Admin.php

@@ -52,6 +52,11 @@ class Admin
      */
     protected static $availableExtensions;
 
+    /**
+     * @var Menu
+     */
+    protected static $menu;
+
     /**
      * @var []Closure
      */
@@ -80,7 +85,7 @@ class Admin
      */
     public static function menu(Closure $builder = null)
     {
-        $menu = Menu::make();
+        $menu = static::$menu ?: (static::$menu = new Menu);
 
         $builder && $builder($menu);
 

src/Layout/Menu.php

@@ -7,11 +7,6 @@ use Dcat\Admin\Support\Helper;
 
 class Menu
 {
-    /**
-     * @var static
-     */
-    protected static $instance;
-
     /**
      * @var array
      */
@@ -190,12 +185,4 @@ class Menu
 
         return $this->url->isValidUrl($uri) ? $uri : admin_base_path($uri);
     }
-
-    /**
-     * @return static
-     */
-    public static function make()
-    {
-        return static::$instance ?: (static::$instance = new static);
-    }
 }