Fix not working cellAction in CollectionViewBase.

Brightify · Nov 9, 2017 · 663a365 · 663a365
1 parent ed77404
commit 663a365
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/Source/CollectionView/CollectionViewBase.swift b/Source/CollectionView/CollectionViewBase.swift
@@ -138,6 +138,7 @@ open class CollectionViewBase<MODEL, ACTION>: ViewBase<CollectionViewState<MODEL
 
     open func configure<T: Component>(cell: CollectionViewCellWrapper<T>, factory: @escaping () -> T, model: T.StateType,
                           mapAction: @escaping (T.ActionType) -> ACTION) -> Void {
+        cell.configureDisposeBag = DisposeBag()
         if configurationChangeTime != cell.configurationChangeTime {
             cell.configuration = configuration
             cell.configurationChangeTime = configurationChangeTime
@@ -146,7 +147,7 @@ open class CollectionViewBase<MODEL, ACTION>: ViewBase<CollectionViewState<MODEL
         component.componentState = model
         component.action.map(mapAction)
             .subscribe(onNext: perform)
-            .disposed(by: stateDisposeBag)
+            .disposed(by: cell.configureDisposeBag)
     }
 
     open func dequeueAndConfigure<T: Component>(identifier: CollectionViewCellIdentifier<T>, forRow row: Int, factory: @escaping () -> T,
@@ -158,6 +159,7 @@ open class CollectionViewBase<MODEL, ACTION>: ViewBase<CollectionViewState<MODEL
 
     open func configure<T: Component>(view: CollectionReusableViewWrapper<T>, factory: @escaping () -> T, model: T.StateType,
                           mapAction: @escaping (T.ActionType) -> ACTION) -> Void {
+        view.configureDisposeBag = DisposeBag()
         if configurationChangeTime != view.configurationChangeTime {
             view.configuration = configuration
             view.configurationChangeTime = configurationChangeTime
@@ -166,7 +168,7 @@ open class CollectionViewBase<MODEL, ACTION>: ViewBase<CollectionViewState<MODEL
         component.componentState = model
         component.action.map(mapAction)
             .subscribe(onNext: perform)
-            .disposed(by: stateDisposeBag)
+            .disposed(by: view.configureDisposeBag)
     }
 
     open func dequeueAndConfigure<T: Component>(identifier: CollectionSupplementaryViewIdentifier<T>, forRow row: Int, factory: @escaping () -> T,

diff --git a/Source/CollectionView/Internal/CollectionReusableViewWrapper.swift b/Source/CollectionView/Internal/CollectionReusableViewWrapper.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import RxSwift
 
 public final class CollectionReusableViewWrapper<VIEW: UIView>: UICollectionReusableView, Configurable {
 
@@ -20,6 +21,8 @@ public final class CollectionReusableViewWrapper<VIEW: UIView>: UICollectionReus
             configuration.get(valueFor: Properties.Style.CollectionView.reusableViewWrapper)(self)
         }
     }
+
+    public var configureDisposeBag = DisposeBag()
 
     public override class var requiresConstraintBasedLayout: Bool {
         return true

diff --git a/Source/CollectionView/Internal/CollectionViewCellWrapper.swift b/Source/CollectionView/Internal/CollectionViewCellWrapper.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import RxSwift
 
 public final class CollectionViewCellWrapper<CELL: UIView>: UICollectionViewCell, Configurable {
 
@@ -42,6 +43,8 @@ public final class CollectionViewCellWrapper<CELL: UIView>: UICollectionViewCell
             collectionViewCell?.setSelected(isSelected)
         }
     }
+
+    public var configureDisposeBag = DisposeBag()
 
     public override var isHighlighted: Bool {
         didSet {

diff --git a/Source/TableView/Internal/TableViewCellWrapper.swift b/Source/TableView/Internal/TableViewCellWrapper.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import RxSwift
 
 public final class TableViewCellWrapper<CELL: UIView>: UITableViewCell, Configurable {
 
@@ -20,6 +21,8 @@ public final class TableViewCellWrapper<CELL: UIView>: UITableViewCell, Configur
             configuration.get(valueFor: Properties.Style.TableView.cellWrapper)(self)
         }
     }
+
+    public var configureDisposeBag = DisposeBag()
 
     public override class var requiresConstraintBasedLayout: Bool {
         return true

diff --git a/Source/TableView/Internal/TableViewHeaderFooterWrapper.swift b/Source/TableView/Internal/TableViewHeaderFooterWrapper.swift
@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import RxSwift
 
 public final class TableViewHeaderFooterWrapper<VIEW: UIView>: UITableViewHeaderFooterView, Configurable {
 
@@ -20,6 +21,8 @@ public final class TableViewHeaderFooterWrapper<VIEW: UIView>: UITableViewHeader
             configuration.get(valueFor: Properties.Style.TableView.headerFooterWrapper)(self)
         }
     }
+
+    public var configureDisposeBag = DisposeBag()
 
     public override class var requiresConstraintBasedLayout: Bool {
         return true

diff --git a/Source/TableView/TableViewBase.swift b/Source/TableView/TableViewBase.swift
@@ -150,6 +150,7 @@ open class TableViewBase<MODEL, ACTION>: ViewBase<TableViewState<MODEL>, ACTION>
 
     open func configure<T: Component>(cell: TableViewCellWrapper<T>, factory: @escaping () -> T, model: T.StateType,
                           mapAction: @escaping (T.ActionType) -> ACTION) -> Void {
+        cell.configureDisposeBag = DisposeBag()
         if configurationChangeTime != cell.configurationChangeTime {
             cell.configuration = configuration
             cell.configurationChangeTime = configurationChangeTime
@@ -159,7 +160,7 @@ open class TableViewBase<MODEL, ACTION>: ViewBase<TableViewState<MODEL>, ACTION>
         (component as? Configurable)?.configuration = configuration
         component.action.map(mapAction)
             .subscribe(onNext: perform)
-            .disposed(by: component.stateDisposeBag)
+            .disposed(by: cell.configureDisposeBag)
     }
 
     open func dequeueAndConfigure<T: Component>(identifier: TableViewCellIdentifier<T>, factory: @escaping () -> T,
@@ -171,6 +172,7 @@ open class TableViewBase<MODEL, ACTION>: ViewBase<TableViewState<MODEL>, ACTION>
 
     open func configure<T: Component>(view: TableViewHeaderFooterWrapper<T>, factory: @escaping () -> T, model: T.StateType,
                           mapAction: @escaping (T.ActionType) -> ACTION) -> Void {
+        view.configureDisposeBag = DisposeBag()
         if configurationChangeTime != view.configurationChangeTime {
             view.configuration = configuration
             view.configurationChangeTime = configurationChangeTime
@@ -180,7 +182,7 @@ open class TableViewBase<MODEL, ACTION>: ViewBase<TableViewState<MODEL>, ACTION>
         (component as? Configurable)?.configuration = configuration
         component.action.map(mapAction)
             .subscribe(onNext: perform)
-            .disposed(by: component.stateDisposeBag)
+            .disposed(by: view.configureDisposeBag)
     }
 
     open func dequeueAndConfigure<T: Component>(identifier: TableViewHeaderFooterIdentifier<T>, factory: @escaping () -> T,