Merge pull request #844 from sveltejs/gh-843

don't use skipped text nodes as anchors
sveltejs · Sep 12, 2017 · 129fb15 · 129fb15
2 parents b64d950 + 6147604
commit 129fb15
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts
@@ -417,6 +417,8 @@ function preprocessChildren(
 		const preprocessor = preprocessors[child.type];
 		if (preprocessor) preprocessor(generator, block, state, child, inEachBlock, elementStack, componentStack, stripWhitespace, cleaned[i + 1] || nextSibling);
 
+		if (child.shouldSkip) return;
+
 		if (lastChild) lastChild.next = child;
 		child.prev = lastChild;
 

diff --git a/test/runtime/samples/svg-each-block-anchor/_config.js b/test/runtime/samples/svg-each-block-anchor/_config.js
@@ -0,0 +1,25 @@
+export default {
+	data: {
+		foo: ['a'],
+		bar: ['c']
+	},
+
+	html: `
+		<svg>
+			<g class='foo'>a</g>
+			<g class='bar'>c</g>
+		</svg>
+	`,
+
+	test(assert, component, target) {
+		component.set({ foo: ['a', 'b'] });
+
+		assert.htmlEqual(target.innerHTML, `
+			<svg>
+				<g class='foo'>a</g>
+				<g class='foo'>b</g>
+				<g class='bar'>c</g>
+			</svg>
+		`);
+	}
+};
diff --git a/test/runtime/samples/svg-each-block-anchor/main.html b/test/runtime/samples/svg-each-block-anchor/main.html
@@ -0,0 +1,9 @@
+<svg>
+	{{#each foo as x}}
+		<g class='foo'></g>
+	{{/each}}
+
+	{{#each bar as y}}
+		<g class='bar'></g>
+	{{/each}}
+</svg>