Skip to content

Commit c8e8af8

Browse files
committed
fix multiple values are not recorded at the start
1 parent 0ee25da commit c8e8af8

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rc-tween-one",
3-
"version": "2.2.13",
3+
"version": "2.2.14",
44
"description": "tween-one anim component for react",
55
"keywords": [
66
"react",

src/plugin/StylePlugin.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,33 +104,33 @@ p.convertToMarksArray = function (computedStyle, unit, key, data, i) {
104104
p.getAnimStart = function (computedStyle, tween, isSvg) {
105105
const style = {};
106106
const tweenStyle = tween.style || {};
107+
let transform;
107108
Object.keys(this.propsData.data).forEach(key => {
108109
const cssName = isConvert(key);
109110
let startData = tweenStyle[cssName] || computedStyle[cssName];
110111
const fixed = computedStyle.position === 'fixed';
111112
if (!startData || startData === 'none' || startData === 'auto') {
112113
startData = '';
113114
}
114-
let transform;
115115
let endUnit;
116116
let startUnit;
117117
if (key in _plugin) {
118118
if (key === 'bezier') {
119119
this.transform = checkStyleName('transform');
120120
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;
123124
}
124125
this.propsData.data[key].getAnimStart(computedStyle, isSvg);
125126
} else if (cssName === 'transform') {
126127
this.transform = checkStyleName('transform');
127128
startData = computedStyle[isSvg ? 'transformSVG' : this.transform];
128129
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));
131132
const unitReg = /%|vw|vh|em|rem/i;
132133
if (endUnit && endUnit.match(unitReg)) {
133-
console.log(tweenStyle.transform && tweenStyle.transform[key])
134134
transform[key] = transform[key] && transform[key].match(unitReg) ?
135135
parseFloat(transform[key])
136136
: startConvertToEndUnit(this.target, computedStyle,
@@ -245,7 +245,7 @@ p.setRatio = function (ratio, tween, computedStyle) {
245245
return;
246246
} else if (_isTransform) {
247247
if (unit && unit.match(/%|vw|vh|em|rem/i)) {
248-
startVars = this.start.transform[key];
248+
startVars = parseFloat(this.start.transform[key]);
249249
if (count.charAt(1) === '=') {
250250
tween.style.transform[key] = (startVars + endVars * ratio) + unit;
251251
} else {

0 commit comments

Comments
 (0)