update

src/Form/Tools.php

@@ -3,6 +3,7 @@
 namespace Dcat\Admin\Form;
 
 use Dcat\Admin\Support\Helper;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Collection;
 
@@ -64,7 +65,7 @@ class Tools implements Renderable
     /**
      * Append a tools.
      *
-     * @param mixed $tool
+     * @param string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */
@@ -78,7 +79,7 @@ class Tools implements Renderable
     /**
      * Prepend a tool.
      *
-     * @param mixed $tool
+     * @param string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */
@@ -265,6 +266,7 @@ HTML;
 
         foreach ($this->tools as $tool) {
             $renderMethod = 'render'.ucfirst($tool);
+
             $output .= $this->$renderMethod();
         }
 

src/Grid/Tools.php

@@ -8,6 +8,7 @@ use Dcat\Admin\Grid\Tools\BatchActions;
 use Dcat\Admin\Grid\Tools\FilterButton;
 use Dcat\Admin\Grid\Tools\RefreshButton;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Collection;
 
@@ -54,7 +55,7 @@ class Tools implements Renderable
     /**
      * Append tools.
      *
-     * @param AbstractTool|string $tool
+     * @param AbstractTool|string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */
@@ -68,7 +69,7 @@ class Tools implements Renderable
     /**
      * Prepend a tool.
      *
-     * @param AbstractTool|string $tool
+     * @param AbstractTool|string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */

src/Layout/Navbar.php

@@ -2,6 +2,7 @@
 
 namespace Dcat\Admin\Layout;
 
+use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Traits\HasBuilderEvents;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
@@ -29,7 +30,7 @@ class Navbar implements Renderable
     }
 
     /**
-     * @param $element
+     * @param string|\Closure|Renderable|Htmlable $element
      *
      * @return $this
      */
@@ -41,7 +42,7 @@ class Navbar implements Renderable
     }
 
     /**
-     * @param $element
+     * @param string|\Closure|Renderable|Htmlable $element
      *
      * @return $this
      */
@@ -65,16 +66,6 @@ class Navbar implements Renderable
             return '';
         }
 
-        return $this->elements[$part]->map(function ($element) {
-            if ($element instanceof Htmlable) {
-                return $element->toHtml();
-            }
-
-            if ($element instanceof Renderable) {
-                return $element->render();
-            }
-
-            return (string) $element;
-        })->implode('');
+        return $this->elements[$part]->map([Helper::class, 'render'])->implode('');
     }
 }

src/Show/Tools.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Show;
 
 use Dcat\Admin\Form;
 use Dcat\Admin\Support\Helper;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -84,7 +85,7 @@ class Tools implements Renderable
     /**
      * Append a tools.
      *
-     * @param mixed $tool
+     * @param string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */
@@ -98,7 +99,7 @@ class Tools implements Renderable
     /**
      * Prepend a tool.
      *
-     * @param mixed $tool
+     * @param string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */

src/Tree/Tools.php

@@ -4,6 +4,7 @@ namespace Dcat\Admin\Tree;
 
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Tree;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Collection;
 
@@ -35,7 +36,7 @@ class Tools implements Renderable
     /**
      * Prepend a tool.
      *
-     * @param string $tool
+     * @param string|\Closure|Renderable|Htmlable $tool
      *
      * @return $this
      */