wip

brendt · brendt · commit 84d33faa74c4 · 2025-06-23T13:03:55.000+02:00
diff --git a/packages/view/src/Elements/ViewComponentElement.php b/packages/view/src/Elements/ViewComponentElement.php
@@ -27,8 +27,7 @@ public function __construct(
         private readonly TempestViewCompiler $compiler,
         private readonly ViewComponent $viewComponent,
         array $attributes,
-    )
-    {
+    ) {
         $this->attributes = $attributes;
         $this->dataAttributes = arr($attributes)
             ->filter(fn ($_, $key) => ! str_starts_with($key, ':'))
@@ -81,10 +80,6 @@ public function getSlot(string $name = 'slot'): ?Element
                 $elements[] = $child;
             }
 
-            if ($elements === []) {
-                return null;
-            }
-
             return new CollectionElement($elements);
         }
 
@@ -142,7 +137,7 @@ public function compile(): string
 
         $compiled = $compiled
             ->prepend(
-                // Add attributes to the current scope
+            // Add attributes to the current scope
                 '<?php $_previousAttributes = $attributes ?? null; ?>',
                 sprintf('<?php $attributes = \Tempest\Support\arr(%s); ?>', var_export($this->dataAttributes, true)), // @mago-expect best-practices/no-debug-symbols Set the new value of $attributes for this view component
 
@@ -151,7 +146,7 @@ public function compile(): string
                 sprintf('<?php $slots = \Tempest\Support\arr(%s); ?>', var_export($slots, true)), // @mago-expect best-practices/no-debug-symbols Set the new value of $slots for this view component
             )
             ->append(
-                // Restore previous slots
+            // Restore previous slots
                 '<?php unset($slots); ?>',
                 '<?php $slots = $_previousSlots ?? null; ?>',
                 '<?php unset($_previousSlots); ?>',
@@ -161,25 +156,30 @@ public function compile(): string
                 '<?php $attributes = $_previousAttributes ?? null; ?>',
                 '<?php unset($_previousAttributes); ?>',
             )
-
             // Compile slots
             ->replaceRegex(
-                regex: '/<x-slot\s*(name="(?<name>[\w-]+)")?/',
+                regex: '/<x-slot\s*(name="(?<name>[\w-]+)")?((\s*\/>)|>(?<default>(.|\n)*?)<\/x-slot>)/',
                 replace: function ($matches) {
-                    $name = $matches['name'] ?? 'slot';
+                    $name = $matches['name'] ?: 'slot';
 
                     $slot = $this->getSlot($name);
 
-                    if ($slot === null && $this->environment->isProduction()) {
-                        // A slot doesn't have any content, so we'll comment it out.
-                        // This is to prevent DOM parsing errors (slots in <head> tags is one example, see #937)
-                        return ('<!--' . $matches[0] . '-->');
-                    } elseif($slot === null) {
-                        $default = $slotElement->match('/<x-slot.*?>((.|\n)*?)<\/x-slot>/') ?? '';
+                    $default = $matches['default'];
 
+                    if ($slot === null) {
                         if ($default) {
-                            $slot = new RawElement(tag: null, content: $default);
+                            return $default;
                         }
+
+                        // A slot doesn't have any content, so we'll comment it out.
+                        // This is to prevent DOM parsing errors (slots in <head> tags is one example, see #937)
+                        return $this->environment->isProduction() ? '' : ('<!--' . $matches[0] . '-->');
+                    }
+
+                    $compiled = $slot->compile();
+
+                    if (trim($compiled) === '') {
+                        return $default;
                     }
 
                     return $slot->compile();
@@ -188,4 +188,4 @@ public function compile(): string
 
         return $this->compiler->compile($compiled->toString());
     }
-}
+}
diff --git a/tests/Integration/View/ViewComponentTest.php b/tests/Integration/View/ViewComponentTest.php
@@ -916,19 +916,19 @@ public function test_default_slot_value(): void
         <x-slot name="b">Overwritten B</x-slot>
         </x-test>'));
 
-//        $this->assertSnippetsMatch(<<<'HTML'
-//        Overwritten
-//        Default A
-//        Overwritten B
-//        HTML, $this->render('<x-test>
-//        Overwritten
-//        <x-slot name="b">Overwritten B</x-slot>
-//        </x-test>'));
-//
-//        $this->assertSnippetsMatch(<<<'HTML'
-//        Default
-//        Default A
-//        Default B
-//        HTML, $this->render('<x-test></x-test>'));
+        $this->assertSnippetsMatch(<<<'HTML'
+        Overwritten
+        Default A
+        Overwritten B
+        HTML, $this->render('<x-test>
+        Overwritten
+        <x-slot name="b">Overwritten B</x-slot>
+        </x-test>'));
+
+        $this->assertSnippetsMatch(<<<'HTML'
+        Default
+        Default A
+        Default B
+        HTML, $this->render('<x-test></x-test>'));
     }
 }
