fix: preserve blocks, remove content

Author: vardumper

src/TemplateGenerator/TwigComponentsGenerator.php

@@ -308,7 +308,11 @@ public function renderComponentClass(HTMLElementDelegatorInterface $element): st
         }
 
         $php .= "\n";
-        $php .= "        return \$resolver->resolve(\$data) + ['blocks' => \$data['blocks'] ?? null];\n";
+        $php .= "        \$resolved = \$resolver->resolve(\$data);\n";
+        $php .= "        if (isset(\$data['blocks'])) {\n";
+        $php .= "            \$resolved['blocks'] = \$data['blocks'];\n";
+        $php .= "        }\n";
+        $php .= "        return \$resolved;\n";
         $php .= "    }\n";
         $php .= "}\n";
 

templates/twig-component/src/Twig/Block/Article.php

@@ -200,6 +200,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Aside.php

@@ -203,6 +203,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Audio.php

@@ -179,6 +179,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Blockquote.php

@@ -210,6 +210,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Body.php

@@ -121,6 +121,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Canvas.php

@@ -213,6 +213,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Caption.php

@@ -207,6 +207,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Colgroup.php

@@ -57,6 +57,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }

templates/twig-component/src/Twig/Block/Datalist.php

@@ -207,6 +207,10 @@ public function preMount(array $data): array
         $resolver->setDefaults(['class' => null]);
         $resolver->setAllowedTypes('class', ['null', 'string']);
 
-        return $resolver->resolve($data) + ['blocks' => $data['blocks'] ?? null];
+        $resolved = $resolver->resolve($data);
+        if (isset($data['blocks'])) {
+            $resolved['blocks'] = $data['blocks'];
+        }
+        return $resolved;
     }
 }