michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: edge case with slotted children (#2978)

Browse source
This commit is contained in:
Nate Moore 2022-04-04 01:18:07 -05:00 committed by GitHub
parent dc6e89f0a3
commit 3f0bc5af57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/flat-coats-crash.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fix edge case where default slots could be rendered too early for Astro components. Slots are now only rendered on demand.

4
packages/astro/src/runtime/server/index.ts
View file

@ -150,9 +150,8 @@ export async function renderComponent(
slots: any = {} slots: any = {}
) { ) {
Component = await Component; Component = await Component;
const children = await renderSlot(result, slots?.default);
if (Component === Fragment) { if (Component === Fragment) {
const children = await renderSlot(result, slots?.default);
if (children == null) { if (children == null) {
return children; return children;
} }
@ -197,6 +196,7 @@ Did you mean to add ${formatList(probableRendererNames.map((r) => '`' + r + '`')
throw new Error(message); throw new Error(message);
} }
const children = await renderSlot(result, slots?.default);
// Call the renderers `check` hook to see if any claim this component. // Call the renderers `check` hook to see if any claim this component.
let renderer: SSRLoadedRenderer | undefined; let renderer: SSRLoadedRenderer | undefined;
if (metadata.hydrate !== 'only') { if (metadata.hydrate !== 'only') {