add generic node event

Author: imkdir

Ark.xcodeproj/project.pbxproj

@@ -9,12 +9,12 @@
 /* Begin PBXBuildFile section */
 		35B204DE2BBBE9F4FD20E04E /* Pods_ArkDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F0C766C3C5A77FD675545DA9 /* Pods_ArkDemo.framework */; };
 		6DFA35176F2E68C10B888F2D /* Pods_Ark.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A4B4EE553955500C312EBAA /* Pods_Ark.framework */; };
-		A64FD07824F681D000EB0D38 /* CollectionNodeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64FD07724F681CF00EB0D38 /* CollectionNodeModel.swift */; };
+		A64FD07824F681D000EB0D38 /* NodeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64FD07724F681CF00EB0D38 /* NodeModel.swift */; };
 		A64FD07A24F688D000EB0D38 /* HomeFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = A64FD07924F688D000EB0D38 /* HomeFeed.swift */; };
 		A655BE0F24F73CC400DB6F02 /* Banner.swift in Sources */ = {isa = PBXBuildFile; fileRef = A655BE0E24F73CC400DB6F02 /* Banner.swift */; };
 		A655BE1124F73D2800DB6F02 /* ArticleFeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = A655BE1024F73D2800DB6F02 /* ArticleFeed.swift */; };
 		A655BE1324F73D5C00DB6F02 /* SectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A655BE1224F73D5C00DB6F02 /* SectionHeader.swift */; };
-		A6E81FA624F7E99E00AAE8B0 /* CollectionNodeContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6E81FA524F7E99E00AAE8B0 /* CollectionNodeContext.swift */; };
+		A6E81FA624F7E99E00AAE8B0 /* NodeContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6E81FA524F7E99E00AAE8B0 /* NodeContext.swift */; };
 		B4256DC724ED1715000DF13C /* Ark.h in Headers */ = {isa = PBXBuildFile; fileRef = B4256DC524ED1715000DF13C /* Ark.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B42875AB24EE10ED00933413 /* ListDiff.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42875AA24EE10ED00933413 /* ListDiff.swift */; };
 		B42875B324EE137D00933413 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42875B224EE137D00933413 /* AppDelegate.swift */; };
@@ -27,6 +27,7 @@
 		B42875CA24EE7A7700933413 /* Ark.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4256DC224ED1715000DF13C /* Ark.framework */; };
 		B42875CB24EE7A7700933413 /* Ark.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B4256DC224ED1715000DF13C /* Ark.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		B4E5581B24FCA9DA004C2477 /* DateFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6E81FA224F7A8C600AAE8B0 /* DateFormat.swift */; };
+		B4E5581E24FCC530004C2477 /* NodeChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4E5581D24FCC530004C2477 /* NodeChannel.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -69,13 +70,13 @@
 		73A9113722B6957CF7BB8838 /* Pods-GLFeedKitDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GLFeedKitDemo.debug.xcconfig"; path = "Target Support Files/Pods-GLFeedKitDemo/Pods-GLFeedKitDemo.debug.xcconfig"; sourceTree = "<group>"; };
 		9500F7B816029FB5A309BFA3 /* Pods-ArkDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ArkDemo.release.xcconfig"; path = "Target Support Files/Pods-ArkDemo/Pods-ArkDemo.release.xcconfig"; sourceTree = "<group>"; };
 		A52E228118AFF2DB46C48C21 /* Pods-GLFeedKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GLFeedKit.debug.xcconfig"; path = "Target Support Files/Pods-GLFeedKit/Pods-GLFeedKit.debug.xcconfig"; sourceTree = "<group>"; };
-		A64FD07724F681CF00EB0D38 /* CollectionNodeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionNodeModel.swift; sourceTree = "<group>"; };
+		A64FD07724F681CF00EB0D38 /* NodeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeModel.swift; sourceTree = "<group>"; };
 		A64FD07924F688D000EB0D38 /* HomeFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeFeed.swift; sourceTree = "<group>"; };
 		A655BE0E24F73CC400DB6F02 /* Banner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Banner.swift; sourceTree = "<group>"; };
 		A655BE1024F73D2800DB6F02 /* ArticleFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleFeed.swift; sourceTree = "<group>"; };
 		A655BE1224F73D5C00DB6F02 /* SectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SectionHeader.swift; sourceTree = "<group>"; };
 		A6E81FA224F7A8C600AAE8B0 /* DateFormat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateFormat.swift; sourceTree = "<group>"; };
-		A6E81FA524F7E99E00AAE8B0 /* CollectionNodeContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionNodeContext.swift; sourceTree = "<group>"; };
+		A6E81FA524F7E99E00AAE8B0 /* NodeContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeContext.swift; sourceTree = "<group>"; };
 		B4256DC224ED1715000DF13C /* Ark.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Ark.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B4256DC524ED1715000DF13C /* Ark.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Ark.h; sourceTree = "<group>"; };
 		B4256DC624ED1715000DF13C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -89,6 +90,7 @@
 		B42875BE24EE138100933413 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		B42875C024EE138100933413 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B42875C524EE2CBB00933413 /* DiffableDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DiffableDataSource.swift; sourceTree = "<group>"; };
+		B4E5581D24FCC530004C2477 /* NodeChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NodeChannel.swift; sourceTree = "<group>"; };
 		F0C766C3C5A77FD675545DA9 /* Pods_ArkDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ArkDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F61531B872BE69FE4C5901BD /* Pods-Ark.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ark.release.xcconfig"; path = "Target Support Files/Pods-Ark/Pods-Ark.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -155,8 +157,9 @@
 				B4256DC524ED1715000DF13C /* Ark.h */,
 				B42875AA24EE10ED00933413 /* ListDiff.swift */,
 				B42875C524EE2CBB00933413 /* DiffableDataSource.swift */,
-				A64FD07724F681CF00EB0D38 /* CollectionNodeModel.swift */,
-				A6E81FA524F7E99E00AAE8B0 /* CollectionNodeContext.swift */,
+				A64FD07724F681CF00EB0D38 /* NodeModel.swift */,
+				A6E81FA524F7E99E00AAE8B0 /* NodeContext.swift */,
+				B4E5581D24FCC530004C2477 /* NodeChannel.swift */,
 				B4256DC624ED1715000DF13C /* Info.plist */,
 			);
 			path = Ark;
@@ -391,10 +394,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B4E5581E24FCC530004C2477 /* NodeChannel.swift in Sources */,
 				B42875AB24EE10ED00933413 /* ListDiff.swift in Sources */,
-				A6E81FA624F7E99E00AAE8B0 /* CollectionNodeContext.swift in Sources */,
+				A6E81FA624F7E99E00AAE8B0 /* NodeContext.swift in Sources */,
 				B42875C624EE2CBB00933413 /* DiffableDataSource.swift in Sources */,
-				A64FD07824F681D000EB0D38 /* CollectionNodeModel.swift in Sources */,
+				A64FD07824F681D000EB0D38 /* NodeModel.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Ark/CollectionNodeModel.swift

@@ -7,17 +7,19 @@
 //
 
 import Foundation
+import RxSwift
+import RxCocoa
 import AsyncDisplayKit
 
 
-public struct DiffableDataSourceSnapshot<T: CollectionNodeModel> {
+public struct DiffableDataSourceSnapshot<T: SectionInflator> {
     public private(set) var sections: [T]
 
     public init(sections: [T]) {
         self.sections = sections
     }
 
-    public func item(for indexPath: IndexPath) -> CollectionNodeModel {
+    public func item(for indexPath: IndexPath) -> NodeModel {
         sections[indexPath.section].items[indexPath.item]
     }
 
@@ -26,13 +28,14 @@ public struct DiffableDataSourceSnapshot<T: CollectionNodeModel> {
     }
 }
 
-public class DiffableDataSource<Model: CollectionNodeModel & Equatable>: NSObject,
+public class DiffableDataSource<Target: SectionInflator>: NSObject,
     ASCollectionDelegate & ASCollectionDataSource {
-    public typealias Snapshot = DiffableDataSourceSnapshot<Model>
+    public typealias Snapshot = DiffableDataSourceSnapshot<Target>
 
     public private(set) var snapshot: Snapshot!
 
     public private(set) weak var collectionNode: ASCollectionNode!
+    fileprivate let rx_channel = NodeChannel()
 
     public init(collectionNode: ASCollectionNode) {
         self.collectionNode = collectionNode
@@ -47,9 +50,10 @@ public class DiffableDataSource<Model: CollectionNodeModel & Equatable>: NSObjec
             return
         }
         self.snapshot = snapshot
-        let result = List.diffing(oldArray: oldSnapshot.sections, newArray: snapshot.sections).forBatchUpdates()
-        // TODO: combine diff result with requested index paths updates
+        let result = List.diffing(oldArray: oldSnapshot.sections, newArray: snapshot.sections)
+        
         collectionNode.performBatch(animated: animatingDifferences, updates: { [node = self.collectionNode] in
+
             for move in result.moves {
                 node?.moveSection(move.from, toSection: move.to)
             }
@@ -75,16 +79,31 @@ public class DiffableDataSource<Model: CollectionNodeModel & Equatable>: NSObjec
 
     public func collectionNode(_ collectionNode: ASCollectionNode, nodeBlockForItemAt indexPath: IndexPath) -> ASCellNodeBlock {
         let item = snapshot.item(for: indexPath)
-        return item.viewBlock
+        return item.nodeBlock(with: rx_channel, indexPath: indexPath)
     }
 
     public func collectionNode(_ collectionNode: ASCollectionNode, constrainedSizeForItemAt indexPath: IndexPath) -> ASSizeRange {
-        let section = snapshot.sections[indexPath.section]
         let item = snapshot.item(for: indexPath)
-        let context = CollectionNodeContext(
-            section: section,
+        let context = NodeContext(
             containerSize: collectionNode.calculatedSize,
             contentInset: collectionNode.contentInset)
         return item.sizeRange(in: context)
     }
+    
+    public func collectionNode(_ collectionNode: ASCollectionNode, didSelectItemAt indexPath: IndexPath) {
+        let item = snapshot.item(for: indexPath)
+        let event = NodeEvent(model: item, kind: .selection, indexPath: indexPath, userInfo: [:])
+        rx_channel.onNext(event)
+    }
+}
+
+extension Reactive {
+    
+    public func nodeEventChannel<Model: SectionInflator, T: NodeModel>() -> Observable<GenericNodeEvent<T>>
+        where Base: DiffableDataSource<Model> {
+        base.rx_channel
+            .asObserver()
+            .compactMap(GenericNodeEvent<T>.init)
+            .observeOn(MainScheduler.instance)
+    }
 }

Ark/DiffableDataSource.swift

@@ -0,0 +1,46 @@
+//
+//  NodeEvent.swift
+//  Ark
+//
+//  Created by Dwight CHENG on 2020/8/31.
+//  Copyright © 2020 Glow. All rights reserved.
+//
+
+import Foundation
+import RxSwift
+import RxCocoa
+
+public typealias NodeChannel = PublishSubject<NodeEvent>
+
+public struct NodeEvent {
+    public let model: NodeModel
+    public let kind: Kind
+    public let indexPath: IndexPath
+    public let userInfo: [String: Any]
+    
+    public enum Kind {
+        case selection, refresh, action, dismiss
+    }
+    
+    public func on<T: NodeModel>(completion: (GenericNodeEvent<T>) -> Void) -> NodeEvent {
+        GenericNodeEvent<T>(self).map(completion)
+        return self
+    }
+}
+
+public struct GenericNodeEvent<T: NodeModel> {
+    public let model: T
+    public let kind: NodeEvent.Kind
+    public let indexPath: IndexPath
+    public let userInfo: [String: Any]
+    
+    public init?(_ nodeEvent: NodeEvent) {
+        guard let model = nodeEvent.model as? T else {
+            return nil
+        }
+        self.model = model
+        self.kind = nodeEvent.kind
+        self.indexPath = nodeEvent.indexPath
+        self.userInfo = nodeEvent.userInfo
+    }
+}

Ark/NodeChannel.swift

@@ -1,5 +1,5 @@
 //
-//  CollectionNodeContext.swift
+//  NodeContext.swift
 //  Ark
 //
 //  Created by Dwight CHENG on 8/27/20.
@@ -9,8 +9,8 @@
 import UIKit
 import AsyncDisplayKit
 
-public struct CollectionNodeContext {
-    public let section: CollectionNodeModel
+
+public struct NodeContext {
     public let containerSize: CGSize
     public let contentInset: UIEdgeInsets
 

Ark/CollectionNodeContext.swift renamed to Ark/NodeContext.swift

@@ -0,0 +1,31 @@
+//
+//  NodeModel.swift
+//  Ark
+//
+//  Created by Dwight CHENG on 8/26/20.
+//  Copyright © 2020 Glow. All rights reserved.
+//
+
+import Foundation
+import RxSwift
+import RxCocoa
+import AsyncDisplayKit
+
+public protocol SectionInflator: Diffable, Equatable {
+    var items: [NodeModel] { get }
+}
+
+open class NodeModel: NSObject, Diffable {
+
+    open var diffIdentifier: AnyHashable {
+        self
+    }
+    
+    open func nodeBlock(with channel: NodeChannel, indexPath: IndexPath) -> ASCellNodeBlock {
+        ASCellNode.init
+    }
+    
+    open func sizeRange(in context: NodeContext) -> ASSizeRange {
+        context.automaticDimension
+    }
+}