Fix update instead of move (#113)

3lvis · Feb 19, 2018 · 1bd2ebe · 1bd2ebe
1 parent 571bc88
commit 1bd2ebe
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/Source/DATASource+NSFetchedResultsControllerDelegate.swift b/Source/DATASource+NSFetchedResultsControllerDelegate.swift
@@ -75,11 +75,24 @@ extension DATASource: NSFetchedResultsControllerDelegate {
                 break
             case .move:
                 if let indexPath = indexPath, let newIndexPath = newIndexPath {
-                    tableView.deleteRows(at: [indexPath], with: rowAnimationType)
-                    tableView.insertRows(at: [newIndexPath], with: rowAnimationType)
+                    // Workaround: Updating a UICollectionView element sometimes will trigger a .Move change
+                    // where both indexPaths are the same, as a workaround if this happens, DATASource
+                    // will treat this change as an .Update
+                    if indexPath == newIndexPath {
+                        if let cell = tableView.cellForRow(at: newIndexPath) {
+                            self.configure(cell, indexPath: newIndexPath)
+                        }
+
+                        if let anObject = anObject as? NSManagedObject {
+                            self.delegate?.dataSource?(self, didUpdateObject: anObject, atIndexPath: newIndexPath)
+                        }
+                    } else {
+                        tableView.deleteRows(at: [indexPath], with: rowAnimationType)
+                        tableView.insertRows(at: [newIndexPath], with: rowAnimationType)
 
-                    if let anObject = anObject as? NSManagedObject {
-                        self.delegate?.dataSource?(self, didMoveObject: anObject, fromIndexPath: indexPath, toIndexPath: newIndexPath)
+                        if let anObject = anObject as? NSManagedObject {
+                            self.delegate?.dataSource?(self, didMoveObject: anObject, fromIndexPath: indexPath, toIndexPath: newIndexPath)
+                        }
                     }
                 }
                 break