fix #120 - crash when last UITableView row moves out from section 0 (#…

…121) * fix #120 - crash when last UITableView row moves out from section 0 * no need for UICollectionView workaround when using a UITableView * cover case when `.update` object is called but the object is also moved
3lvis · Oct 19, 2019 · 5ae0260 · 5ae0260
1 parent cf5e9a8
commit 5ae0260
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/Source/DATASource+NSFetchedResultsControllerDelegate.swift b/Source/DATASource+NSFetchedResultsControllerDelegate.swift
@@ -66,6 +66,9 @@ extension DATASource: NSFetchedResultsControllerDelegate {
                 break
             case .update:
                 if let newIndexPath = newIndexPath {
+                    if let indexPath = indexPath, indexPath != newIndexPath {
+                        fallthrough
+                    }
                     if tableView.indexPathsForVisibleRows?.firstIndex(of: newIndexPath) != nil {
                         if let cell = tableView.cellForRow(at: newIndexPath) {
                             self.configure(cell, indexPath: newIndexPath)
@@ -79,24 +82,11 @@ extension DATASource: NSFetchedResultsControllerDelegate {
                 break
             case .move:
                 if let indexPath = indexPath, let newIndexPath = newIndexPath {
-                    // 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)
+                    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