From 8de4145cb2ac7a30a9483ab67145a1319989c892 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Tue, 24 Apr 2018 21:56:18 -0400
Subject: [PATCH] textarea special case

---
 src/generators/nodes/Binding.ts |  4 ++--
 src/generators/nodes/Element.ts | 33 +++++++++++++++------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/generators/nodes/Binding.ts b/src/generators/nodes/Binding.ts
index 4aca1807e0..2ff5a88ef7 100644
--- a/src/generators/nodes/Binding.ts
+++ b/src/generators/nodes/Binding.ts
@@ -205,7 +205,7 @@ function getEventHandler(
 			usesState: true,
 			usesStore: storeDependencies.length > 0,
 			mutation: `${list}[${index}]${tail} = ${value};`,
-			props: dependencies.map(prop => `${prop}: state.${prop}`),
+			props: dependencies.map(prop => `${prop}: ctx.${prop}`),
 			storeProps: storeDependencies.map(prop => `${prop}: $.${prop}`)
 		};
 	}
@@ -225,7 +225,7 @@ function getEventHandler(
 			usesState: true,
 			usesStore: storeDependencies.length > 0,
 			mutation: `${snippet} = ${value}`,
-			props: dependencies.map((prop: string) => `${prop}: state.${prop}`),
+			props: dependencies.map((prop: string) => `${prop}: ctx.${prop}`),
 			storeProps: storeDependencies.map(prop => `${prop}: $.${prop}`)
 		};
 	}
diff --git a/src/generators/nodes/Element.ts b/src/generators/nodes/Element.ts
index 8305884137..7109bfc875 100644
--- a/src/generators/nodes/Element.ts
+++ b/src/generators/nodes/Element.ts
@@ -51,6 +51,20 @@ export default class Element extends Node {
 		this.intro = null;
 		this.outro = null;
 
+		if (this.name === 'textarea') {
+			// this is an egregious hack, but it's the easiest way to get <textarea>
+			// children treated the same way as a value attribute
+			if (info.children.length > 0) {
+				info.attributes.push({
+					type: 'Attribute',
+					name: 'value',
+					value: info.children
+				});
+
+				info.children = [];
+			}
+		}
+
 		info.attributes.forEach(node => {
 			switch (node.type) {
 				case 'Action':
@@ -157,19 +171,6 @@ export default class Element extends Node {
 
 		const valueAttribute = this.attributes.find((attribute: Attribute) => attribute.name === 'value');
 
-		if (this.name === 'textarea') {
-			// this is an egregious hack, but it's the easiest way to get <textarea>
-			// children treated the same way as a value attribute
-			if (this.children.length > 0) {
-				this.attributes.push(new Attribute(this.compiler, this, {
-					name: 'value',
-					value: this.children
-				}));
-
-				this.children = [];
-			}
-		}
-
 		// special case — in a case like this...
 		//
 		//   <select bind:value='foo'>
@@ -184,7 +185,7 @@ export default class Element extends Node {
 			const binding = this.attributes.find(node => node.type === 'Binding' && node.name === 'value');
 			if (binding) {
 				// TODO does this also apply to e.g. `<input type='checkbox' bind:group='foo'>`?
-				const dependencies = binding.metadata.dependencies;
+				const dependencies = binding.expression.dependencies;
 				this.selectBindingDependencies = dependencies;
 				dependencies.forEach((prop: string) => {
 					this.compiler.indirectDependencies.set(prop, new Set());
@@ -203,10 +204,6 @@ export default class Element extends Node {
 			component._slots.add(slot);
 		}
 
-		if (this.spread) {
-			block.addDependencies(this.spread.metadata.dependencies);
-		}
-
 		this.var = block.getUniqueName(
 			this.name.replace(/[^a-zA-Z0-9_$]/g, '_')
 		);