support onSwipeStart event

also don't zero the onWillBounceBack and onBouncedBack callbacks since they can be called multiple times.
jjd314 · May 22, 2016 · 74140b6 · 74140b6
1 parent 87178aa
commit 74140b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ios/lib/SwipeViewManager.m b/ios/lib/SwipeViewManager.m
@@ -20,6 +20,7 @@ @interface SwipeView : UIView <UIGestureRecognizerDelegate>
 @property (nonatomic) BOOL changeAlpha;
 @property (nonatomic) CGFloat bounceBackAnimDuration;
 @property (nonatomic) CGFloat bounceBackAnimDamping;
+@property (nonatomic, copy) RCTDirectEventBlock onSwipeStart;
 @property (nonatomic, copy) RCTDirectEventBlock onWillBeSwipedOut;
 @property (nonatomic, copy) RCTDirectEventBlock onSwipedOut;
 @property (nonatomic, copy) RCTDirectEventBlock onWillBounceBack;
@@ -110,6 +111,12 @@ -(void)onPanGesture:(UIPanGestureRecognizer*)panGesture
     }
 
     [self cancelCurrentTouch];
+
+    NSString *directionString = ([panGesture velocityInView:self].x < 0) ? @"left" : @"right";
+    if (_onSwipeStart)
+    {
+      _onSwipeStart(@{@"direction": directionString});
+    }
   }
   else if(panGesture.state == UIGestureRecognizerStateChanged)
   {
@@ -162,7 +169,6 @@ -(void)onPanGesture:(UIPanGestureRecognizer*)panGesture
       if (_onWillBounceBack)
       {
         _onWillBounceBack(@{});
-        self.onWillBounceBack = nil;
       }
 
       [UIView animateWithDuration:self.bounceBackAnimDuration
@@ -181,7 +187,6 @@ -(void)onPanGesture:(UIPanGestureRecognizer*)panGesture
          if (_onBouncedBack)
          {
            _onBouncedBack(@{});
-           self.onBouncedBack = nil;
          }
        }];
     }
@@ -203,6 +208,7 @@ - (UIView *)view
 RCT_REMAP_VIEW_PROPERTY(minPanToComplete, minPanToComplete, CGFloat)
 RCT_REMAP_VIEW_PROPERTY(bounceBackAnimDuration, bounceBackAnimDuration, CGFloat)
 RCT_REMAP_VIEW_PROPERTY(bounceBackAnimDamping, bounceBackAnimDamping, CGFloat)
+RCT_REMAP_VIEW_PROPERTY(onSwipeStart, onSwipeStart, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onWillBeSwipedOut, onWillBeSwipedOut, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onSwipedOut, onSwipedOut, RCTDirectEventBlock)
 RCT_REMAP_VIEW_PROPERTY(onWillBounceBack, onWillBounceBack, RCTDirectEventBlock)

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-swipe-view.git"
   },
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Native container view for enabling swipe actions (for example to enable swipe to delete and such)",
   "nativePackage": true,
   "bugs": {