Public Delegate Proxy properties and optimize ASDataSource batchUpdate

dangthaison91 · dangthaison91 · commit be3fd7e20466 · 2017-08-02T00:20:58.000+07:00
diff --git a/Readme.md b/Readme.md
@@ -39,7 +39,7 @@ $ pod install
 To integrate RxTextureDataSources into your Xcode project using Carthage, specify it in your `Cartfile`:
 
 ```ogdl
-github "RxTextureDataSources/RxTextureDataSources" ~> 0.1
+github "dangthaison91/RxTextureDataSources" ~> 0.1
 ```
 
 ## Usage
diff --git a/Sources/DataSources/ASCollectionNode+Rx/RxASCollectionAnimatedDataSource.swift b/Sources/DataSources/ASCollectionNode+Rx/RxASCollectionAnimatedDataSource.swift
@@ -35,21 +35,21 @@ open class RxASCollectionAnimatedDataSource<S: AnimatableSectionModelType>: ASCo
                     collectionNode.reloadData()
                 }
             } else {
-                DispatchQueue.main.async {
-                    let oldSections = dataSource.sectionModels
-                    do {
-                        let differences = try differencesForSectionedView(initialSections: oldSections, finalSections: newSections)
+                let oldSections = dataSource.sectionModels
+                do {
+                    let differences = try differencesForSectionedView(initialSections: oldSections, finalSections: newSections)
+                    DispatchQueue.main.async {
 
                         for difference in differences {
                             dataSource.setSections(difference.finalSections)
                             collectionNode.performBatchUpdates(difference, animationConfiguration: self.animationConfiguration)
                         }
-                    } catch {
-                        rxDebugFatalError("\(error)")
-                        DispatchQueue.main.async {
-                            self.setSections(newSections)
-                            collectionNode.reloadData()
-                        }
+                    }
+                } catch {
+                    rxDebugFatalError("\(error)")
+                    DispatchQueue.main.async {
+                        self.setSections(newSections)
+                        collectionNode.reloadData()
                     }
                 }
             }
diff --git a/Sources/DataSources/ASTableNode+Rx/RxASTableAnimatedDataSource.swift b/Sources/DataSources/ASTableNode+Rx/RxASTableAnimatedDataSource.swift
@@ -35,21 +35,21 @@ open class RxASTableAnimatedDataSource<S: AnimatableSectionModelType>: ASTableSe
                     tableNode.reloadData()
                 }
             } else {
-                DispatchQueue.main.async {
-                    let oldSections = dataSource.sectionModels
-                    do {
-                        let differences = try differencesForSectionedView(initialSections: oldSections, finalSections: newSections)
-
+                let oldSections = dataSource.sectionModels
+                do {
+                    let differences = try differencesForSectionedView(initialSections: oldSections, finalSections: newSections)
+                    DispatchQueue.main.async {
                         for difference in differences {
                             dataSource.setSections(difference.finalSections)
                             tableNode.performBatchUpdates(difference, animationConfiguration: self.animationConfiguration)
                         }
-                    } catch {
-                        rxDebugFatalError("\(error)")
-                        DispatchQueue.main.async {
-                            self.setSections(newSections)
-                            tableNode.reloadData()
-                        }
+                        tableNode.waitUntilAllUpdatesAreCommitted()
+                    }
+                } catch {
+                    rxDebugFatalError("\(error)")
+                    DispatchQueue.main.async {
+                        self.setSections(newSections)
+                        tableNode.reloadData()
                     }
                 }
             }
diff --git a/Sources/DataSources/RxProxies/RxASCollectionDataSourceProxy.swift b/Sources/DataSources/RxProxies/RxASCollectionDataSourceProxy.swift
@@ -25,9 +25,8 @@ final class ASCollectionDataSourceNotSet: NSObject, ASCollectionDataSource {
     }
 }
 
-
 /// For more information take a look at `DelegateProxyType`.
-public class  RxASCollectionDataSourceProxy: DelegateProxy, ASCollectionDataSource, DelegateProxyType {
+public class RxASCollectionDataSourceProxy: DelegateProxy, ASCollectionDataSource, DelegateProxyType {
 
     /// Typed parent object.
     public weak private(set) var collectionNode: ASCollectionNode?
diff --git a/Sources/DataSources/RxProxies/RxASCollectionDelegateProxy.swift b/Sources/DataSources/RxProxies/RxASCollectionDelegateProxy.swift
@@ -14,7 +14,8 @@ import Foundation
     import RxSwift
     import RxCocoa
 #endif
-    /// For more information take a look at `DelegateProxyType`.
+    
+/// For more information take a look at `DelegateProxyType`.
 public class RxASCollectionDelegateProxy: DelegateProxy, DelegateProxyType, ASCollectionDelegate, ASCollectionDelegateFlowLayout {
 
     /// Typed parent object.
@@ -40,7 +41,7 @@ public class RxASCollectionDelegateProxy: DelegateProxy, DelegateProxyType, ASCo
     }
 }
 
-extension Reactive where Base: ASCollectionNode {
+public extension Reactive where Base: ASCollectionNode {
 
     var delegate: DelegateProxy {
         return RxASCollectionDelegateProxy.proxyForObject(base)
@@ -58,7 +59,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:didSelectItemAtIndexPath:)`.
-    public var itemSelected: ControlEvent<IndexPath> {
+     var itemSelected: ControlEvent<IndexPath> {
         let source = delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didSelectItemAt:)))
             .map { a in
                 return a[1] as! IndexPath
@@ -68,7 +69,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:didSelectItemAtIndexPath:)`.
-    public var itemDeselected: ControlEvent<IndexPath> {
+     var itemDeselected: ControlEvent<IndexPath> {
         let source = delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didDeselectItemAt:)))
             .map { a in
                 return a[1] as! IndexPath
@@ -78,7 +79,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:didHighlightItemAt:)`.
-    public var itemHighlighted: ControlEvent<IndexPath> {
+     var itemHighlighted: ControlEvent<IndexPath> {
         let source = delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didHighlightItemAt:)))
             .map { a in
                 return try castOrThrow(IndexPath.self, a[1])
@@ -88,7 +89,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:didUnhighlightItemAt:)`.
-    public var itemUnhighlighted: ControlEvent<IndexPath> {
+     var itemUnhighlighted: ControlEvent<IndexPath> {
         let source = delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didUnhighlightItemAt:)))
             .map { a in
                 return try castOrThrow(IndexPath.self, a[1])
@@ -98,7 +99,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode:willDisplay:forItemAt:`.
-    public var willDisplayItem: ControlEvent<ASCellNode> {
+     var willDisplayItem: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:willDisplayItemWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -108,7 +109,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:willDisplaySupplementaryView:forElementKind:at:)`.
-    public var willDisplaySupplementaryElement: ControlEvent<ASCellNode> {
+     var willDisplaySupplementaryElement: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:willDisplaySupplementaryElementWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -118,7 +119,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode:didEndDisplaying:forItemAt:`.
-    public var didEndDisplayingItem: ControlEvent<ASCellNode> {
+     var didEndDisplayingItem: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didEndDisplayingItemWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -128,7 +129,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Reactive wrapper for `delegate` message `collectionNode(_:didEndDisplayingSupplementaryView:forElementOfKind:at:)`.
-    public var didEndDisplayingSupplementaryElement: ControlEvent<ASCellNode> {
+     var didEndDisplayingSupplementaryElement: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASCollectionDelegate.collectionNode(_:didEndDisplayingSupplementaryElementWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -146,7 +147,7 @@ extension Reactive where Base: ASCollectionNode {
     ///     collectionNode.rx.modelSelected(MyModel.self)
     ///        .map { ...
     /// ```
-    public func modelSelected<T>(_ modelType: T.Type) -> ControlEvent<T> {
+     func modelSelected<T>(_ modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = itemSelected.flatMap { [weak view = self.base as ASCollectionNode] indexPath -> Observable<T> in
             guard let view = view else {
                 return Observable.empty()
@@ -167,7 +168,7 @@ extension Reactive where Base: ASCollectionNode {
     ///     collectionNode.rx.modelDeselected(MyModel.self)
     ///        .map { ...
     /// ```
-    public func modelDeselected<T>(_ modelType: T.Type) -> ControlEvent<T> {
+     func modelDeselected<T>(_ modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = itemDeselected.flatMap { [weak view = self.base as ASCollectionNode] indexPath -> Observable<T> in
             guard let view = view else {
                 return Observable.empty()
@@ -180,7 +181,7 @@ extension Reactive where Base: ASCollectionNode {
     }
 
     /// Synchronous helper method for retrieving a model at indexPath through a reactive data source
-    public func model<T>(at indexPath: IndexPath) throws -> T {
+     func model<T>(at indexPath: IndexPath) throws -> T {
         let dataSource: SectionedViewDataSourceType = castOrFatalError(self.dataSource.forwardToDelegate(), message: "This method only works in case one of the `rx.itemsWith*` methods was used.")
 
         let element = try dataSource.model(at: indexPath)
diff --git a/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift b/Sources/DataSources/RxProxies/RxASTableDelegateProxy.swift
@@ -35,7 +35,7 @@ public class RxASTableDelegateProxy: DelegateProxy, DelegateProxyType, ASTableDe
     }
 }
 
-extension Reactive where Base: ASTableNode {
+public extension Reactive where Base: ASTableNode {
 
     var delegate: DelegateProxy {
         return RxASTableDelegateProxy.proxyForObject(base)
@@ -56,7 +56,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:didSelectRowAtIndexPath:`.
      */
-    public var itemSelected: ControlEvent<IndexPath> {
+    var itemSelected: ControlEvent<IndexPath> {
         let source = self.delegate.methodInvoked(#selector(ASTableDelegate.tableNode(_:didSelectRowAt:)))
             .map { a in
                 return try castOrThrow(IndexPath.self, a[1])
@@ -68,7 +68,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:didDeselectRowAtIndexPath:`.
      */
-    public var itemDeselected: ControlEvent<IndexPath> {
+    var itemDeselected: ControlEvent<IndexPath> {
         let source = self.delegate.methodInvoked(#selector(ASTableDelegate.tableNode(_:didDeselectRowAt:)))
             .map { a in
                 return try castOrThrow(IndexPath.self, a[1])
@@ -80,7 +80,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:commitEditingStyle:forRowAtIndexPath:`.
      */
-    public var itemInserted: ControlEvent<IndexPath> {
+    var itemInserted: ControlEvent<IndexPath> {
         let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:)))
             .filter { a in
                 return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .insert
@@ -95,7 +95,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:commitEditingStyle:forRowAtIndexPath:`.
      */
-    public var itemDeleted: ControlEvent<IndexPath> {
+    var itemDeleted: ControlEvent<IndexPath> {
         let source = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:commit:forRowAt:)))
             .filter { a in
                 return UITableViewCellEditingStyle(rawValue: (try castOrThrow(NSNumber.self, a[1])).intValue) == .delete
@@ -110,7 +110,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:moveRowAtIndexPath:toIndexPath:`.
      */
-    public var itemMoved: ControlEvent<ItemMovedEvent> {
+    var itemMoved: ControlEvent<ItemMovedEvent> {
         let source: Observable<ItemMovedEvent> = self.dataSource.methodInvoked(#selector(ASTableDataSource.tableView(_:moveRowAt:to:)))
             .map { a in
                 return (try castOrThrow(IndexPath.self, a[1]), try castOrThrow(IndexPath.self, a[2]))
@@ -122,7 +122,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:willDisplayCell:forRowAtIndexPath:`.
      */
-    public var willDisplayCell: ControlEvent<ASCellNode> {
+    var willDisplayCell: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASTableDelegate.tableNode(_:willDisplayRowWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -134,7 +134,7 @@ extension Reactive where Base: ASTableNode {
     /**
      Reactive wrapper for `delegate` message `tableNode:didEndDisplayingCell:forRowAtIndexPath:`.
      */
-    public var didEndDisplayingCell: ControlEvent<ASCellNode> {
+    var didEndDisplayingCell: ControlEvent<ASCellNode> {
         let source: Observable<ASCellNode> = self.delegate.methodInvoked(#selector(ASTableDelegate.tableNode(_:didEndDisplayingRowWith:)))
             .map { a in
                 return try castOrThrow(ASCellNode.self, a[1])
@@ -154,7 +154,7 @@ extension Reactive where Base: ASTableNode {
      .map { ...
      ```
      */
-    public func modelSelected<T>(_ modelType: T.Type) -> ControlEvent<T> {
+    func modelSelected<T>(_ modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = self.itemSelected.flatMap { [weak view = self.base as ASTableNode] indexPath -> Observable<T> in
             guard let view = view else {
                 return Observable.empty()
@@ -177,7 +177,7 @@ extension Reactive where Base: ASTableNode {
      .map { ...
      ```
      */
-    public func modelDeselected<T>(_ modelType: T.Type) -> ControlEvent<T> {
+    func modelDeselected<T>(_ modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = self.itemDeselected.flatMap { [weak view = self.base as ASTableNode] indexPath -> Observable<T> in
             guard let view = view else {
                 return Observable.empty()
@@ -200,7 +200,7 @@ extension Reactive where Base: ASTableNode {
      .map { ...
      ```
      */
-    public func modelDeleted<T>(_ modelType: T.Type) -> ControlEvent<T> {
+    func modelDeleted<T>(_ modelType: T.Type) -> ControlEvent<T> {
         let source: Observable<T> = self.itemDeleted.flatMap { [weak view = self.base as ASTableNode] indexPath -> Observable<T> in
             guard let view = view else {
                 return Observable.empty()
@@ -215,12 +215,12 @@ extension Reactive where Base: ASTableNode {
     /**
      Synchronous helper method for retrieving a model at indexPath through a reactive data source.
      */
-    public func model<T>(at indexPath: IndexPath) throws -> T {
+    func model<T>(at indexPath: IndexPath) throws -> T {
         let dataSource: SectionedViewDataSourceType = castOrFatalError(self.dataSource.forwardToDelegate(), message: "This method only works in case one of the `rx.items*` methods was used.")
-
+        
         let element = try dataSource.model(at: indexPath)
         
         return castOrFatalError(element)
     }
-
+    
 }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,8 @@ final class ASCollectionDataSourceNotSet: NSObject, ASCollectionDataSource {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`-`
`29`	`28`	/// For more information take a look at `DelegateProxyType`.
`30`		`-public class RxASCollectionDataSourceProxy: DelegateProxy, ASCollectionDataSource, DelegateProxyType {`
	`29`	`+public class RxASCollectionDataSourceProxy: DelegateProxy, ASCollectionDataSource, DelegateProxyType {`
`31`	`30`
`32`	`31`	`/// Typed parent object.`
`33`	`32`	`public weak private(set) var collectionNode: ASCollectionNode?`