Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/huge-poets-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: coordinate mount of snippets with await expressions
31 changes: 28 additions & 3 deletions packages/svelte/src/internal/client/dom/blocks/boundary.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
skip_nodes,
set_hydrate_node
} from '../hydration.js';
import { get_next_sibling } from '../operations.js';
import { create_text, get_next_sibling } from '../operations.js';
import { queue_micro_task } from '../task.js';
import * as e from '../../errors.js';
import * as w from '../../warnings.js';
Expand Down Expand Up @@ -93,6 +93,9 @@ export class Boundary {
/** @type {DocumentFragment | null} */
#offscreen_fragment = null;

/** @type {TemplateNode | null} */
#pending_anchor = null;

#local_pending_count = 0;
#pending_count = 0;

Expand Down Expand Up @@ -156,8 +159,17 @@ export class Boundary {
this.#hydrate_resolved_content();
}
} else {
var anchor = this.#anchor;

if (this.#pending) {
this.#pending_anchor = create_text();
this.#anchor.before(this.#pending_anchor);

anchor = this.#pending_anchor;
}

try {
this.#main_effect = branch(() => children(this.#anchor));
this.#main_effect = branch(() => children(anchor));
} catch (error) {
this.error(error);
}
Expand All @@ -166,6 +178,7 @@ export class Boundary {
this.#show_pending_snippet();
} else {
this.#pending = false;
this.#pending_anchor?.remove();
}
}
}, flags);
Expand Down Expand Up @@ -195,9 +208,18 @@ export class Boundary {
this.#pending_effect = branch(() => pending(this.#anchor));

Batch.enqueue(() => {
var anchor = this.#anchor;

if (this.#pending) {
this.#pending_anchor = create_text();
this.#anchor.before(this.#pending_anchor);

anchor = this.#pending_anchor;
}

this.#main_effect = this.#run(() => {
Batch.ensure();
return branch(() => this.#children(this.#anchor));
return branch(() => this.#children(anchor));
});

if (this.#pending_count > 0) {
Expand All @@ -208,6 +230,7 @@ export class Boundary {
});

this.#pending = false;
this.#pending_anchor?.remove();
}
});
}
Expand Down Expand Up @@ -253,6 +276,7 @@ export class Boundary {

if (this.#main_effect !== null) {
this.#offscreen_fragment = document.createDocumentFragment();
this.#offscreen_fragment.append(/** @type {TemplateNode} */ (this.#pending_anchor));
move_effect(this.#main_effect, this.#offscreen_fragment);
}

Expand Down Expand Up @@ -288,6 +312,7 @@ export class Boundary {
}

if (this.#offscreen_fragment) {
this.#pending_anchor?.remove();
this.#anchor.before(this.#offscreen_fragment);
this.#offscreen_fragment = null;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script>
let { children, push } = $props();
let message = await push('hello from child');
</script>

<p>message: {message}</p>
{@render children()}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { tick } from 'svelte';
import { test } from '../../test';

export default test({
async test({ assert, target }) {
const [shift] = target.querySelectorAll('button');

shift.click();
await tick();

assert.htmlEqual(target.innerHTML, `<button>shift</button><p>loading...</p>`);

shift.click();
await tick();

assert.htmlEqual(
target.innerHTML,
`
<button>shift</button>
<p>message: hello from child</p>
<p>hello from parent</p>
`
);
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<script>
import Child from './Child.svelte';

const resolvers = [];

function push(value) {
const { promise, resolve } = Promise.withResolvers();
resolvers.push(() => resolve(value));
return promise;
}
</script>

<button onclick={() => resolvers.shift()?.()}>shift</button>

<svelte:boundary>
<Child {push}>
<p>{await push('hello from parent')}</p>
</Child>

{#snippet pending()}
<p>loading...</p>
{/snippet}
</svelte:boundary>
Loading