M structure navigation

Author: vvval

source/NavigationBuilder/Bootloaders/NavigationBootloader.php

@@ -29,7 +29,7 @@ class NavigationBootloader extends Bootloader
      */
     public function defaultNavigation(Navigation $navigation, DefaultRenderer $renderer)
     {
-        $navigation->setRenderer($renderer);
+        $navigation->withRenderer($renderer);
 
         return $navigation;
     }

source/NavigationBuilder/Builders/HtmlBuilder.php

@@ -2,6 +2,8 @@
 
 namespace Spiral\NavigationBuilder\Builders;
 
+use Spiral\NavigationBuilder\Database\Sources\TreeSource;
+use Spiral\NavigationBuilder\DefaultRenderer;
 use Spiral\NavigationBuilder\RendererInterface;
 
 class HtmlBuilder extends StructureBuilder
@@ -10,13 +12,30 @@ class HtmlBuilder extends StructureBuilder
     private $renderer;
 
     /**
-     * @param RendererInterface $renderer
+     * HtmlBuilder constructor.
+     *
+     * @param TreeSource      $source
+     * @param DefaultRenderer $renderer
      */
-    public function setRenderer(RendererInterface $renderer)
+    public function __construct(TreeSource $source, DefaultRenderer $renderer)
     {
+        parent::__construct($source);
+
         $this->renderer = $renderer;
     }
 
+    /**
+     * @param RendererInterface $renderer
+     * @return HtmlBuilder
+     */
+    public function withRenderer(RendererInterface $renderer): HtmlBuilder
+    {
+        $builder = clone $this;
+        $builder->renderer = $renderer;
+
+        return $builder;
+    }
+
     /**
      * @param string $domain
      * @return string

source/NavigationBuilder/Navigation.php

@@ -49,23 +49,24 @@ public function __construct(
         RendererInterface $renderer,
         Storage $storage
     ) {
+        $htmlBuilder = $htmlBuilder->withRenderer($renderer);
+
         $this->treeBuilder = $treeBuilder;
         $this->htmlBuilder = $htmlBuilder;
         $this->structureBuilder = $structureBuilder;
         $this->storage = $storage;
-
-        $this->setRenderer($renderer);
+        $this->renderer = $renderer;
     }
 
     /**
      * @param RendererInterface $renderer
      * @return Navigation
      */
-    public function setRenderer(RendererInterface $renderer): Navigation
+    public function withRenderer(RendererInterface $renderer): Navigation
     {
         $navigation = clone $this;
         $navigation->renderer = $renderer;
-        $navigation->htmlBuilder->setRenderer($renderer);
+        $navigation->htmlBuilder = $navigation->htmlBuilder->withRenderer($renderer);
 
         return $navigation;
     }