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.

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

complain if named slots other than direct descendant of component #4509

Merged
Show file tree
Hide file tree
Changes from 2 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
28 changes: 11 additions & 17 deletions src/compiler/compile/nodes/Element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default class Element extends Node {
}

validate_attributes() {
const { component } = this;
const { component, parent } = this;

const attribute_map = new Map();

Expand Down Expand Up @@ -395,26 +395,20 @@ export default class Element extends Node {
component.slot_outlets.add(name);
}

let ancestor = this.parent;
do {
if (ancestor.type === 'InlineComponent') break;
if (ancestor.type === 'Element' && /-/.test(ancestor.name)) break;

if (ancestor.type === 'IfBlock' || ancestor.type === 'EachBlock') {
const type = ancestor.type === 'IfBlock' ? 'if' : 'each';
const message = `Cannot place slotted elements inside an ${type}-block`;
if (parent.type === 'IfBlock' || parent.type === 'EachBlock') {
tanhauhau marked this conversation as resolved.
Show resolved Hide resolved
const type = parent.type === 'IfBlock' ? 'if' : 'each';
const message = `Cannot place slotted elements inside an ${type}-block`;

component.error(attribute, {
code: `invalid-slotted-content`,
message
});
}
} while (ancestor = ancestor.parent);
component.error(attribute, {
code: `invalid-slotted-content`,
message
});
}

if (!ancestor) {
if (!(parent.type === 'InlineComponent' || (parent.type === 'Element' && /-/.test(parent.name)))) {
component.error(attribute, {
code: `invalid-slotted-content`,
message: `Element with a slot='...' attribute must be a descendant of a component or custom element`
message: `Element with a slot='...' attribute must be a child of a component or custom element`,
});
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<slot name="slot2"></slot>
3 changes: 3 additions & 0 deletions test/runtime/samples/component-slot-nested-error-2/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
error: [`Element with a slot='...' attribute must be a child of a component or custom element`]
};
11 changes: 11 additions & 0 deletions test/runtime/samples/component-slot-nested-error-2/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script>
import Nested from "./Nested.svelte";
</script>

<Nested>
<div slot="slot1">
<div>
<div slot="slot2" />
</div>
</div>
</Nested>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<slot name="slot2"></slot>
3 changes: 3 additions & 0 deletions test/runtime/samples/component-slot-nested-error-3/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
error: [`Element with a slot='...' attribute must be a child of a component or custom element`]
};
11 changes: 11 additions & 0 deletions test/runtime/samples/component-slot-nested-error-3/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script>
import Nested from "./Nested.svelte";
</script>

<Nested>
<div>
<div>
<div slot="slot2" />
</div>
</div>
</Nested>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<slot name="slot2"></slot>
3 changes: 3 additions & 0 deletions test/runtime/samples/component-slot-nested-error/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
error: [`Element with a slot='...' attribute must be a child of a component or custom element`]
};
9 changes: 9 additions & 0 deletions test/runtime/samples/component-slot-nested-error/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script>
import Nested from "./Nested.svelte";
</script>

<Nested>
<div slot="slot1">
<div slot="slot2" />
</div>
</Nested>
2 changes: 1 addition & 1 deletion test/validator/samples/slot-attribute-invalid/errors.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[{
"code": "invalid-slotted-content",
"message": "Element with a slot='...' attribute must be a descendant of a component or custom element",
"message": "Element with a slot='...' attribute must be a child of a component or custom element",
"start": {
"line": 1,
"column": 5,
Expand Down