From 915b75422db92ab53d23cfd994865483787ae0c5 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 14 Mar 2018 21:42:02 -0400 Subject: [PATCH 1/2] scale transition duration by delta - fixes #1221 --- src/shared/transitions.js | 2 +- .../samples/transition-css-duration/_config.js | 12 ++++++++++++ .../samples/transition-css-duration/main.html | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 test/runtime/samples/transition-css-duration/_config.js create mode 100644 test/runtime/samples/transition-css-duration/main.html diff --git a/src/shared/transitions.js b/src/shared/transitions.js index 6d573f68fd..bef36e741a 100644 --- a/src/shared/transitions.js +++ b/src/shared/transitions.js @@ -106,7 +106,7 @@ export function wrapTransition(component, node, fn, params, intro, outgroup) { // when introing, discard old animations if there are any return anim && (program.delta < 0 || !/__svelte/.test(anim)); }) - .concat(program.name + ' ' + duration + 'ms linear 1 forwards') + .concat(program.name + ' ' + program.duration + 'ms linear 1 forwards') .join(', '); } diff --git a/test/runtime/samples/transition-css-duration/_config.js b/test/runtime/samples/transition-css-duration/_config.js new file mode 100644 index 0000000000..674536500c --- /dev/null +++ b/test/runtime/samples/transition-css-duration/_config.js @@ -0,0 +1,12 @@ +export default { + solo: true, + test(assert, component, target, window, raf) { + component.set({ visible: true }); + const div = target.querySelector('div'); + + raf.tick(25); + component.set({ visible: false }); + + assert.ok(~div.style.animation.indexOf('25ms')); + }, +}; diff --git a/test/runtime/samples/transition-css-duration/main.html b/test/runtime/samples/transition-css-duration/main.html new file mode 100644 index 0000000000..d3eb2bee78 --- /dev/null +++ b/test/runtime/samples/transition-css-duration/main.html @@ -0,0 +1,18 @@ +{{#if visible}} +
+{{/if}} + + \ No newline at end of file From e17f2660e3bcea3a0aae8aa2f364056268d59c1c Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 14 Mar 2018 21:42:53 -0400 Subject: [PATCH 2/2] reenable all tests --- test/runtime/samples/transition-css-duration/_config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/runtime/samples/transition-css-duration/_config.js b/test/runtime/samples/transition-css-duration/_config.js index 674536500c..8a4f88431c 100644 --- a/test/runtime/samples/transition-css-duration/_config.js +++ b/test/runtime/samples/transition-css-duration/_config.js @@ -1,5 +1,4 @@ export default { - solo: true, test(assert, component, target, window, raf) { component.set({ visible: true }); const div = target.querySelector('div');