Parity with slot contents

statamic · Oct 30, 2024 · dba197e · dba197e
1 parent 02fe069
commit dba197e
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/src/Tags/Partial.php b/src/Tags/Partial.php
@@ -2,6 +2,8 @@
 
 namespace Statamic\Tags;
 
+use Illuminate\Support\HtmlString;
+
 class Partial extends Tags
 {
     public function wildcard($tag)
@@ -21,14 +23,25 @@ protected function render($partial)
 
         $variables = array_merge($this->context->all(), $this->params->all(), [
             '__frontmatter' => $this->params->all(),
-            'slot' => $this->isPair ? trim($this->parse()) : null,
+            'slot' => $this->isPair ? $this->getSlotContent() : null,
         ]);
 
         return view($this->viewName($partial), $variables)
             ->withoutExtractions()
             ->render();
     }
 
+    protected function getSlotContent()
+    {
+        $content = trim($this->parse());
+
+        if ($this->isAntlersBladeComponent()) {
+            return new HtmlString($content);
+        }
+
+        return $content;
+    }
+
     protected function shouldRender(): bool
     {
         if ($this->params->has('when')) {

diff --git a/src/View/Blade/Concerns/CompilesPartials.php b/src/View/Blade/Concerns/CompilesPartials.php
@@ -89,7 +89,7 @@ protected function compilePartial(ComponentNode $component): string
             $injectedParam->setName($name);
             $injectedParam->type = ParameterType::DynamicVariable;
 
-            $injectedParam->value = '\Illuminate\Support\Facades\Blade::render($'.$hoistedVarName.', get_defined_vars())';
+            $injectedParam->value = 'new \Illuminate\Support\HtmlString(\Illuminate\Support\Facades\Blade::render($'.$hoistedVarName.', get_defined_vars()))';
 
             $hoistedSet .= Str::swap([
                 '$varName' => $hoistedVarName,

diff --git a/tests/View/Blade/AntlersComponents/PartialCompilerTest.php b/tests/View/Blade/AntlersComponents/PartialCompilerTest.php
@@ -333,4 +333,50 @@ public function it_compiles_nested_self_closing_partial_tags()
             Str::squish(Blade::render($template))
         );
     }
+
+    #[Test]
+    public function slot_content_does_not_need_to_be_manually_escaped()
+    {
+        $this->withFakeViews();
+
+        $partial = <<<'BLADE'
+Partial Start {{ $slot }} Partial End
+BLADE;
+
+        $this->viewShouldReturnRaw('the_partial', $partial, 'blade.php');
+
+        $template = <<<'BLADE'
+<s:partial:the_partial>
+<strong>I am the slot content!</strong>
+</s:partial:the_partial>
+BLADE;
+
+        $this->assertSame(
+            'Partial Start <strong>I am the slot content!</strong> Partial End',
+            Blade::render($template),
+        );
+        $partial = <<<'BLADE'
+Header Start {{ $header }} Header End
+Partial Start {{ $slot }} Partial End
+BLADE;
+
+        $this->viewShouldReturnRaw('the_partial', $partial, 'blade.php');
+
+        $template = <<<'BLADE'
+<s:partial:the_partial>
+<s:slot:header>I am <em>the header!</em></s:slot:header>
+<strong>I am the slot content!</strong>
+</s:partial:the_partial>
+BLADE;
+
+        $expected = <<<'EXPECTED'
+Header Start I am <em>the header!</em> Header End
+Partial Start <strong>I am the slot content!</strong> Partial End
+EXPECTED;
+
+        $this->assertSame(
+            $expected,
+            Blade::render($template),
+        );
+    }
 }