Changed modelAtIndexPath to return actual model, not wrapped model by IdentifiableValue if using AnimatedDataSource,

so that we can use `UITableView`'s `rx_modelSelected` with actual ModelType, not `IdentitifiableValue<ModelType>` as a parameter.

Author: inkyfox

Sources/DataSources+Rx/RxCollectionViewSectionedAnimatedDataSource.swift

@@ -13,10 +13,12 @@ import RxSwift
 import RxCocoa
 #endif
 
-public class RxCollectionViewSectionedAnimatedDataSource<S: SectionModelType>
+public class RxCollectionViewSectionedAnimatedDataSource<S: AnimatableSectionModelType>
     : CollectionViewSectionedDataSource<S>
     , RxCollectionViewDataSourceType {
     public typealias Element = [Changeset<S>]
+    public typealias ItemType = S.Item.Identity
+
     public var animationConfiguration: AnimationConfiguration? = nil
 
     // For some inexplicable reason, when doing animated updates first time
@@ -42,4 +44,13 @@ public class RxCollectionViewSectionedAnimatedDataSource<S: SectionModelType>
 
         }.on(observedEvent)
     }
+    
+    override public func modelAtIndexPath(indexPath: NSIndexPath) throws -> Any {
+        let model = itemAtIndexPath(indexPath)
+        if let m = model as? IdentitifiableValue<ItemType> {
+            return m.value
+        } else {
+            return model
+        }
+    }
 }

Sources/DataSources+Rx/RxTableViewSectionedAnimatedDataSource.swift

@@ -13,11 +13,13 @@ import RxSwift
 import RxCocoa
 #endif
 
-public class RxTableViewSectionedAnimatedDataSource<S: SectionModelType>
+public class RxTableViewSectionedAnimatedDataSource<S: AnimatableSectionModelType>
     : RxTableViewSectionedDataSource<S>
     , RxTableViewDataSourceType {
 
     public typealias Element = [Changeset<S>]
+    public typealias ItemType = S.Item.Identity
+
     public var animationConfiguration: AnimationConfiguration? = nil
 
     public override init() {
@@ -37,4 +39,13 @@ public class RxTableViewSectionedAnimatedDataSource<S: SectionModelType>
             }
         }.on(observedEvent)
     }
+    
+    override public func modelAtIndexPath(indexPath: NSIndexPath) throws -> Any {
+        let model = itemAtIndexPath(indexPath)
+        if let m = model as? IdentitifiableValue<ItemType> {
+            return m.value
+        } else {
+            return model
+        }
+    }
 }