From 01ec3000f3653cbb227038f170cbab1bd905a935 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Wed, 5 Jul 2017 12:33:47 -0400
Subject: [PATCH] fix context for bindings (#685)

---
 .../dom/visitors/Component/Binding.ts         |  3 +-
 .../dom/visitors/Element/Binding.ts           |  3 +-
 .../dom/visitors/Element/EventHandler.ts      |  2 +-
 .../dom/visitors/shared/binding/getSetter.ts  |  7 ++--
 .../binding-select-in-each-block/_config.js   | 32 +++++++++++++++++++
 .../binding-select-in-each-block/main.html    |  6 ++++
 6 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 test/runtime/samples/binding-select-in-each-block/_config.js
 create mode 100644 test/runtime/samples/binding-select-in-each-block/main.html

diff --git a/src/generators/dom/visitors/Component/Binding.ts b/src/generators/dom/visitors/Component/Binding.ts
index cd107092385a..26d853242a9c 100644
--- a/src/generators/dom/visitors/Component/Binding.ts
+++ b/src/generators/dom/visitors/Component/Binding.ts
@@ -54,7 +54,8 @@ export default function visitBinding(
 		block,
 		name,
 		snippet,
-		context: '_context',
+		_this: 'this',
+		props: '_context',
 		attribute,
 		dependencies,
 		value: 'value',
diff --git a/src/generators/dom/visitors/Element/Binding.ts b/src/generators/dom/visitors/Element/Binding.ts
index d2acbdd5835d..37482f19864a 100644
--- a/src/generators/dom/visitors/Element/Binding.ts
+++ b/src/generators/dom/visitors/Element/Binding.ts
@@ -53,7 +53,8 @@ export default function visitBinding(
 		block,
 		name,
 		snippet,
-		context: '_svelte',
+		_this: state.parentNode,
+		props: '_svelte',
 		attribute,
 		dependencies,
 		value,
diff --git a/src/generators/dom/visitors/Element/EventHandler.ts b/src/generators/dom/visitors/Element/EventHandler.ts
index 64178f549981..b66f6b8c3d5f 100644
--- a/src/generators/dom/visitors/Element/EventHandler.ts
+++ b/src/generators/dom/visitors/Element/EventHandler.ts
@@ -64,7 +64,7 @@ export default function visitEventHandler(
 	// create the handler body
 	const handlerBody = deindent`
 		${state.usesComponent &&
-			`var ${block.alias('component')} = this._svelte.component;`}
+			`var ${block.alias('component')} = ${_this}._svelte.component;`}
 		${declarations}
 		[✂${attribute.expression.start}-${attribute.expression.end}✂];
 	`;
diff --git a/src/generators/dom/visitors/shared/binding/getSetter.ts b/src/generators/dom/visitors/shared/binding/getSetter.ts
index 5657ab9ef53e..784e1d7302e3 100644
--- a/src/generators/dom/visitors/shared/binding/getSetter.ts
+++ b/src/generators/dom/visitors/shared/binding/getSetter.ts
@@ -6,7 +6,8 @@ export default function getSetter({
 	block,
 	name,
 	snippet,
-	context,
+	_this,
+	props,
 	attribute,
 	dependencies,
 	value,
@@ -20,8 +21,8 @@ export default function getSetter({
 		const computed = isComputed(attribute.value);
 
 		return deindent`
-			var list = this.${context}.${block.listNames.get(name)};
-			var index = this.${context}.${block.indexNames.get(name)};
+			var list = ${_this}.${props}.${block.listNames.get(name)};
+			var index = ${_this}.${props}.${block.indexNames.get(name)};
 			${computed && `var state = #component.get();`}
 			list[index]${tail} = ${value};
 
diff --git a/test/runtime/samples/binding-select-in-each-block/_config.js b/test/runtime/samples/binding-select-in-each-block/_config.js
new file mode 100644
index 000000000000..5a333501bbf1
--- /dev/null
+++ b/test/runtime/samples/binding-select-in-each-block/_config.js
@@ -0,0 +1,32 @@
+export default {
+	skip: true, // JSDOM...
+
+	html: `
+		<select>
+			<option value='hullo'>Hullo</option>
+			<option value='world'>World</option>
+		</select>
+
+		<select>
+			<option value='hullo'>Hullo</option>
+			<option value='world'>World</option>
+		</select>
+	`,
+
+	data: {
+		items: [{ value: 'hullo' }, { value: 'world' }]
+	},
+
+	test(assert, component, target, window) {
+		const selects = [...target.querySelectorAll('select')];
+
+		const change = new window.Event('change');
+
+		selects[1].options[0].selected = true;
+		selects[1].dispatchEvent(change);
+
+		assert.deepEqual(component.get('items'), [
+			{ value: 'hullo' }, { value: 'hullo' }
+		]);
+	}
+};
diff --git a/test/runtime/samples/binding-select-in-each-block/main.html b/test/runtime/samples/binding-select-in-each-block/main.html
new file mode 100644
index 000000000000..f61ee5b2ca11
--- /dev/null
+++ b/test/runtime/samples/binding-select-in-each-block/main.html
@@ -0,0 +1,6 @@
+{{#each items as item}}
+	<select bind:value="item.value">
+		<option value="hullo">Hullo</option>
+		<option value="world">World</option>
+	</select>
+{{/each}}
\ No newline at end of file