Skip to content

fix: account for shadowing children slot during migration #14224

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

Merged
merged 1 commit into from
Nov 8, 2024
Merged

fix: account for shadowing children slot during migration #14224

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
5 changes: 5 additions & 0 deletions .changeset/lazy-chefs-float.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: account for shadowing children slot during migration
15 changes: 15 additions & 0 deletions packages/svelte/src/compiler/migrate/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,21 @@ const template = {
existing_prop.needs_refine_type = false;
}

if (
slot_name === 'default' &&
path.some(
(parent) =>
(parent.type === 'SvelteComponent' ||
parent.type === 'Component' ||
parent.type === 'RegularElement' ||
parent.type === 'SvelteElement' ||
parent.type === 'SvelteFragment') &&
parent.attributes.some((attr) => (attr.type = 'LetDirective'))
)
) {
aliased_slot_name = `${name}_render`;
state.derived_conflicting_slots.set(aliased_slot_name, name);
}
name = aliased_slot_name ?? name;

if (node.fragment.nodes.length > 0) {
Expand Down
10 changes: 10 additions & 0 deletions packages/svelte/tests/migrate/samples/shadowed-forwarded-slot/input.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,14 @@
</div>
</MyComponent>
</div>
</MyInput>

<MyInput let:args>
<slot/>
</MyInput>

<MyInput>
<div let:args>
<slot/>
</div>
</MyInput>
18 changes: 17 additions & 1 deletion packages/svelte/tests/migrate/samples/shadowed-forwarded-slot/output.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
/**
* @typedef {Object} Props
* @property {import('svelte').Snippet} [label]
* @property {import('svelte').Snippet} [children]
*/

/** @type {Props} */
let { label } = $props();
let { label, children } = $props();
const label_render = $derived(label);
const children_render = $derived(children);

</script>

Expand All @@ -30,4 +32,18 @@
</MyComponent>
</div>
{/snippet}
</MyInput>

<MyInput >
{#snippet children({ args })}
{@render children_render?.()}
{/snippet}
</MyInput>

<MyInput>
<div >
{#snippet children({ args })}
{@render children_render?.()}
{/snippet}
</div>
</MyInput>
Loading