simplify model items

Author: schrockblock

Sources/flex-data-source/FlexDataSourceProtocol.swift

@@ -60,7 +60,7 @@ extension FlexDataSourceProtocol {
     public func tappableOnSelect(_ tableView: UITableView, _ indexPath: IndexPath) -> Void {
         deselectRow(tableView, indexPath)
         if let tappable = sections?[indexPath.section].items?[indexPath.row] as? Tappable {
-            tappable.onTap()
+            tappable.onTap?()
         }
     }
 
@@ -87,7 +87,7 @@ extension FlexDataSourceProtocol {
     public func commitEditingStyleForRow(_ tableView: UITableView, editingStyle: UITableViewCell.EditingStyle, at indexPath: IndexPath) {
         if editingStyle == .delete {
             if let item = sections?[indexPath.section].items?[indexPath.row] as? Swipable {
-                item.onSwipe()
+                item.onSwipe?()
                 sections?[indexPath.section].items?.remove(at: indexPath.row)
                 tableView.deleteRows(at: [indexPath], with: .fade)
             }

Sources/flex-data-source/FlexItems.swift

@@ -9,62 +9,57 @@ import Foundation
 import LithoOperators
 import Prelude
 
-open class FlexModelItem<T, C>: ConcreteFlexDataSourceItem<C> where C: UITableViewCell {
+open class FlexModelItem<T, C>: ConcreteFlexDataSourceItem<C>, Tappable, Swipable where C: UITableViewCell {
     open var model: T
     open var configurer: (C) -> Void
+    public var onTap: (() -> Void)?
+    public var onSwipe: (() -> Void)?
+    public var gestureRecognizer: UIGestureRecognizer?
+    public var onGesture: ((T, UIGestureRecognizer?) -> Void)?
 
     public init(_ model: T, _ configurer: @escaping (T, C) -> Void) {
         self.model = model
         self.configurer = model *-> configurer
         super.init(identifier: String(describing: C.self))
     }
 
-    override open func configureCell(_ cell: UITableViewCell) {
-        if let cell = cell as? C {
-            configurer(cell)
-        }
-    }
-}
-
-open class FlexTappableModelItem<T, C>: FlexModelItem<T, C>, Tappable where C: UITableViewCell {
-    public var onTap: () -> Void = {}
-    
     public init(model: T, configurer: @escaping (T, C) -> Void, tap: @escaping (T) -> Void) {
         self.onTap = voidCurry(model, tap)
-        super.init(model, configurer)
+        self.model = model
+        self.configurer = model *-> configurer
+        super.init(identifier: String(describing: C.self))
     }
-}
-
-open class FlexSwipeTapModelItem<T, C>: FlexTappableModelItem<T, C>, Swipable where C: UITableViewCell {
-    public var onSwipe: () -> Void
 
     public init(model: T,
                 configurer: @escaping (T, C) -> Void,
                 tap: @escaping (T) -> Void,
                 swipe: @escaping () -> Void) {
         self.onSwipe = swipe
-        super.init(model: model, configurer: configurer, tap: tap)
+        self.onTap = voidCurry(model, tap)
+        self.model = model
+        self.configurer = model *-> configurer
+        super.init(identifier: String(describing: C.self))
     }
 
     public init(model: T,
                 configurer: @escaping (T, C) -> Void,
                 tap: @escaping (T) -> Void,
                 swipe: @escaping (T) -> Void) {
         self.onSwipe = voidCurry(model, swipe)
-        super.init(model: model, configurer: configurer, tap: tap)
+        self.onTap = voidCurry(model, tap)
+        self.model = model
+        self.configurer = model *-> configurer
+        super.init(identifier: String(describing: C.self))
     }
-}
-
-open class FlexGestureModelItem<T, C>: FlexModelItem<T, C> where C: UITableViewCell {
-    public var gestureRecognizer: UIGestureRecognizer?
-    public var onGesture: ((T, UIGestureRecognizer?) -> Void)?
 
     override open func configureCell(_ cell: UITableViewCell) {
         if let recognizer = gestureRecognizer {
             cell.contentView.removeGestureRecognizer(recognizer)
             cell.contentView.addGestureRecognizer(recognizer)
         }
-        super.configureCell(cell)
+        if let cell = cell as? C {
+            configurer(cell)
+        }
     }
 
     @objc open func gesturePerformed() {
@@ -76,10 +71,10 @@ public func modelItem<T, U: UITableViewCell>(_ configurer: @escaping (T, U) -> V
     return configurer -*> FlexModelItem.init
 }
 
-public func tappableModelItem<T, U: UITableViewCell>(_ configurer: @escaping (T, U) -> Void, onTap: @escaping (T) -> Void) -> (T) -> FlexTappableModelItem<T, U> {
-    return (configurer, onTap) -**> FlexTappableModelItem.init
+public func tappableModelItem<T, U: UITableViewCell>(_ configurer: @escaping (T, U) -> Void, onTap: @escaping (T) -> Void) -> (T) -> FlexModelItem<T, U> {
+    return (configurer, onTap) -**> FlexModelItem.init
 }
 
-public func swipeTappableModelItem<T, U: UITableViewCell>(_ configurer: @escaping (T, U) -> Void, onTap: @escaping (T) -> Void, onSwipe: @escaping (T) -> Void) -> (T) -> FlexSwipeTapModelItem<T, U> {
-    return (configurer, onTap, onSwipe) -***> FlexSwipeTapModelItem.init
+public func swipeTappableModelItem<T, U: UITableViewCell>(_ configurer: @escaping (T, U) -> Void, onTap: @escaping (T) -> Void, onSwipe: @escaping (T) -> Void) -> (T) -> FlexModelItem<T, U> {
+    return (configurer, onTap, onSwipe) -***> FlexModelItem.init
 }

Sources/flex-data-source/Swipeable.swift

@@ -8,9 +8,9 @@
 import Foundation
 
 public protocol Swipable {
-    var onSwipe: () -> Void { get }
+    var onSwipe: (() -> Void)? { get }
 }
 
 public func swipe(on swipable: Swipable) {
-    swipable.onSwipe()
+    swipable.onSwipe?()
 }

Sources/flex-data-source/Tappable.swift

@@ -8,9 +8,9 @@
 import Foundation
 
 public protocol Tappable {
-    var onTap: () -> Void { get }
+    var onTap: (() -> Void)? { get }
 }
 
 public func tap(on tappable: Tappable) {
-    tappable.onTap()
+    tappable.onTap?()
 }