fix missed props.x and props.y

This commit is contained in:
Horcrux
2016-07-27 11:13:02 +08:00
parent a636211917
commit aee3038996
3 changed files with 9 additions and 5 deletions
+1 -3
View File
@@ -48,9 +48,7 @@ export default function(props, options = {stroke: true, transform: true, fill: t
if (options.transform) {
extractedProps.trans = extractTransform(props);
} else if (props.transform) {
// todo: add support for transform prop like this:
// {scale: 1.5, translate: '10 10'}
//extractedProps.transform = props.transform;
extractedProps.trans = extractTransform(props.transform);
}
if (options.responder) {
+5 -1
View File
@@ -60,7 +60,11 @@ function props2transform(props) {
let [originX, originY] = universal2axis(props.origin, props.originX, props.originY);
let [scaleX, scaleY] = universal2axis(props.scale, props.scaleX, props.scaleY, 1);
let [skewX, skewY] = universal2axis(props.skew, props.skewX, props.skewY);
let [translateX, translateY] = universal2axis(props.translate, props.translateX, props.translateY);
let [translateX, translateY] = universal2axis(
props.translate,
_.isNil(props.translateX) ? props.x : props.translateX,
_.isNil(props.translateY) ? props.y : props.translateY
);
return {
rotation: +props.rotation || +props.rotate || 0,