Merge pull request #1047 from sveltejs/gh-1040

create initial data for dynamic components in correct place

src/generators/nodes/Component.ts

@@ -256,13 +256,13 @@ export default class Component extends Node {
 				var ${switch_vars.value} = ${snippet};
 
 				function ${switch_vars.props}(${params}) {
+					${statements.length > 0 && statements.join('\n')}
 					return {
 						${componentInitProperties.join(',\n')}
 					};
 				}
 
 				if (${switch_vars.value}) {
-					${statements.length > 0 && statements.join('\n')}
 					var ${name} = new ${expression}(${switch_vars.props}(${params}));
 
 					${beforecreate}

test/runtime/samples/dynamic-component-bindings-recreated/Green.html

@@ -0,0 +1 @@
+<p>green {{foo}}</p>

test/runtime/samples/dynamic-component-bindings-recreated/Red.html

@@ -0,0 +1 @@
+<p>red {{foo}}</p>

test/runtime/samples/dynamic-component-bindings-recreated/_config.js

@@ -0,0 +1,29 @@
+export default {
+	data: {
+		x: true,
+		foo: 'one'
+	},
+
+	html: `
+		<p>green one</p>
+	`,
+
+	test(assert, component, target) {
+		component.set({
+			x: false
+		});
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>red one</p>
+		`);
+
+		component.set({
+			x: true,
+			foo: 'two'
+		});
+
+		assert.htmlEqual(target.innerHTML, `
+			<p>green two</p>
+		`);
+	}
+};

test/runtime/samples/dynamic-component-bindings-recreated/main.html

@@ -0,0 +1,15 @@
+<:Component {x ? Green : Red} bind:foo />
+
+<script>
+	import Green from './Green.html';
+	import Red from './Red.html';
+
+	export default {
+		data() {
+			return {
+				Green,
+				Red
+			};
+		}
+	};
+</script>