Merge pull request #678 from reactiveui/call_did_perform_updates_properly

Move didPerformUpdates in the collection view case into the completion handler

Author: Paul Betts

ReactiveUI/Cocoa/CommonReactiveSource.cs

@@ -20,7 +20,7 @@ namespace ReactiveUI
     interface IUICollViewAdapter<TUIView, TUIViewCell>
     {
         void ReloadData();
-        void PerformBatchUpdates(Action updates);
+        void PerformBatchUpdates(Action updates, Action completion);
         void InsertItems(NSIndexPath[] paths);
         void DeleteItems(NSIndexPath[] paths);
         void ReloadItems(NSIndexPath[] paths);
@@ -377,7 +377,7 @@ void sectionCollectionChanged(int section, IList<Timestamped<NotifyCollectionCha
                         break;
                     }
                 }
-
+            }, () => {
                 this.Log().Debug("Ending update");
                 didPerformUpdates.OnNext(eas);
             });

ReactiveUI/Cocoa/ReactiveCollectionViewSource.cs

@@ -51,7 +51,7 @@ class UICollectionViewAdapter : IUICollViewAdapter<UICollectionView, UICollectio
         internal UICollectionViewAdapter(UICollectionView view) { this.view = view; }
 
         public void ReloadData() { view.ReloadData(); }
-        public void PerformBatchUpdates(Action updates) { view.PerformBatchUpdates(new NSAction(updates), null); }
+        public void PerformBatchUpdates(Action updates, Action completion) { view.PerformBatchUpdates(new NSAction(updates), (completed) => completion()); }
         public void InsertItems(NSIndexPath[] paths) { view.InsertItems(paths); }
         public void DeleteItems(NSIndexPath[] paths) { view.DeleteItems(paths); }
         public void ReloadItems(NSIndexPath[] paths) { view.ReloadItems(paths); }

ReactiveUI/Cocoa/ReactiveTableViewSource.cs

@@ -62,11 +62,15 @@ class UITableViewAdapter : IUICollViewAdapter<UITableView, UITableViewCell>
         readonly UITableView view;
         internal UITableViewAdapter(UITableView view) { this.view = view; }
         public void ReloadData() { view.ReloadData(); }
-        public void PerformBatchUpdates(Action updates)
+        public void PerformBatchUpdates(Action updates, Action completion)
         {
             view.BeginUpdates();
-            try { updates(); }
-            finally { view.EndUpdates(); }
+            try {
+                updates();
+            } finally {
+                view.EndUpdates();
+                completion();
+            }
         }
         public void InsertItems(NSIndexPath[] paths) { view.InsertRows(paths, UITableViewRowAnimation.Automatic); }
         public void DeleteItems(NSIndexPath[] paths) { view.DeleteRows(paths, UITableViewRowAnimation.Automatic); }