From 44fc48f7a0e79988d36608068b1d3bfeb0e3c5fe Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Thu, 7 Jul 2016 22:24:05 -0700 Subject: [PATCH] use 'normalizeValue' in 'processTransform' --- src/apis/StyleSheet/normalizeValue.js | 7 ++++++- src/apis/StyleSheet/processTransform.js | 15 ++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/apis/StyleSheet/normalizeValue.js b/src/apis/StyleSheet/normalizeValue.js index 72de99de..452f3279 100644 --- a/src/apis/StyleSheet/normalizeValue.js +++ b/src/apis/StyleSheet/normalizeValue.js @@ -19,7 +19,12 @@ const unitlessNumbers = { fillOpacity: true, strokeDashoffset: true, strokeOpacity: true, - strokeWidth: true + strokeWidth: true, + // transform types + scale: true, + scaleX: true, + scaleY: true, + scaleZ: true } const normalizeValue = (property, value) => { diff --git a/src/apis/StyleSheet/processTransform.js b/src/apis/StyleSheet/processTransform.js index 46cef41e..c8767960 100644 --- a/src/apis/StyleSheet/processTransform.js +++ b/src/apis/StyleSheet/processTransform.js @@ -1,21 +1,10 @@ -const translateProperties = { - translateX: true, - translateY: true, - translateZ: true -} - -const processTransformValue = (key, value) => { - if (translateProperties[key] && typeof value === 'number') { - value += 'px' - } - return value -} +import normalizeValue from './normalizeValue' // { scale: 2 } => 'scale(2)' // { translateX: 20 } => 'translateX(20px)' const mapTransform = (transform) => { const type = Object.keys(transform)[0] - const value = processTransformValue(type, transform[type]) + const value = normalizeValue(type, transform[type]) return `${type}(${value})` }