From 06e18a10596622ff8a68835c95a23986d7bf61ea Mon Sep 17 00:00:00 2001
From: Max Wang <max.wang.cs@gmail.com>
Date: Tue, 21 Aug 2018 22:12:16 -0700
Subject: [PATCH] Fix collection cell editing bug for iOS 9 & 10

---
 Source/ASCollectionView.mm | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/Source/ASCollectionView.mm b/Source/ASCollectionView.mm
index cef0d581a..cee950a46 100644
--- a/Source/ASCollectionView.mm
+++ b/Source/ASCollectionView.mm
@@ -147,6 +147,12 @@ @interface ASCollectionView () <ASRangeControllerDataSource, ASRangeControllerDe
    * (0 sections) we always check at least once after each update (initial reload is the first update.)
    */
   BOOL _hasEverCheckedForBatchFetchingDueToUpdate;
+
+  /**
+   * Set during beginInteractiveMovementForItemAtIndexPath and UIGestureRecognizerStateEnded
+   * (or UIGestureRecognizerStateFailed, UIGestureRecognizerStateCancelled.
+   */
+  BOOL _editting;
   
   /**
    * Counter used to keep track of nested batch updates.
@@ -1021,9 +1027,28 @@ - (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths
 - (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
 {
   ASDisplayNodeAssertMainThread();
-  [self performBatchUpdates:^{
-    [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
+  if (!_editting) {
+    [self performBatchUpdates:^{
+      [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:kASCollectionViewAnimationNone];
+    } completion:nil];
+  } else {
+    [super moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
+  }
+}
+
+- (BOOL)beginInteractiveMovementForItemAtIndexPath:(NSIndexPath *)indexPath {
+  _editting = YES;
+  return [super beginInteractiveMovementForItemAtIndexPath:indexPath];
+}
+
+- (void)endInteractiveMovement {
+  _editting = NO;
+  return [super endInteractiveMovement];
+}
+
+- (void)cancelInteractiveMovement {
+  _editting = NO;
+  [super cancelInteractiveMovement];
 }
 
 #pragma mark -