Merge pull request #510 from sveltejs/gh-509

null out else block references when they are destroyed
sveltejs · Apr 19, 2017 · e627875 · e627875
2 parents 7f9d91f + a0a7583
commit e627875
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js
@@ -66,12 +66,16 @@ export default function visitEachBlock ( generator, block, state, node ) {
 					${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );
 				} else if ( ${each_block_else} ) {
 					${each_block_else}.destroy( true );
+					${each_block_else} = null;
 				}
 			` );
 		} else {
 			block.builders.update.addBlock( deindent`
 				if ( ${each_block_value}.length ) {
-					if ( ${each_block_else} ) ${each_block_else}.destroy( true );
+					if ( ${each_block_else} ) {
+						${each_block_else}.destroy( true );
+						${each_block_else} = null;
+					}
 				} else if ( !${each_block_else} ) {
 					${each_block_else} = ${node.else._block.name}( ${params}, ${block.component} );
 					${each_block_else}.mount( ${anchor}.parentNode, ${anchor} );

diff --git a/test/runtime/samples/each-block-dynamic-else-static/_config.js b/test/runtime/samples/each-block-dynamic-else-static/_config.js
@@ -23,5 +23,10 @@ export default {
 		assert.htmlEqual( target.innerHTML, `
 			<p>wombat</p>
 		` );
+
+		component.set({ animals: ['dinosaur'] });
+		assert.htmlEqual( target.innerHTML, `
+			<p>dinosaur</p>
+		` );
 	}
 };