🩹 Fix innerBlocks template handling (Fixes #269) (#270)

Log1x · Jul 19, 2024 · 4771016 · 4771016
1 parent 8d08e3d
commit 4771016
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/Block.php b/src/Block.php
@@ -414,18 +414,20 @@ public function handleTemplate(array $template = []): Collection
     {
         return collect($template)->map(function ($block, $key) {
             $name = is_numeric($key)
-                ? (is_string($block) ? $block : array_key_first($block))
+                ? array_key_first((array) $block)
                 : $key;
 
             $value = is_numeric($key)
-                ? (is_string($block) ? [] : $block[$name])
+                ? ($block[$name] ?? [])
                 : $block;
 
-            $value = is_array($value) && Arr::has($value, 'innerBlocks')
-                ? array_merge($value, [
-                    'innerBlocks' => $this->handleTemplate($value['innerBlocks'])->all(),
-                ])
-                : $value;
+            if (is_array($value) && isset($value['innerBlocks'])) {
+                $innerBlocks = $this->handleTemplate($value['innerBlocks'])->all();
+
+                unset($value['innerBlocks']);
+
+                return [$name, $value, $innerBlocks];
+            }
 
             return [$name, $value];
         })->values();