From da980983c6efab11f90e926e2c62fb78ad5c4fbc Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 29 Nov 2016 11:40:35 -0500
Subject: [PATCH] retain SVG namespace inside each blocks

---
 compiler/generate/visitors/EachBlock.js           |  6 +++---
 compiler/generate/visitors/Element.js             |  4 ++--
 test/compiler/svg-each-block-namespace/_config.js | 15 +++++++++++++++
 test/compiler/svg-each-block-namespace/main.html  | 15 +++++++++++++++
 4 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 test/compiler/svg-each-block-namespace/_config.js
 create mode 100644 test/compiler/svg-each-block-namespace/main.html

diff --git a/compiler/generate/visitors/EachBlock.js b/compiler/generate/visitors/EachBlock.js
index b2fe66ccac..474eabce64 100644
--- a/compiler/generate/visitors/EachBlock.js
+++ b/compiler/generate/visitors/EachBlock.js
@@ -72,7 +72,7 @@ export default {
 
 		const params = generator.current.params + `, ${listName}, ${node.context}, ${indexName}`;
 
-		generator.current = {
+		generator.push({
 			useAnchor: false,
 			name: renderer,
 			target: 'target',
@@ -100,11 +100,11 @@ export default {
 			counter: counter(),
 
 			parent: generator.current
-		};
+		});
 	},
 
 	leave ( generator ) {
 		generator.addRenderer( generator.current );
-		generator.current = generator.current.parent;
+		generator.pop();
 	}
 };
diff --git a/compiler/generate/visitors/Element.js b/compiler/generate/visitors/Element.js
index 2a55994f4d..8f5bf5f861 100644
--- a/compiler/generate/visitors/Element.js
+++ b/compiler/generate/visitors/Element.js
@@ -148,7 +148,7 @@ export default {
 		if ( local.update.length ) generator.current.updateStatements.push( local.update.join( '\n' ) );
 		generator.current.teardownStatements.push( local.teardown.join( '\n' ) );
 
-		generator.current = Object.assign( {}, generator.current, {
+		generator.push({
 			isComponent,
 			namespace: local.namespace,
 			target: name,
@@ -162,7 +162,7 @@ export default {
 		const name = generator.current.target;
 		const isComponent = generator.current.isComponent;
 
-		generator.current = generator.current.parent;
+		generator.pop();
 
 		if ( isComponent ) return;
 
diff --git a/test/compiler/svg-each-block-namespace/_config.js b/test/compiler/svg-each-block-namespace/_config.js
new file mode 100644
index 0000000000..eccd720c03
--- /dev/null
+++ b/test/compiler/svg-each-block-namespace/_config.js
@@ -0,0 +1,15 @@
+export default {
+	html: `
+		<svg>
+			<circle cx='0' cy='100' r='100' fill='red'/><circle cx='100' cy='100' r='100' fill='green'/><circle cx='200' cy='100' r='100' fill='blue'/>
+		</svg>
+	`,
+
+	test ( assert, component, target ) {
+		const circles = target.querySelectorAll( 'circle' );
+		assert.equal( circles[0].namespaceURI, 'http://www.w3.org/2000/svg' );
+		assert.equal( circles[1].namespaceURI, 'http://www.w3.org/2000/svg' );
+		assert.equal( circles[2].namespaceURI, 'http://www.w3.org/2000/svg' );
+		component.teardown();
+	}
+};
diff --git a/test/compiler/svg-each-block-namespace/main.html b/test/compiler/svg-each-block-namespace/main.html
new file mode 100644
index 0000000000..95e5443d1e
--- /dev/null
+++ b/test/compiler/svg-each-block-namespace/main.html
@@ -0,0 +1,15 @@
+<svg>
+	{{#each colours as colour, i}}
+		<circle cx='{{i * 100}}' cy='100' r='100' fill='{{colour}}'/>
+	{{/each}}
+</svg>
+
+<script>
+	export default {
+		data () {
+			return {
+				colours: [ 'red', 'green', 'blue' ]
+			}
+		}
+	};
+</script>