@@ -104,33 +104,33 @@ p.convertToMarksArray = function (computedStyle, unit, key, data, i) {
104
104
p . getAnimStart = function ( computedStyle , tween , isSvg ) {
105
105
const style = { } ;
106
106
const tweenStyle = tween . style || { } ;
107
+ let transform ;
107
108
Object . keys ( this . propsData . data ) . forEach ( key => {
108
109
const cssName = isConvert ( key ) ;
109
110
let startData = tweenStyle [ cssName ] || computedStyle [ cssName ] ;
110
111
const fixed = computedStyle . position === 'fixed' ;
111
112
if ( ! startData || startData === 'none' || startData === 'auto' ) {
112
113
startData = '' ;
113
114
}
114
- let transform ;
115
115
let endUnit ;
116
116
let startUnit ;
117
117
if ( key in _plugin ) {
118
118
if ( key === 'bezier' ) {
119
119
this . transform = checkStyleName ( 'transform' ) ;
120
120
startData = computedStyle [ isSvg ? 'transformSVG' : this . transform ] ;
121
- style . transform = tweenStyle . transform ? { ...tweenStyle . transform } :
122
- style . transform || getTransform ( startData ) ;
121
+ transform = transform || ( tweenStyle . transform ? { ...tweenStyle . transform } :
122
+ style . transform || getTransform ( startData ) ) ;
123
+ style . transform = transform ;
123
124
}
124
125
this . propsData . data [ key ] . getAnimStart ( computedStyle , isSvg ) ;
125
126
} else if ( cssName === 'transform' ) {
126
127
this . transform = checkStyleName ( 'transform' ) ;
127
128
startData = computedStyle [ isSvg ? 'transformSVG' : this . transform ] ;
128
129
endUnit = this . propsData . dataUnit [ key ] ;
129
- transform = tweenStyle . transform ? { ...tweenStyle . transform } :
130
- style . transform || getTransform ( startData ) ;
130
+ transform = transform || ( tweenStyle . transform ? { ...tweenStyle . transform } :
131
+ style . transform || getTransform ( startData ) ) ;
131
132
const unitReg = / % | v w | v h | e m | r e m / i;
132
133
if ( endUnit && endUnit . match ( unitReg ) ) {
133
- console . log ( tweenStyle . transform && tweenStyle . transform [ key ] )
134
134
transform [ key ] = transform [ key ] && transform [ key ] . match ( unitReg ) ?
135
135
parseFloat ( transform [ key ] )
136
136
: startConvertToEndUnit ( this . target , computedStyle ,
@@ -245,7 +245,7 @@ p.setRatio = function (ratio, tween, computedStyle) {
245
245
return ;
246
246
} else if ( _isTransform ) {
247
247
if ( unit && unit . match ( / % | v w | v h | e m | r e m / i) ) {
248
- startVars = this . start . transform [ key ] ;
248
+ startVars = parseFloat ( this . start . transform [ key ] ) ;
249
249
if ( count . charAt ( 1 ) === '=' ) {
250
250
tween . style . transform [ key ] = ( startVars + endVars * ratio ) + unit ;
251
251
} else {
0 commit comments