@motify/core
Advanced tools
Comparing version
@@ -6,2 +6,13 @@ # Change Log | ||
## [0.5.8](https://github.com/nandorojo/moti/compare/v0.5.7...v0.5.8) (2021-03-04) | ||
### Bug Fixes | ||
* spread -> assign ([8d0f89a](https://github.com/nandorojo/moti/commit/8d0f89a899e0c6e3e2b7285d98831addef48dd6c)) | ||
## [0.5.7](https://github.com/nandorojo/moti/compare/v0.5.6...v0.5.7) (2021-03-02) | ||
@@ -8,0 +19,0 @@ |
@@ -185,3 +185,3 @@ "use strict"; | ||
state, | ||
stylePriority = 'state', | ||
stylePriority = 'animate', | ||
onDidAnimate, | ||
@@ -220,9 +220,5 @@ exit | ||
if (stylePriority === 'state') { | ||
mergedStyles = { ...animateStyle, | ||
...variantStyle | ||
}; | ||
mergedStyles = Object.assign({}, animateStyle, variantStyle); | ||
} else { | ||
mergedStyles = { ...variantStyle, | ||
...animateStyle | ||
}; | ||
mergedStyles = Object.assign(variantStyle, animateStyle); | ||
} | ||
@@ -318,5 +314,5 @@ | ||
let stepDelay = delayMs; | ||
let stepValue = step; | ||
let stepConfig = { ...config | ||
}; | ||
let stepValue = step; // let stepConfig = { ...config } | ||
let stepConfig = Object.assign({}, config); | ||
let stepAnimation = animation; | ||
@@ -338,5 +334,5 @@ | ||
} = animationConfig(key, transition); | ||
stepConfig = { ...stepConfig // ...customConfig | ||
stepConfig = Object.assign({}, stepConfig); // TODO test, does this work? | ||
// stepConfig = Object.assign({}, stepConfig, customConfig) | ||
}; | ||
stepAnimation = animation; | ||
@@ -343,0 +339,0 @@ |
@@ -175,3 +175,3 @@ import { usePresence } from 'framer-motion'; | ||
state, | ||
stylePriority = 'state', | ||
stylePriority = 'animate', | ||
onDidAnimate, | ||
@@ -210,9 +210,5 @@ exit | ||
if (stylePriority === 'state') { | ||
mergedStyles = { ...animateStyle, | ||
...variantStyle | ||
}; | ||
mergedStyles = Object.assign({}, animateStyle, variantStyle); | ||
} else { | ||
mergedStyles = { ...variantStyle, | ||
...animateStyle | ||
}; | ||
mergedStyles = Object.assign(variantStyle, animateStyle); | ||
} | ||
@@ -308,5 +304,5 @@ | ||
let stepDelay = delayMs; | ||
let stepValue = step; | ||
let stepConfig = { ...config | ||
}; | ||
let stepValue = step; // let stepConfig = { ...config } | ||
let stepConfig = Object.assign({}, config); | ||
let stepAnimation = animation; | ||
@@ -328,5 +324,5 @@ | ||
} = animationConfig(key, transition); | ||
stepConfig = { ...stepConfig // ...customConfig | ||
stepConfig = Object.assign({}, stepConfig); // TODO test, does this work? | ||
// stepConfig = Object.assign({}, stepConfig, customConfig) | ||
}; | ||
stepAnimation = animation; | ||
@@ -333,0 +329,0 @@ |
{ | ||
"name": "@motify/core", | ||
"version": "0.5.7", | ||
"version": "0.5.8", | ||
"private": false, | ||
@@ -35,3 +35,3 @@ "license": "MIT", | ||
"sideEffects": false, | ||
"gitHead": "1b938622d61d514aa408ab03b70d3b0c8250ebfa", | ||
"gitHead": "55b05ffd5a60fd57370e29246239b34e722f9acb", | ||
"scripts": { | ||
@@ -38,0 +38,0 @@ "prepare": "bob build", |
@@ -214,3 +214,3 @@ import { usePresence } from 'framer-motion' | ||
state, | ||
stylePriority = 'state', | ||
stylePriority = 'animate', | ||
onDidAnimate, | ||
@@ -258,5 +258,5 @@ exit, | ||
if (stylePriority === 'state') { | ||
mergedStyles = { ...animateStyle, ...variantStyle } | ||
mergedStyles = Object.assign({}, animateStyle, variantStyle) | ||
} else { | ||
mergedStyles = { ...variantStyle, ...animateStyle } | ||
mergedStyles = Object.assign(variantStyle, animateStyle) | ||
} | ||
@@ -365,3 +365,4 @@ | ||
let stepValue = step | ||
let stepConfig = { ...config } | ||
// let stepConfig = { ...config } | ||
let stepConfig = Object.assign({}, config) | ||
let stepAnimation = animation | ||
@@ -381,6 +382,5 @@ if (typeof step === 'object') { | ||
stepConfig = { | ||
...stepConfig, | ||
// ...customConfig | ||
} | ||
stepConfig = Object.assign({}, stepConfig) | ||
// TODO test, does this work? | ||
// stepConfig = Object.assign({}, stepConfig, customConfig) | ||
stepAnimation = animation | ||
@@ -387,0 +387,0 @@ if (delay != null) { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
190772
0.56%2663
-0.37%