Merge pull request MortimerGoro#242 from mirego/master

Fix glitch when dragging before animation completes
coderChrisLee · Jun 17, 2017 · 48b4972 · 48b4972
2 parents c10630b + d169885
commit 48b4972
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/MGSwipeTableCell/MGSwipeTableCell.m b/MGSwipeTableCell/MGSwipeTableCell.m
@@ -1130,14 +1130,20 @@ -(void) animationTick: (CADisplayLink *) timer
     //call animation completion and invalidate timer
     if (completed){
         [timer invalidate];
-        _displayLink = nil;
-        if (_animationCompletion) {
-            void (^callbackCopy)(BOOL finished) = _animationCompletion; //copy to avoid duplicated callbacks
-            _animationCompletion = nil;
-            callbackCopy(YES);
-        }
+        [self invalidateDisplayLink];
     }
 }
+
+-(void)invalidateDisplayLink {
+    [_displayLink invalidate];
+    _displayLink = nil;
+    if (_animationCompletion) {
+        void (^callbackCopy)(BOOL finished) = _animationCompletion; //copy to avoid duplicated callbacks
+        _animationCompletion = nil;
+        callbackCopy(YES);
+    }
+}
+
 -(void) setSwipeOffset:(CGFloat)offset animated: (BOOL) animated completion:(void(^)(BOOL finished)) completion
 {
     MGSwipeAnimation * animation = animated ? [[MGSwipeAnimation alloc] init] : nil;
@@ -1223,6 +1229,8 @@ -(void) panHandler: (UIPanGestureRecognizer *)gesture
     CGPoint current = [gesture translationInView:self];
 
     if (gesture.state == UIGestureRecognizerStateBegan) {
+        [self invalidateDisplayLink];
+
         if (!_preservesSelectionStatus)
             self.highlighted = NO;
         [self createSwipeViewIfNeeded];