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 allow let scoped to root element #4266

Merged
merged 4 commits into from
Jan 16, 2020
Merged

fix allow let scoped to root element #4266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa8dcb2
fix allow let scoped to root element
tanhauhau Jan 15, 2020
d503739
tidy
Conduitry Jan 16, 2020
7c2fa47
Merge branch 'master' into pr/4266
Conduitry Jan 16, 2020
ef5ef88
update changelog
Conduitry Jan 16, 2020
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Svelte changelog

## Unreleased

* Allow access to `let:` variables in sibling attributes on slot root ([#4173](https://github.com/sveltejs/svelte/issues/4173))

## 3.17.1

* Only attach SSR mode markers to a component's `<head>` elements when compiling with `hydratable: true` ([#4258](https://github.com/sveltejs/svelte/issues/4258))
Expand Down
31 changes: 15 additions & 16 deletions src/compiler/compile/nodes/Element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ export default class Element extends Node {
}
}

const has_let = info.attributes.some(node => node.type === 'Let');
if (has_let) {
scope = scope.child();
}

// Binding relies on Attribute, defer its evaluation
const order = ['Binding']; // everything else is -1
info.attributes.sort((a, b) => order.indexOf(a.type) - order.indexOf(b.type));
Expand Down Expand Up @@ -181,9 +186,16 @@ export default class Element extends Node {
this.handlers.push(new EventHandler(component, this, scope, node));
break;

case 'Let':
this.lets.push(new Let(component, this, scope, node));
case 'Let': {
const l = new Let(component, this, scope, node);
this.lets.push(l);
const dependencies = new Set([l.name.name]);

l.names.forEach(name => {
scope.add(name, dependencies, this);
});
break;
}

case 'Transition':
{
Expand All @@ -202,20 +214,7 @@ export default class Element extends Node {
}
});

if (this.lets.length > 0) {
this.scope = scope.child();

this.lets.forEach(l => {
const dependencies = new Set([l.name.name]);

l.names.forEach(name => {
this.scope.add(name, dependencies, this);
});
});
} else {
this.scope = scope;
}

this.scope = scope;
this.children = map_children(component, this, this.scope, info.children);

this.validate();
Expand Down
5 changes: 5 additions & 0 deletions test/runtime/samples/component-slot-let-g/A.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script>
export let x;
</script>

<slot name="foo" reflected={x}/>
22 changes: 22 additions & 0 deletions test/runtime/samples/component-slot-let-g/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
export default {
html: `
<span slot="foo" class="1">1</span>
0
`,
async test({ assert, target, component, window }) {
component.x = 2;

assert.htmlEqual(target.innerHTML, `
<span slot="foo" class="2">2</span>
0
`);

const span = target.querySelector('span');
await span.dispatchEvent(new window.MouseEvent('click'));

assert.htmlEqual(target.innerHTML, `
<span slot="foo" class="2">2</span>
2
`);
}
};
17 changes: 17 additions & 0 deletions test/runtime/samples/component-slot-let-g/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<script>
import A from './A.svelte';
export let x = 1;
let y = 0;
</script>

<A {x}>
<span
on:click={() => y = reflected}
slot="foo"
let:reflected
class={reflected}
>
{reflected}
</span>
</A>
{ y }