wip

brendt · brendt · commit 11b37da82663 · 2025-06-11T09:03:08.000+02:00
diff --git a/packages/view/src/Elements/ViewComponentElement.php b/packages/view/src/Elements/ViewComponentElement.php
@@ -27,7 +27,8 @@ 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, ':'))
@@ -80,6 +81,10 @@ public function getSlot(string $name = 'slot'): ?Element
                 $elements[] = $child;
             }
 
+            if ($elements === []) {
+                return null;
+            }
+
             return new CollectionElement($elements);
         }
 
@@ -156,18 +161,25 @@ public function compile(): string
                 '<?php $attributes = $_previousAttributes ?? null; ?>',
                 '<?php unset($_previousAttributes); ?>',
             )
+
             // Compile slots
             ->replaceRegex(
-                regex: '/<x-slot\s*(name="(?<name>[\w-]+)")?((\s*\/>)|><\/x-slot>)/',
+                regex: '/<x-slot\s*(name="(?<name>[\w-]+)")?/',
                 replace: function ($matches) {
-                    $name = $matches['name'] ?: 'slot';
+                    $name = $matches['name'] ?? 'slot';
 
                     $slot = $this->getSlot($name);
 
-                    if ($slot === null) {
+                    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 $this->environment->isProduction() ? '' : ('<!--' . $matches[0] . '-->');
+                        return ('<!--' . $matches[0] . '-->');
+                    } elseif($slot === null) {
+                        $default = $slotElement->match('/<x-slot.*?>((.|\n)*?)<\/x-slot>/') ?? '';
+
+                        if ($default) {
+                            $slot = new RawElement(tag: null, content: $default);
+                        }
                     }
 
                     return $slot->compile();
diff --git a/tests/Integration/View/ViewComponentTest.php b/tests/Integration/View/ViewComponentTest.php
@@ -897,4 +897,38 @@ public function test_escape_expression_attribute_in_view_components(): void
 
         $this->assertSnippetsMatch('<div class="foo" :escaped="foo"></div>', $html);
     }
+
+    public function test_default_slot_value(): void
+    {
+        $this->registerViewComponent('x-test', <<<'HTML'
+        <x-slot>Default</x-slot>
+        <x-slot name="a">Default A</x-slot>
+        <x-slot name="b">Default B</x-slot>
+        HTML);
+
+        $this->assertSnippetsMatch(<<<'HTML'
+        Overwritten
+        Overwritten A
+        Overwritten B
+        HTML, $this->render('<x-test>
+        Overwritten
+        <x-slot name="a">Overwritten A</x-slot>
+        <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>'));
+    }
 }
