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

Remove optional chaining in astro-island (#4473)

Browse source
This commit is contained in:
Bjorn Lu 2022-08-25 22:01:22 +08:00 committed by GitHub
parent 8a2d6958f1
commit 467108730e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/olive-gifts-hope.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Remove optional chaining in astro-island

11
packages/astro/src/runtime/server/astro-island.ts
View file

@ -90,7 +90,10 @@ declare const Astro: {
); );
} }
hydrate = () => { hydrate = () => {
if (!this.hydrator || this.parentElement?.closest('astro-island[ssr]')) { if (
!this.hydrator ||
(this.parentElement && this.parentElement.closest('astro-island[ssr]'))
) {
return; return;
} }
const slotted = this.querySelectorAll('astro-slot'); const slotted = this.querySelectorAll('astro-slot');
@ -99,12 +102,14 @@ declare const Astro: {
// This happens if slots were passed but the client component did not render them. // This happens if slots were passed but the client component did not render them.
const templates = this.querySelectorAll('template[data-astro-template]'); const templates = this.querySelectorAll('template[data-astro-template]');
for (const template of templates) { for (const template of templates) {
if (!template.closest(this.tagName)?.isSameNode(this)) continue; const closest = template.closest(this.tagName);
if (!closest || !closest.isSameNode(this)) continue;
slots[template.getAttribute('data-astro-template') || 'default'] = template.innerHTML; slots[template.getAttribute('data-astro-template') || 'default'] = template.innerHTML;
template.remove(); template.remove();
} }
for (const slot of slotted) { for (const slot of slotted) {
if (!slot.closest(this.tagName)?.isSameNode(this)) continue; const closest = slot.closest(this.tagName);
if (!closest || !closest.isSameNode(this)) continue;
slots[slot.getAttribute('name') || 'default'] = slot.innerHTML; slots[slot.getAttribute('name') || 'default'] = slot.innerHTML;
} }
const props = this.hasAttribute('props') const props = this.hasAttribute('props')