Fix collection editing

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 _reordering;
 
   /**
    * Counter used to keep track of nested batch updates.
@@ -1021,9 +1027,29 @@ - (void)reloadItemsAtIndexPaths:(NSArray *)indexPaths
 - (void)moveItemAtIndexPath:(NSIndexPath *)indexPath toIndexPath:(NSIndexPath *)newIndexPath
 {
   ASDisplayNodeAssertMainThread();
-  [self performBatchUpdates:^{
-    [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:kASCollectionViewAnimationNone];
-  } completion:nil];
+  if (!_reordering) {
+    [self performBatchUpdates:^{
+      [_changeSet moveItemAtIndexPath:indexPath toIndexPath:newIndexPath animationOptions:kASCollectionViewAnimationNone];
+    } completion:nil];
+  } else {
+    [super moveItemAtIndexPath:indexPath toIndexPath:newIndexPath];
+  }
+}
+
+- (BOOL)beginInteractiveMovementForItemAtIndexPath:(NSIndexPath *)indexPath {
+  BOOL success = [super beginInteractiveMovementForItemAtIndexPath:indexPath];
+  _reordering = success;
+  return success;
+}
+
+- (void)endInteractiveMovement {
+  _reordering = NO;
+  [super endInteractiveMovement];
+}
+
+- (void)cancelInteractiveMovement {
+  _reordering = NO;
+  [super cancelInteractiveMovement];
 }
 
 #pragma mark -