Merge pull request #24 from zenangst/improve/calling-completion-in-ex…

…tensions

Use performBatchUpdates completion in extensions

Differific.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "Differific"
   s.summary          = "A fast and convenient diffing framework"
-  s.version          = "0.8.3"
+  s.version          = "0.8.4"
   s.homepage         = "https://github.com/zenangst/Differific"
   s.license          = 'MIT'
   s.author           = { "Christoffer Winterkvist" => "[email protected]" }

Source/iOS+tvOS/UICollectionView+Extensions.swift

@@ -41,9 +41,9 @@ extension UICollectionView {
           moveItem(at: $0.from, to: $0.to)
         }
       }
+    }, completion: { _ in
+      completion?()
     })
-
-    completion?()
   }
 
   private func validateUpdates(_ collection: [IndexPath], then: ([IndexPath]) -> Void) {

Source/iOS+tvOS/UITableView+Extensions.swift

@@ -42,6 +42,8 @@ public extension UITableView {
         if !result.moves.isEmpty {
           result.moves.forEach { moveRow(at: $0.from, to: $0.to) }
         }
+      }, completion: { _ in
+        completion?()
       })
     } else {
       beginUpdates()
@@ -53,9 +55,8 @@ public extension UITableView {
         result.moves.forEach { moveRow(at: $0.from, to: $0.to) }
       }
       endUpdates()
+      completion?()
     }
-
-    completion?()
   }
 
   private func validateUpdates(_ collection: [IndexPath],

Source/macOS/NSCollectionView+Extensions.swift

@@ -38,11 +38,11 @@ public extension NSCollectionView {
       if !result.moves.isEmpty {
         result.moves.forEach { object.moveItem(at: $0.from, to: $0.to) }
       }
-    }, completionHandler: nil)
+    }, completionHandler: { _ in
+      completion?()
+    })
 
     needsLayout = true
-
-    completion?()
   }
 
   private func validateUpdates(_ collection: [IndexPath], then: (Set<IndexPath>) -> Void) {