Skip to content

Commit 0ee25da

Browse files
committed
fix conversion of unit values
1 parent f8b82f1 commit 0ee25da

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
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.12",
3+
"version": "2.2.13",
44
"description": "tween-one anim component for react",
55
"keywords": [
66
"react",

src/plugin/StylePlugin.jsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ p.getTweenData = function (key, vars) {
3737
if (key.match(/colo|fill|storker/i)) {
3838
data.data[key] = parseColor(vars);
3939
data.dataType[key] = 'color';
40-
} else if (key === 'strokeDasharray'){
40+
} else if (key === 'strokeDasharray') {
4141
data.data[key] = vars.split(',');
4242
data.dataType[key] = 'strokeDasharray';
4343
} else if (key.match(/shadow/i)) {
@@ -128,9 +128,13 @@ p.getAnimStart = function (computedStyle, tween, isSvg) {
128128
endUnit = this.propsData.dataUnit[key];
129129
transform = tweenStyle.transform ? { ...tweenStyle.transform } :
130130
style.transform || getTransform(startData);
131-
if (endUnit && endUnit.match(/%|vw|vh|em|rem/i)) {
132-
transform[key] = startConvertToEndUnit(this.target, computedStyle,
133-
key, transform[key], null, endUnit);
131+
const unitReg = /%|vw|vh|em|rem/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);
134138
}
135139
style.transform = transform;
136140
} else if (cssName === 'filter') {

0 commit comments

Comments
 (0)