Merge pull request #2909 from Harald-1/animations-without-transitions

fix #2908
sveltejs · Jun 2, 2019 · f7e6b32 · f7e6b32
2 parents 7b6cd52 + 4d47d21
commit f7e6b32
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/compiler/compile/render-dom/wrappers/EachBlock.ts b/src/compiler/compile/render-dom/wrappers/EachBlock.ts
@@ -343,7 +343,9 @@ export default class EachBlockWrapper extends Wrapper {
 		const dynamic = this.block.has_update_method;
 
 		const destroy = this.node.has_animation
-			? `@fix_and_outro_and_destroy_block`
+			? (this.block.has_outros
+				? `@fix_and_outro_and_destroy_block`
+				: `@fix_and_destroy_block`)
 			: this.block.has_outros
 				? `@outro_and_destroy_block`
 				: `@destroy_block`;

diff --git a/src/runtime/internal/keyed-each.ts b/src/runtime/internal/keyed-each.ts
@@ -13,6 +13,11 @@ export function outro_and_destroy_block(block, lookup) {
 	block.o(1);
 }
 
+export function fix_and_destroy_block(block, lookup) {
+	block.f();
+	destroy_block(block, lookup);
+}
+
 export function fix_and_outro_and_destroy_block(block, lookup) {
 	block.f();
 	outro_and_destroy_block(block, lookup);

diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
@@ -6,7 +6,7 @@ import {
 	detach,
 	element,
 	empty,
-	fix_and_outro_and_destroy_block,
+	fix_and_destroy_block,
 	fix_position,
 	init,
 	insert,
@@ -100,7 +100,7 @@ function create_fragment(ctx) {
 		p(changed, ctx) {
 			const each_value = ctx.things;
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].r();
-			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_outro_and_destroy_block, create_each_block, each_1_anchor, get_each_context);
+			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_destroy_block, create_each_block, each_1_anchor, get_each_context);
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].a();
 		},