Merge pull request #2097 from sveltejs/gh-2031-with-fix

Rich-Harris · web-flow · commit 47ab23c1deb0 · 2019-02-17T15:23:55.000-04:00
assign elements to correct block when slots are involved
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compile/render-dom/wrappers/Element/index.ts
@@ -203,6 +203,10 @@ export default class ElementWrapper extends Wrapper {
 
 		if (this.slot_block) {
 			block.parent.addDependencies(block.dependencies);
+
+			// appalling hack
+			block.wrappers.splice(block.wrappers.indexOf(this), 1);
+			this.slot_block.wrappers.push(this);
 		}
 	}
 
@@ -216,13 +220,13 @@ export default class ElementWrapper extends Wrapper {
 
 		if (this.node.name === 'noscript') return;
 
-		const node = this.var;
-		const nodes = parentNodes && block.getUniqueName(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parentNodes is null
-
 		if (this.slot_block) {
 			block = this.slot_block;
 		}
 
+		const node = this.var;
+		const nodes = parentNodes && block.getUniqueName(`${this.var}_nodes`) // if we're in unclaimable territory, i.e. <head>, parentNodes is null
+
 		block.addVariable(node);
 		const renderStatement = this.getRenderStatement();
 		block.builders.create.addLine(
diff --git a/test/runtime/samples/component-slot-nested-in-element/One.svelte b/test/runtime/samples/component-slot-nested-in-element/One.svelte
@@ -0,0 +1,11 @@
+<script>
+	import Two from './Two.svelte';
+</script>
+
+<Two>
+	<div slot="b">
+		<div>
+			<slot name="a"></slot>
+		</div>
+	</div>
+</Two>
diff --git a/test/runtime/samples/component-slot-nested-in-element/Two.svelte b/test/runtime/samples/component-slot-nested-in-element/Two.svelte
@@ -0,0 +1 @@
+<slot name="b"></slot>
diff --git a/test/runtime/samples/component-slot-nested-in-element/_config.js b/test/runtime/samples/component-slot-nested-in-element/_config.js
@@ -0,0 +1,9 @@
+export default {
+	html: `
+		<div slot="b">
+			<div>
+				<div slot="a">a</div>
+			</div>
+		</div>
+	`
+};
diff --git a/test/runtime/samples/component-slot-nested-in-element/main.svelte b/test/runtime/samples/component-slot-nested-in-element/main.svelte
@@ -0,0 +1,7 @@
+<script>
+	import One from './One.svelte';
+</script>
+
+<One>
+	<div slot="a">a</div>
+</One>
