From 242ad77e5e2769433dca21baff7985c9cf352b0d Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Fri, 2 Feb 2018 15:22:02 +0200
Subject: [PATCH 1/6] Added SectionedViewDataSourceType conformance to
 table/collection view delegates. It eliminates the need to manually
 reimplement functionality already present in RxCocoa (like modelSelected,
 modelDeselected, etc).

---
 .../CollectionViewController.swift            |  2 +-
 .../RxRealmDataSources/ViewController.swift   |  2 +-
 Pod/Classes/Reactive+RxRealmDataSources.swift | 27 -------------------
 .../RxCollectionViewRealmDataSource.swift     |  4 +--
 Pod/Classes/RxTableViewRealmDataSource.swift  |  4 +--
 5 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/Example/RxRealmDataSources/CollectionViewController.swift b/Example/RxRealmDataSources/CollectionViewController.swift
index 579c0d4..b787bad 100644
--- a/Example/RxRealmDataSources/CollectionViewController.swift
+++ b/Example/RxRealmDataSources/CollectionViewController.swift
@@ -48,7 +48,7 @@ class CollectionViewController: UIViewController {
             .disposed(by: bag)
 
         // react on cell taps
-        collectionView.rx.realmModelSelected(Lap.self)
+        collectionView.rx.modelSelected(Lap.self)
             .map({ $0.text })
             .bind(to: rx.title)
             .disposed(by: bag)
diff --git a/Example/RxRealmDataSources/ViewController.swift b/Example/RxRealmDataSources/ViewController.swift
index f7b7c8e..f31ad36 100644
--- a/Example/RxRealmDataSources/ViewController.swift
+++ b/Example/RxRealmDataSources/ViewController.swift
@@ -48,7 +48,7 @@ class ViewController: UIViewController {
             .disposed(by: bag)
 
         // react on cell taps
-        tableView.rx.realmModelSelected(Lap.self)
+        tableView.rx.modelSelected(Lap.self)
             .map({ $0.text })
             .bind(to: rx.title)
             .disposed(by: bag)
diff --git a/Pod/Classes/Reactive+RxRealmDataSources.swift b/Pod/Classes/Reactive+RxRealmDataSources.swift
index c51ca48..1093289 100644
--- a/Pod/Classes/Reactive+RxRealmDataSources.swift
+++ b/Pod/Classes/Reactive+RxRealmDataSources.swift
@@ -29,20 +29,6 @@ extension Reactive where Base: UITableView {
                 ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
             }
     }
-	
-	public func realmModelSelected<E>(_ modelType: E.Type) -> ControlEvent<E> where E: RealmSwift.Object {
-		
-		let source: Observable<E> = self.itemSelected.flatMap { [weak view = self.base as UITableView] indexPath -> Observable<E> in
-			guard let view = view, let ds = view.dataSource as? RxTableViewRealmDataSource<E> else {
-				return Observable.empty()
-			}
-			
-			return Observable.just(ds.model(at: indexPath))
-		}
-		
-		return ControlEvent(events: source)
-	}
-
 }
 
 extension Reactive where Base: UICollectionView {
@@ -58,19 +44,6 @@ extension Reactive where Base: UICollectionView {
                 ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
             }
     }
-
-    public func realmModelSelected<E>(_ modelType: E.Type) -> ControlEvent<E> where E: RealmSwift.Object {
-
-        let source: Observable<E> = self.itemSelected.flatMap { [weak view = self.base as UICollectionView] indexPath -> Observable<E> in
-            guard let view = view, let ds = view.dataSource as? RxCollectionViewRealmDataSource<E> else {
-                return Observable.empty()
-            }
-
-            return Observable.just(ds.model(at: indexPath))
-        }
-        
-        return ControlEvent(events: source)
-    }
 }
 
 
diff --git a/Pod/Classes/RxCollectionViewRealmDataSource.swift b/Pod/Classes/RxCollectionViewRealmDataSource.swift
index 8883732..e6d5f80 100644
--- a/Pod/Classes/RxCollectionViewRealmDataSource.swift
+++ b/Pod/Classes/RxCollectionViewRealmDataSource.swift
@@ -20,7 +20,7 @@ import RxRealm
     public typealias CollectionCellFactory<E: Object> = (RxCollectionViewRealmDataSource<E>, UICollectionView, IndexPath, E) -> UICollectionViewCell
     public typealias CollectionCellConfig<E: Object, CellType: UICollectionViewCell> = (CellType, IndexPath, E) -> Void
 
-    open class RxCollectionViewRealmDataSource <E: Object>: NSObject, UICollectionViewDataSource {
+    open class RxCollectionViewRealmDataSource <E: Object>: NSObject, UICollectionViewDataSource, SectionedViewDataSourceType {
         private var items: AnyRealmCollection<E>?
 
         // MARK: - Configuration
@@ -47,7 +47,7 @@ import RxRealm
         }
 
         // MARK: - Data access
-        public func model(at indexPath: IndexPath) -> E {
+        public func model(at indexPath: IndexPath) throws -> Any {
             return items![indexPath.row]
         }
 
diff --git a/Pod/Classes/RxTableViewRealmDataSource.swift b/Pod/Classes/RxTableViewRealmDataSource.swift
index c80bb80..a77454e 100644
--- a/Pod/Classes/RxTableViewRealmDataSource.swift
+++ b/Pod/Classes/RxTableViewRealmDataSource.swift
@@ -20,7 +20,7 @@ import RxRealm
     public typealias TableCellFactory<E: Object> = (RxTableViewRealmDataSource<E>, UITableView, IndexPath, E) -> UITableViewCell
     public typealias TableCellConfig<E: Object, CellType: UITableViewCell> = (CellType, IndexPath, E) -> Void
 
-    open class RxTableViewRealmDataSource<E: Object>: NSObject, UITableViewDataSource {
+    open class RxTableViewRealmDataSource<E: Object>: NSObject, UITableViewDataSource, SectionedViewDataSourceType {
 
         private var items: AnyRealmCollection<E>?
 
@@ -55,7 +55,7 @@ import RxRealm
         }
 
         // MARK: - Data access
-        public func model(at indexPath: IndexPath) -> E {
+        public func model(at indexPath: IndexPath) throws -> Any {
             return items![indexPath.row]
         }
 

From 42c8757310c4f10076dfc7e1225203dc50d65fbd Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Tue, 13 Feb 2018 13:28:07 +0200
Subject: [PATCH 2/6] Restored previous declarations with deprecation to allow
 more smooth transition. Corrected README

---
 Pod/Classes/Reactive+RxRealmDataSources.swift | 10 ++++++++++
 README.md                                     |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Pod/Classes/Reactive+RxRealmDataSources.swift b/Pod/Classes/Reactive+RxRealmDataSources.swift
index 1093289..e16e224 100644
--- a/Pod/Classes/Reactive+RxRealmDataSources.swift
+++ b/Pod/Classes/Reactive+RxRealmDataSources.swift
@@ -29,6 +29,11 @@ extension Reactive where Base: UITableView {
                 ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
             }
     }
+
+    @available(*, deprecated, renamed: "modelSelected")
+    public func realmModelSelected<E>(_ modelType: E.Type) -> ControlEvent<E> where E: RealmSwift.Object {
+        return modelSelected(modelType)
+    }
 }
 
 extension Reactive where Base: UICollectionView {
@@ -44,6 +49,11 @@ extension Reactive where Base: UICollectionView {
                 ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
             }
     }
+
+    @available(*, deprecated, renamed: "modelSelected")
+    public func realmModelSelected<E>(_ modelType: E.Type) -> ControlEvent<E> where E: RealmSwift.Object {
+        return modelSelected(modelType)
+    }
 }
 
 
diff --git a/README.md b/README.md
index 69fb1ea..07ba9de 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ laps
 The library adds an extension to table views and collection views, allowing you to easily subscribe to the cell selected delegate event. Here's a snippet from the example demo app:
 
 ```swift
-tableView.rx.realmModelSelected(Lap.self)
+tableView.rx.modelSelected(Lap.self)
   .map({ $0.text })
   .bind(to: rx.title)
   .disposed(by: bag)

From 95d994a3ee05be74d99d8918537e47d2e1b6ad47 Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Sat, 17 Feb 2018 13:22:05 +0200
Subject: [PATCH 3/6] iOS data sources reworked slightly to follow RxCocoa
 conventions - most importantly, leveraging underlying DelegateProxy
 mechanism. This has multiple benefits: allows to use standard RxCocoa binding
 interface instead of writing our own; and brings functionality that otherwise
 was broken (like observing dataSource method invocations).

---
 Pod/Classes/Reactive+RxRealmDataSources.swift | 39 +++++++-------
 .../RxCollectionViewRealmDataSource.swift     | 52 ++++++++++---------
 Pod/Classes/RxTableViewRealmDataSource.swift  | 16 +++---
 README.md                                     |  4 +-
 4 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/Pod/Classes/Reactive+RxRealmDataSources.swift b/Pod/Classes/Reactive+RxRealmDataSources.swift
index e16e224..4ebe663 100644
--- a/Pod/Classes/Reactive+RxRealmDataSources.swift
+++ b/Pod/Classes/Reactive+RxRealmDataSources.swift
@@ -12,22 +12,23 @@ import RxSwift
 import RxCocoa
 import RxRealm
 
+public typealias RealmChange<E: RealmCollectionValue> = (AnyRealmCollection<E>, RealmChangeset?)
+
 #if os(iOS)
 // MARK: - iOS / UIKit
 
 import UIKit
 extension Reactive where Base: UITableView {
 
-    public func realmChanges<E>(_ dataSource: RxTableViewRealmDataSource<E>)
-        -> RealmBindObserver<E, AnyRealmCollection<E>, RxTableViewRealmDataSource<E>> {
-
-            return RealmBindObserver(dataSource: dataSource) {ds, results, changes in
-                if ds.tableView == nil {
-                    ds.tableView = self.base
-                }
-                ds.tableView?.dataSource = ds
-                ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
-            }
+    @available(*, deprecated, message: "use items(dataSource:) instead")
+    public func realmChanges<
+            DataSource: RxTableViewDataSourceType & UITableViewDataSource,
+            O: ObservableType>
+        (_ dataSource: DataSource)
+        -> (_ source: O)
+        -> Disposable
+        where DataSource.Element == O.E {
+        return items(dataSource: dataSource)
     }
 
     @available(*, deprecated, renamed: "modelSelected")
@@ -38,16 +39,14 @@ extension Reactive where Base: UITableView {
 
 extension Reactive where Base: UICollectionView {
 
-    public func realmChanges<E>(_ dataSource: RxCollectionViewRealmDataSource<E>)
-        -> RealmBindObserver<E, AnyRealmCollection<E>, RxCollectionViewRealmDataSource<E>> {
-
-            return RealmBindObserver(dataSource: dataSource) {ds, results, changes in
-                if ds.collectionView == nil {
-                    ds.collectionView = self.base
-                }
-                ds.collectionView?.dataSource = ds
-                ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
-            }
+    @available(*, deprecated, message: "use items(dataSource:) instead")
+    public func realmChanges<
+            DataSource: RxCollectionViewDataSourceType & UICollectionViewDataSource,
+            O: ObservableType>
+        (_ dataSource: DataSource)
+        -> (_ source: O)
+        -> Disposable where DataSource.Element == O.E {
+        return items(dataSource: dataSource)
     }
 
     @available(*, deprecated, renamed: "modelSelected")
diff --git a/Pod/Classes/RxCollectionViewRealmDataSource.swift b/Pod/Classes/RxCollectionViewRealmDataSource.swift
index e6d5f80..f738a25 100644
--- a/Pod/Classes/RxCollectionViewRealmDataSource.swift
+++ b/Pod/Classes/RxCollectionViewRealmDataSource.swift
@@ -20,12 +20,11 @@ import RxRealm
     public typealias CollectionCellFactory<E: Object> = (RxCollectionViewRealmDataSource<E>, UICollectionView, IndexPath, E) -> UICollectionViewCell
     public typealias CollectionCellConfig<E: Object, CellType: UICollectionViewCell> = (CellType, IndexPath, E) -> Void
 
-    open class RxCollectionViewRealmDataSource <E: Object>: NSObject, UICollectionViewDataSource, SectionedViewDataSourceType {
+    open class RxCollectionViewRealmDataSource <E: Object>: NSObject, UICollectionViewDataSource, SectionedViewDataSourceType, RxCollectionViewDataSourceType {
         private var items: AnyRealmCollection<E>?
 
         // MARK: - Configuration
 
-        public var collectionView: UICollectionView?
         public var animated = true
 
         // MARK: - Init
@@ -51,6 +50,13 @@ import RxRealm
             return items![indexPath.row]
         }
 
+        // MARK: - RxCollectionViewDataSourceType
+        public func collectionView(_ collectionView: UICollectionView, observedEvent: Event<RealmChange<E>>) {
+            Binder(self) { dataSource, element in
+                dataSource.applyChanges(to: collectionView, items: element.0, changes: element.1)
+            }.on(observedEvent)
+        }
+
         // MARK: - UICollectionViewDataSource protocol
         public func numberOfSections(in collectionView: UICollectionView) -> Int {
             return 1
@@ -67,38 +73,34 @@ import RxRealm
         // MARK: - Applying changeset to the collection view
         private let fromRow = {(row: Int) in return IndexPath(row: row, section: 0)}
 
-        func applyChanges(items: AnyRealmCollection<E>, changes: RealmChangeset?) {
+        func applyChanges(to collectionView: UICollectionView, items: AnyRealmCollection<E>, changes: RealmChangeset?) {
             if self.items == nil {
                 self.items = items
             }
 
-        guard let collectionView = collectionView else {
-            fatalError("You have to bind a collection view to the data source.")
-        }
+            guard animated else {
+                collectionView.reloadData()
+                return
+            }
 
-        guard animated else {
-            collectionView.reloadData()
-            return
-        }
+            guard let changes = changes else {
+                collectionView.reloadData()
+                return
+            }
 
-        guard let changes = changes else {
-            collectionView.reloadData()
-            return
-        }
+            let lastItemCount = collectionView.numberOfItems(inSection: 0)
+            guard items.count == lastItemCount + changes.inserted.count - changes.deleted.count else {
+                collectionView.reloadData()
+                return
+            }
 
-        let lastItemCount = collectionView.numberOfItems(inSection: 0)
-        guard items.count == lastItemCount + changes.inserted.count - changes.deleted.count else {
-            collectionView.reloadData()
-            return
+            collectionView.performBatchUpdates({[unowned self] in
+                collectionView.deleteItems(at: changes.deleted.map(self.fromRow))
+                collectionView.reloadItems(at: changes.updated.map(self.fromRow))
+                collectionView.insertItems(at: changes.inserted.map(self.fromRow))
+            }, completion: nil)
         }
-
-        collectionView.performBatchUpdates({[unowned self] in
-            collectionView.deleteItems(at: changes.deleted.map(self.fromRow))
-            collectionView.reloadItems(at: changes.updated.map(self.fromRow))
-            collectionView.insertItems(at: changes.inserted.map(self.fromRow))
-        }, completion: nil)
     }
-}
 
 #elseif os(OSX)
 // MARK: - macOS / Cocoa
diff --git a/Pod/Classes/RxTableViewRealmDataSource.swift b/Pod/Classes/RxTableViewRealmDataSource.swift
index a77454e..4b63767 100644
--- a/Pod/Classes/RxTableViewRealmDataSource.swift
+++ b/Pod/Classes/RxTableViewRealmDataSource.swift
@@ -20,13 +20,12 @@ import RxRealm
     public typealias TableCellFactory<E: Object> = (RxTableViewRealmDataSource<E>, UITableView, IndexPath, E) -> UITableViewCell
     public typealias TableCellConfig<E: Object, CellType: UITableViewCell> = (CellType, IndexPath, E) -> Void
 
-    open class RxTableViewRealmDataSource<E: Object>: NSObject, UITableViewDataSource, SectionedViewDataSourceType {
+    open class RxTableViewRealmDataSource<E: Object>: NSObject, UITableViewDataSource, SectionedViewDataSourceType, RxTableViewDataSourceType {
 
         private var items: AnyRealmCollection<E>?
 
         // MARK: - Configuration
 
-        public var tableView: UITableView?
         public var animated = true
         public var rowAnimations = (
             insert: UITableView.RowAnimation.automatic,
@@ -59,6 +58,13 @@ import RxRealm
             return items![indexPath.row]
         }
 
+        // MARK: - RxTableViewDataSourceType
+        public func tableView(_ tableView: UITableView, observedEvent: Event<RealmChange<E>>) {
+            Binder(self) { dataSource, element in
+                dataSource.applyChanges(to: tableView, items: element.0, changes: element.1)
+            }.on(observedEvent)
+        }
+
         // MARK: - UITableViewDataSource protocol
         public func numberOfSections(in tableView: UITableView) -> Int {
             return 1
@@ -83,15 +89,11 @@ import RxRealm
         // MARK: - Applying changeset to the table view
         private let fromRow = {(row: Int) in return IndexPath(row: row, section: 0)}
 
-        func applyChanges(items: AnyRealmCollection<E>, changes: RealmChangeset?) {
+        func applyChanges(to tableView: UITableView, items: AnyRealmCollection<E>, changes: RealmChangeset?) {
             if self.items == nil {
                 self.items = items
             }
 
-            guard let tableView = tableView else {
-                fatalError("You have to bind a table view to the data source.")
-            }
-
             guard animated else {
                 tableView.reloadData()
                 return
diff --git a/README.md b/README.md
index 07ba9de..c3b256f 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
 
 // bind to table view
 laps
-    .bindTo(tableView.rx.realmChanges(dataSource))
+    .bindTo(tableView.rx.items(dataSource: dataSource))
     .disposed(by: bag)
 ```
 
@@ -52,7 +52,7 @@ let laps = Observable.changeset(from: realm.objects(Timer.self).first!.laps)
 
 // bind to collection view
 laps
-    .bindTo(collectionView.rx.realmChanges(dataSource))
+    .bindTo(collectionView.rx.items(dataSource: dataSource))
     .disposed(by: bag)
 ```
 

From 021988de1fdb5515ed9d71abdb3da852076e14de Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Sat, 17 Feb 2018 13:22:36 +0200
Subject: [PATCH 4/6] Examples updated to use standard binding. Introduced
 basic editing to show functionality that wasn't possible before (e.g., it was
 not possible to observe itemDeleted in previous implementation).

---
 .../Base.lproj/Main.storyboard                | 21 +++++++-----
 .../CollectionViewController.swift            | 33 +++++++++++++++++--
 .../RxRealmDataSources/DataRandomizer.swift   |  6 +++-
 .../RxRealmDataSources/ViewController.swift   | 23 ++++++++++++-
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/Example/RxRealmDataSources/Base.lproj/Main.storyboard b/Example/RxRealmDataSources/Base.lproj/Main.storyboard
index ab3256e..323aa3e 100644
--- a/Example/RxRealmDataSources/Base.lproj/Main.storyboard
+++ b/Example/RxRealmDataSources/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="e5b-i0-Sf8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="e5b-i0-Sf8">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -22,9 +22,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="47" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="9wF-Hp-Zl1">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="47" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="9wF-Hp-Zl1">
+                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="47" id="0Fv-lJ-pdU" customClass="PersonCell" customModule="RxRealmDataSources_Example" customModuleProvider="target">
@@ -58,6 +57,12 @@
                             </tableView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="9wF-Hp-Zl1" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="KsW-LD-wdn"/>
+                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="9wF-Hp-Zl1" secondAttribute="bottom" id="U79-jT-Gz8"/>
+                            <constraint firstAttribute="trailing" secondItem="9wF-Hp-Zl1" secondAttribute="trailing" id="Z66-lL-rSb"/>
+                            <constraint firstItem="9wF-Hp-Zl1" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" id="pAN-54-93Z"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="bPo-jC-4xi"/>
                     <connections>
@@ -141,7 +146,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="e5b-i0-Sf8" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="NYx-HQ-0Jl">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -168,7 +173,7 @@
                                         <rect key="frame" x="0.0" y="35" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="TUc-X7-1yK" id="oFC-nh-48l">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="1. Table View Data Source" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FOy-6e-7Rv">
@@ -188,7 +193,7 @@
                                         <rect key="frame" x="0.0" y="79" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iET-qa-wxc" id="CDi-eZ-kOd">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="341" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="2. Collection View Data Source" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lyi-Vs-zYj">
diff --git a/Example/RxRealmDataSources/CollectionViewController.swift b/Example/RxRealmDataSources/CollectionViewController.swift
index b787bad..408731a 100644
--- a/Example/RxRealmDataSources/CollectionViewController.swift
+++ b/Example/RxRealmDataSources/CollectionViewController.swift
@@ -24,6 +24,9 @@ class CollectionViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        let longPressGesture = UILongPressGestureRecognizer(target: self, action: #selector(CollectionViewController.handleLongGesture(gesture:)))
+        collectionView.addGestureRecognizer(longPressGesture)
+
         // create data source
         let dataSource = RxCollectionViewRealmDataSource<Lap>(cellIdentifier: "Cell", cellType: LapCollectionCell.self) {cell, ip, lap in
             cell.customLabel.text = "\(ip.row). \(lap.text)"
@@ -36,7 +39,7 @@ class CollectionViewController: UIViewController {
 
         // bind to collection view
         laps
-            .bind(to: collectionView.rx.realmChanges(dataSource))
+            .bind(to: collectionView.rx.items(dataSource: dataSource))
             .disposed(by: bag)
 
         // bind to vc title
@@ -53,8 +56,34 @@ class CollectionViewController: UIViewController {
             .bind(to: rx.title)
             .disposed(by: bag)
 
+        collectionView.rx.dataSource.methodInvoked(#selector(UICollectionViewDataSource.collectionView(_:moveItemAt:to:)))
+            .subscribe(onNext: { a in
+                guard let from = a[1] as? IndexPath, let to = a[2] as? IndexPath else { return }
+                try! realm.write {
+                    let laps = realm.objects(Timer.self).first!.laps
+                    laps.swapAt(from.row, to.row)
+                }
+            })
+            .disposed(by: bag)
+
         // demo inserting and deleting data
         data.start()
     }
-}
 
+    @objc func handleLongGesture(gesture: UILongPressGestureRecognizer) {
+        switch(gesture.state) {
+        case .began:
+            guard let selectedIndexPath = collectionView.indexPathForItem(at: gesture.location(in: collectionView)) else { break }
+            collectionView.beginInteractiveMovementForItem(at: selectedIndexPath)
+            data.stop()
+        case .changed:
+            collectionView.updateInteractiveMovementTargetPosition(gesture.location(in: gesture.view!))
+        case .ended:
+            collectionView.endInteractiveMovement()
+            data.start()
+        default:
+            collectionView.cancelInteractiveMovement()
+            data.start()
+        }
+    }
+}
diff --git a/Example/RxRealmDataSources/DataRandomizer.swift b/Example/RxRealmDataSources/DataRandomizer.swift
index 0056a78..18b5cf0 100644
--- a/Example/RxRealmDataSources/DataRandomizer.swift
+++ b/Example/RxRealmDataSources/DataRandomizer.swift
@@ -18,7 +18,7 @@ extension Int {
 
 class DataRandomizer {
 
-    private let bag = DisposeBag()
+    private var bag = DisposeBag()
 
     lazy var config: Realm.Configuration = {
         var config = Realm.Configuration.defaultConfiguration
@@ -96,4 +96,8 @@ class DataRandomizer {
             })
             .disposed(by: bag)
     }
+
+    func stop() {
+        bag = DisposeBag()
+    }
 }
diff --git a/Example/RxRealmDataSources/ViewController.swift b/Example/RxRealmDataSources/ViewController.swift
index f31ad36..6ab8c5d 100644
--- a/Example/RxRealmDataSources/ViewController.swift
+++ b/Example/RxRealmDataSources/ViewController.swift
@@ -23,6 +23,7 @@ class ViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationItem.rightBarButtonItem = editButtonItem
 
         // create data source
         let dataSource = RxTableViewRealmDataSource<Lap>(cellIdentifier: "Cell", cellType: PersonCell.self) {cell, ip, lap in
@@ -36,7 +37,7 @@ class ViewController: UIViewController {
 
         // bind to table view
         laps
-            .bind(to: tableView.rx.realmChanges(dataSource))
+            .bind(to: tableView.rx.items(dataSource: dataSource))
             .disposed(by: bag)
 
         // bind to vc title
@@ -53,7 +54,27 @@ class ViewController: UIViewController {
             .bind(to: rx.title)
             .disposed(by: bag)
 
+        tableView.rx.itemDeleted.asObservable()
+            .subscribe(onNext: { indexPath in
+                try! realm.write {
+                    let laps = realm.objects(Timer.self).first!.laps
+                    realm.delete(laps[indexPath.row])
+                }
+            })
+            .disposed(by: bag)
+
         // demo inserting and deleting data
         data.start()
     }
+
+    override func setEditing(_ editing: Bool, animated: Bool) {
+        super.setEditing(editing, animated: animated)
+        tableView.setEditing(editing, animated: animated)
+        
+        if editing {
+            data.stop()
+        } else {
+            data.start()
+        }
+    }
 }

From 022964aa602e4891571065923cfae54fcf0988ab Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Wed, 14 Nov 2018 19:44:47 +0100
Subject: [PATCH 5/6] Updated pod dependencies.

---
 Example/RxRealmDataSources.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Example/RxRealmDataSources.xcodeproj/project.pbxproj b/Example/RxRealmDataSources.xcodeproj/project.pbxproj
index 1774c79..90a2cb7 100644
--- a/Example/RxRealmDataSources.xcodeproj/project.pbxproj
+++ b/Example/RxRealmDataSources.xcodeproj/project.pbxproj
@@ -427,6 +427,7 @@
 				"${SRCROOT}/Pods/Target Support Files/Pods-Demo-RxRealmDataSources_MacExample/Pods-Demo-RxRealmDataSources_MacExample-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Realm-macOS/Realm.framework",
 				"${BUILT_PRODUCTS_DIR}/RealmSwift-macOS/RealmSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/RxAtomic-macOS/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa-macOS/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRealm-macOS/RxRealm.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRealmDataSources-macOS/RxRealmDataSources.framework",
@@ -436,6 +437,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealmDataSources.framework",
@@ -455,6 +457,7 @@
 				"${SRCROOT}/Pods/Target Support Files/Pods-Demo-RxRealmDataSources_Example/Pods-Demo-RxRealmDataSources_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Realm-iOS/Realm.framework",
 				"${BUILT_PRODUCTS_DIR}/RealmSwift-iOS/RealmSwift.framework",
+				"${BUILT_PRODUCTS_DIR}/RxAtomic-iOS/RxAtomic.framework",
 				"${BUILT_PRODUCTS_DIR}/RxCocoa-iOS/RxCocoa.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRealm-iOS/RxRealm.framework",
 				"${BUILT_PRODUCTS_DIR}/RxRealmDataSources-iOS/RxRealmDataSources.framework",
@@ -464,6 +467,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxAtomic.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxCocoa.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRealmDataSources.framework",

From 6cdb0dd823243a2d93c606f5f03b851cdb9b8f05 Mon Sep 17 00:00:00 2001
From: Vasyl Myronchuk <granfalloner@gmail.com>
Date: Thu, 15 Nov 2018 10:14:26 +0100
Subject: [PATCH 6/6] Eliminated RealmBindingObserver in favour of RxCocoa
 Binder.

---
 Pod/Classes/Reactive+RxRealmDataSources.swift | 21 ++++++++++---------
 Pod/Classes/RealmBindObserver.swift           |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Pod/Classes/Reactive+RxRealmDataSources.swift b/Pod/Classes/Reactive+RxRealmDataSources.swift
index 4ebe663..0028e0e 100644
--- a/Pod/Classes/Reactive+RxRealmDataSources.swift
+++ b/Pod/Classes/Reactive+RxRealmDataSources.swift
@@ -63,16 +63,16 @@ import Cocoa
 extension Reactive where Base: NSTableView {
 
     public func realmChanges<E>(_ dataSource: RxTableViewRealmDataSource<E>)
-        -> RealmBindObserver<E, AnyRealmCollection<E>, RxTableViewRealmDataSource<E>> {
+        -> Binder<RealmChange<E>> {
 
             base.delegate = dataSource
             base.dataSource = dataSource
 
-            return RealmBindObserver(dataSource: dataSource) {ds, results, changes in
+            return Binder(base) { tableView, element in
                 if dataSource.tableView == nil {
-                    dataSource.tableView = self.base
+                    dataSource.tableView = tableView
                 }
-                ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
+                dataSource.applyChanges(items: element.0, changes: element.1)
             }
     }
 }
@@ -80,14 +80,15 @@ extension Reactive where Base: NSTableView {
 extension Reactive where Base: NSCollectionView {
 
     public func realmChanges<E>(_ dataSource: RxCollectionViewRealmDataSource<E>)
-        -> RealmBindObserver<E, AnyRealmCollection<E>, RxCollectionViewRealmDataSource<E>> {
+        -> Binder<RealmChange<E>> {
 
-            return RealmBindObserver(dataSource: dataSource) {ds, results, changes in
-                if ds.collectionView == nil {
-                    ds.collectionView = self.base
+            base.dataSource = dataSource
+            
+            return Binder(base) { collectionView, element in
+                if dataSource.collectionView == nil {
+                    dataSource.collectionView = collectionView
                 }
-                ds.collectionView?.dataSource = ds
-                ds.applyChanges(items: AnyRealmCollection<E>(results), changes: changes)
+                dataSource.applyChanges(items: element.0, changes: element.1)
             }
     }
 }
diff --git a/Pod/Classes/RealmBindObserver.swift b/Pod/Classes/RealmBindObserver.swift
index a60b378..cdaee63 100644
--- a/Pod/Classes/RealmBindObserver.swift
+++ b/Pod/Classes/RealmBindObserver.swift
@@ -12,6 +12,7 @@ import RxSwift
 import RxCocoa
 import RxRealm
 
+@available(*, deprecated, message: "use RxCocoa Binder instead")
 public class RealmBindObserver<O: Object, C: RealmCollection, DS>: ObserverType {
     typealias BindingType = (DS, C, RealmChangeset?) -> Void
     public typealias E = (C, RealmChangeset?)