Backport repeaters implementation.

area17 · Mar 15, 2022 · aeb6dae · aeb6dae
1 parent 10fa96f
commit aeb6dae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Models/Behaviors/HasBlocks.php b/src/Models/Behaviors/HasBlocks.php
@@ -34,7 +34,7 @@ public function renderNamedBlocks($name = 'default', $renderChilds = true, $bloc
                     $childBlocks = $this->blocks->where('parent_id', $block->id);
 
                     $renderedChildViews = $childBlocks->map(function ($childBlock) use ($blockViewMappings, $data) {
-                        $class = BlockConfig::getForType($childBlock->type);
+                        $class = BlockConfig::findFirstWithType($childBlock->type);
                         $view = $class->getBlockView($blockViewMappings);
                         $data = $class->getData($data, $childBlock);
 
@@ -44,7 +44,7 @@ public function renderNamedBlocks($name = 'default', $renderChilds = true, $bloc
 
                 $block->childs = $this->blocks->where('parent_id', $block->id);
 
-                $class = BlockConfig::getForType($block->type);
+                $class = BlockConfig::findFirstWithType($block->type);
                 $view = $class->getBlockView($blockViewMappings);
                 $data = $class->getData($data, $block);
 

diff --git a/src/Services/Blocks/Block.php b/src/Services/Blocks/Block.php
@@ -138,6 +138,14 @@ public static function make($file, $type, $source, $name = null): self
         return new self($file, $type, $source, $name);
     }
 
+    /**
+     * Gets the first match being a block or repeater.
+     */
+    public static function findFirstWithType(string $type): ?self
+    {
+        return app(BlockCollection::class)->findByName($type);
+    }
+
     public static function getForType(string $type, bool $repeater = false): self
     {
         if ($repeater) {