From b758d77a9807880e46dd868f199ba4400aeb3064 Mon Sep 17 00:00:00 2001 From: Mikael Sand Date: Mon, 5 Jun 2017 23:52:35 +0300 Subject: [PATCH] Transform fix --- android/src/main/java/com/horcrux/svg/SvgView.java | 5 ----- lib/extract/extractGradient.js | 4 +++- package.json | 6 +++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/android/src/main/java/com/horcrux/svg/SvgView.java b/android/src/main/java/com/horcrux/svg/SvgView.java index f2ccb1b3..8170d1eb 100644 --- a/android/src/main/java/com/horcrux/svg/SvgView.java +++ b/android/src/main/java/com/horcrux/svg/SvgView.java @@ -47,7 +47,6 @@ public class SvgView extends View { private @Nullable Bitmap mBitmap; private EventDispatcher mEventDispatcher; - private long mGestureStartTime = TouchEvent.UNSET; private int mTargetTag; private final TouchEventCoalescingKeyHelper mTouchEventCoalescingKeyHelper = @@ -125,7 +124,6 @@ public class SvgView extends View { mTargetTag, type, ev, - mGestureStartTime, ev.getX(), ev.getY(), mTouchEventCoalescingKeyHelper)); @@ -134,7 +132,6 @@ public class SvgView extends View { public void handleTouchEvent(MotionEvent ev) { int action = ev.getAction() & MotionEvent.ACTION_MASK; if (action == MotionEvent.ACTION_DOWN) { - mGestureStartTime = ev.getEventTime(); dispatch(ev, TouchEventType.START); } else if (mTargetTag == -1) { // All the subsequent action types are expected to be called after ACTION_DOWN thus target @@ -158,11 +155,9 @@ public class SvgView extends View { // Exactly onw of the pointers goes up dispatch(ev, TouchEventType.END); mTargetTag = -1; - mGestureStartTime = TouchEvent.UNSET; } else if (action == MotionEvent.ACTION_CANCEL) { dispatchCancelEvent(ev); mTargetTag = -1; - mGestureStartTime = TouchEvent.UNSET; } else { Log.w( "IGNORE", diff --git a/lib/extract/extractGradient.js b/lib/extract/extractGradient.js index 8667e488..7befb7fe 100644 --- a/lib/extract/extractGradient.js +++ b/lib/extract/extractGradient.js @@ -46,7 +46,9 @@ export default function(props) { let gradientTransform; - if (props.transform) { + if (props.gradientTransform) { + gradientTransform = extractTransform(props.gradientTransform); + } else if (props.transform) { gradientTransform = extractTransform(props.transform); } else { gradientTransform = extractTransform(props); diff --git a/package.json b/package.json index 644895fa..2c4ad74d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "5.1.8", + "version": "5.1.7-transform", "name": "react-native-svg", "description": "SVG library for react-native", "repository": { @@ -22,8 +22,8 @@ "lint": "eslint ./" }, "peerDependencies": { - "react-native": ">=0.44.0", - "react": "16.0.0-alpha.6" + "react-native": ">=0.40.0", + "react": ">=15.4.0" }, "dependencies": { "color": "^0.11.1",