Skip to content
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

Fix slot fallbacks unexpectedly showing up in some cases #6819

Merged
merged 6 commits into from
Apr 12, 2023
Merged

Fix slot fallbacks unexpectedly showing up in some cases #6819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dafec47
test: add test fixture
MoustaphaDev Apr 11, 2023
bbb36bb
test: add test case
MoustaphaDev Apr 11, 2023
4334a3d
test: revert unneeded changes in fixture
MoustaphaDev Apr 11, 2023
4d9cfe4
fix
MoustaphaDev Apr 11, 2023
c10b06f
chore: changeset
MoustaphaDev Apr 11, 2023
fba93ef
Merge branch 'main' into fix-solt-fallbacks
MoustaphaDev Apr 11, 2023
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
5 changes: 5 additions & 0 deletions .changeset/healthy-experts-worry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fix fallback content showing unexpectedly in some cases
2 changes: 1 addition & 1 deletion packages/astro/src/runtime/server/render/slot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export async function* renderSlot(
yield* iterator;
}

if (fallback) {
if (fallback && !slotted) {
MoustaphaDev marked this conversation as resolved.
Show resolved Hide resolved
yield* renderSlot(result, fallback);
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/astro/test/astro-slots.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ describe('Slots', () => {
const $ = cheerio.load(html);

expect($('#override')).to.have.lengthOf(1);
expect($('#fallback-2').text()).to.equal('Slotty slot.');
});

it('Slots work with multiple elements', async () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/astro/test/fixtures/astro-slots/src/components/Fallback2.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!-- note: to make testing easier this was inlined -->
<div id="fallback-2"><slot name="override-2">Fallback should only show when no slot has been provided.</slot></div>
2 changes: 2 additions & 0 deletions packages/astro/test/fixtures/astro-slots/src/pages/fallback-override.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
import Fallback from '../components/Fallback.astro';
import Fallback2 from '../components/Fallback2.astro';
---

<html>
Expand All @@ -11,6 +12,7 @@ import Fallback from '../components/Fallback.astro';
<Fallback>
<div id="override" />
</Fallback>
<Fallback2><div slot="override-2">Slotty slot.</div></Fallback2>
</div>
</body>
</html>