From 4226cbb4c40a7872eeee17683b85a9779269a61d Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 24 Feb 2018 12:15:06 -0500
Subject: [PATCH] wrap <slot> updates in conditional - fixes #1144

---
 src/generators/nodes/Slot.ts                        |  2 ++
 .../samples/component-slot-dynamic/Nested.html      | 13 +++++++++++++
 .../samples/component-slot-dynamic/_config.js       |  9 +++++++++
 .../samples/component-slot-dynamic/main.html        | 13 +++++++++++++
 4 files changed, 37 insertions(+)
 create mode 100644 test/runtime/samples/component-slot-dynamic/Nested.html
 create mode 100644 test/runtime/samples/component-slot-dynamic/_config.js
 create mode 100644 test/runtime/samples/component-slot-dynamic/main.html

diff --git a/src/generators/nodes/Slot.ts b/src/generators/nodes/Slot.ts
index 4bcd034a55..2a2251448d 100644
--- a/src/generators/nodes/Slot.ts
+++ b/src/generators/nodes/Slot.ts
@@ -57,6 +57,7 @@ export default class Slot extends Element {
 		block.builders.create.pushCondition(`!${content_name}`);
 		block.builders.hydrate.pushCondition(`!${content_name}`);
 		block.builders.mount.pushCondition(`!${content_name}`);
+		block.builders.update.pushCondition(`!${content_name}`);
 		block.builders.unmount.pushCondition(`!${content_name}`);
 		block.builders.destroy.pushCondition(`!${content_name}`);
 
@@ -67,6 +68,7 @@ export default class Slot extends Element {
 		block.builders.create.popCondition();
 		block.builders.hydrate.popCondition();
 		block.builders.mount.popCondition();
+		block.builders.update.popCondition();
 		block.builders.unmount.popCondition();
 		block.builders.destroy.popCondition();
 
diff --git a/test/runtime/samples/component-slot-dynamic/Nested.html b/test/runtime/samples/component-slot-dynamic/Nested.html
new file mode 100644
index 0000000000..c7e0ccfad3
--- /dev/null
+++ b/test/runtime/samples/component-slot-dynamic/Nested.html
@@ -0,0 +1,13 @@
+<slot>
+	<span>{{foo}}</span>
+</slot>
+
+<script>
+	export default {
+		data() {
+			return {
+				foo: 'a'
+			};
+		}
+	};
+</script>
diff --git a/test/runtime/samples/component-slot-dynamic/_config.js b/test/runtime/samples/component-slot-dynamic/_config.js
new file mode 100644
index 0000000000..17f22b2830
--- /dev/null
+++ b/test/runtime/samples/component-slot-dynamic/_config.js
@@ -0,0 +1,9 @@
+export default {
+	html: `
+		<p>override default slot</p>
+	`,
+
+	test(assert, component) {
+		component.refs.nested.set({ foo: 'b' });
+	}
+};
diff --git a/test/runtime/samples/component-slot-dynamic/main.html b/test/runtime/samples/component-slot-dynamic/main.html
new file mode 100644
index 0000000000..348754d88c
--- /dev/null
+++ b/test/runtime/samples/component-slot-dynamic/main.html
@@ -0,0 +1,13 @@
+<Nested ref:nested>
+	<p>override default slot</p>
+</Nested>
+
+<script>
+	import Nested from './Nested.html';
+
+	export default {
+		components: {
+			Nested
+		}
+	};
+</script>