Skip to content

[6.x] Fix named slots rendering empty inside nested partials #15341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanmcclean wants to merge 1 commit into
base: 6.x
Choose a base branch
from
+24 −1
Open

[6.x] Fix named slots rendering empty inside nested partials #15341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/View/Antlers/Language/Runtime/NodeProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ protected function checkPartialForNamedSlots(AntlersNode $node)
$namedSlots = [];

foreach ($node->children as $child) {
if ($child instanceof AntlersNode && ! $child->isComment && $child->name->name == 'slot') {
if ($child instanceof AntlersNode && ! $child->isComment && $child->isPaired() && $child->name->name == 'slot') {
$namedSlots[$child->name->methodPart] = $child;
}
}
Expand Down
23 changes: 23 additions & 0 deletions tests/Antlers/Runtime/PartialsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,27 @@ public function test_assignments_in_earlier_partials_do_not_blank_a_later_partia

$this->assertSame('FILTERhi<slot>KEEPME</slot>', $this->renderString($template, [], true));
}

public function test_named_slots_render_inside_a_nested_partial_that_uses_the_default_slot()
{
$template = <<<'EOT'
{{ partial:accordion index="1" }}
{{ slot:title }}<h2>The Title</h2>{{ /slot:title }}
{{ slot:icon }}<button>+</button>{{ /slot:icon }}
{{ slot:body }}<p>The Body</p>{{ /slot:body }}
{{ /partial:accordion }}
EOT;

$accordion = <<<'EOT'
<div id="accordion-{{ index }}">{{ partial:flex_column class="p-6" }}<div class="header">{{ slot:title }}{{ slot:icon }}</div><div class="content">{{ slot:body }}</div>{{ /partial:flex_column }}</div>
EOT;

$this->withFakeViews();
$this->viewShouldReturnRaw('accordion', $accordion);
$this->viewShouldReturnRaw('flex_column', '<div class="flex flex-col {{ class }}">{{ slot }}</div>');

$expected = '<div id="accordion-1"><div class="flex flex-col p-6"><div class="header"><h2>The Title</h2><button>+</button></div><div class="content"><p>The Body</p></div></div></div>';

$this->assertSame($expected, $this->renderString($template, [], true));
}
}
Loading