From 81bf0fd4ad22802c195e5a849bd8f95e0d76fbe4 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Thu, 20 Sep 2018 22:33:19 -0400
Subject: [PATCH] more fixes. almost there

---
 src/compile/render-dom/wrappers/Element/Attribute.ts | 4 +++-
 src/compile/render-dom/wrappers/Element/index.ts     | 9 +++++++--
 src/compile/render-dom/wrappers/IfBlock.ts           | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compile/render-dom/wrappers/Element/Attribute.ts
index 414f4fe924..9cc99c3592 100644
--- a/src/compile/render-dom/wrappers/Element/Attribute.ts
+++ b/src/compile/render-dom/wrappers/Element/Attribute.ts
@@ -9,13 +9,15 @@ export default class AttributeWrapper {
 	node: Attribute;
 	parent: ElementWrapper;
 
-	constructor(node: Attribute, parent: ElementWrapper) {
+	constructor(parent: ElementWrapper, block: Block, node: Attribute) {
 		this.node = node;
 		this.parent = parent;
 
 		if (node.dependencies.size > 0) {
 			parent.cannotUseInnerHTML();
 
+			block.addDependencies(node.dependencies);
+
 			// special case — <option value={foo}> — see below
 			if (this.parent.node.name === 'option' && node.name === 'value') {
 				let select: ElementWrapper = this.parent;
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compile/render-dom/wrappers/Element/index.ts
index f8c0e46704..b26fc41b97 100644
--- a/src/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compile/render-dom/wrappers/Element/index.ts
@@ -130,9 +130,9 @@ export default class ElementWrapper extends Wrapper {
 				owner._slots.add(attribute.getStaticValue());
 			}
 			if (attribute.name === 'style') {
-				return new StyleAttributeWrapper(attribute, this);
+				return new StyleAttributeWrapper(this, block, attribute);
 			}
-			return new AttributeWrapper(attribute, this);
+			return new AttributeWrapper(this, block, attribute);
 		});
 
 		let has_bindings;
@@ -166,6 +166,11 @@ export default class ElementWrapper extends Wrapper {
 
 		if (node.animation) {
 			block.addAnimation();
+			this.cannotUseInnerHTML();
+		}
+
+		if (node.ref) {
+			this.cannotUseInnerHTML();
 		}
 
 		this.fragment = new FragmentWrapper(renderer, block, node.children, this, stripWhitespace, nextSibling);
diff --git a/src/compile/render-dom/wrappers/IfBlock.ts b/src/compile/render-dom/wrappers/IfBlock.ts
index a994221cb5..e45b17bcfd 100644
--- a/src/compile/render-dom/wrappers/IfBlock.ts
+++ b/src/compile/render-dom/wrappers/IfBlock.ts
@@ -221,6 +221,7 @@ export default class IfBlockWrapper extends Wrapper {
 				${this.branches
 					.map(({ condition, block }) => `${condition ? `if (${condition}) ` : ''}return ${block.name};`)
 					.join('\n')}
+				${!hasElse && `return -1;`}
 			}
 		`);
 
@@ -298,6 +299,7 @@ export default class IfBlockWrapper extends Wrapper {
 				${this.branches
 					.map(({ condition, block }, i) => `${condition ? `if (${condition}) ` : ''}return ${block ? i : -1};`)
 					.join('\n')}
+				${!hasElse && `return -1;`}
 			}
 		`);