@@ -37,7 +37,7 @@ p.getTweenData = function (key, vars) {
37
37
if ( key . match ( / c o l o | f i l l | s t o r k e r / i) ) {
38
38
data . data [ key ] = parseColor ( vars ) ;
39
39
data . dataType [ key ] = 'color' ;
40
- } else if ( key === 'strokeDasharray' ) {
40
+ } else if ( key === 'strokeDasharray' ) {
41
41
data . data [ key ] = vars . split ( ',' ) ;
42
42
data . dataType [ key ] = 'strokeDasharray' ;
43
43
} else if ( key . match ( / s h a d o w / i) ) {
@@ -128,9 +128,13 @@ p.getAnimStart = function (computedStyle, tween, isSvg) {
128
128
endUnit = this . propsData . dataUnit [ key ] ;
129
129
transform = tweenStyle . transform ? { ...tweenStyle . transform } :
130
130
style . transform || getTransform ( startData ) ;
131
- if ( endUnit && endUnit . match ( / % | v w | v h | e m | r e m / i) ) {
132
- transform [ key ] = startConvertToEndUnit ( this . target , computedStyle ,
133
- key , transform [ key ] , null , endUnit ) ;
131
+ const unitReg = / % | v w | v h | e m | r e m / i;
132
+ if ( endUnit && endUnit . match ( unitReg ) ) {
133
+ console . log ( tweenStyle . transform && tweenStyle . transform [ key ] )
134
+ transform [ key ] = transform [ key ] && transform [ key ] . match ( unitReg ) ?
135
+ parseFloat ( transform [ key ] )
136
+ : startConvertToEndUnit ( this . target , computedStyle ,
137
+ key , transform [ key ] , null , endUnit ) ;
134
138
}
135
139
style . transform = transform ;
136
140
} else if ( cssName === 'filter' ) {
0 commit comments