From 67a73cb79313f2399f55a43e939c9cfe5ab83705 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 15 Apr 2019 16:43:05 -0400 Subject: [PATCH 1/2] bump beta version --- package.json | 2 +- transition.mjs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index c131c93d3a..f8dfdf4598 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "svelte", - "version": "3.0.0-beta.25", + "version": "3.0.0-beta.26", "description": "The magical disappearing UI framework", "module": "index.mjs", "main": "index", diff --git a/transition.mjs b/transition.mjs index 5bbefcf8e0..10e2239746 100644 --- a/transition.mjs +++ b/transition.mjs @@ -122,8 +122,8 @@ export function draw(node, { } export function crossfade({ fallback, ...defaults }) { - let to_receive = new Map(); - let to_send = new Map(); + const to_receive = new Map(); + const to_send = new Map(); function crossfade(from, node, params) { const { From cf2b05a9179b57a7b6bac9eeb46acb2935368f95 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 15 Apr 2019 17:23:04 -0400 Subject: [PATCH 2/2] respect starting opacities --- transition.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/transition.mjs b/transition.mjs index 10e2239746..c89952cef5 100644 --- a/transition.mjs +++ b/transition.mjs @@ -138,13 +138,14 @@ export function crossfade({ fallback, ...defaults }) { const style = getComputedStyle(node); const transform = style.transform === 'none' ? '' : style.transform; + const opacity = +opacity; return { delay, duration: is_function(duration) ? duration(d) : duration, easing, css: (t, u) => ` - opacity: ${t}; + opacity: ${t * opacity}; transform: ${transform} translate(${u * dx}px,${u * dy}px); ` };