Merge pull request #240 from surfstudio/hotfix/SPT-1515

[SPT-1515][7.3.7] Очищать BaseEvents и сделать FoldableGenerator доступным

Author: NullIsOne

Example/ReactiveDataDisplayManager/Collection/FoldableCollectionViewController/FoldableCollectionViewController.swift

@@ -95,10 +95,9 @@ private extension FoldableCollectionViewController {
         adapter.forceRefill()
     }
 
-    func makeFoldableCellGenerator(color: UIColor, expanded: Bool) -> FoldableCollectionCellGenerator {
+    func makeFoldableCellGenerator(color: UIColor, expanded: Bool) -> CollectionCellGenerator & CollectionFoldableItem {
         // Create foldable generator
-        let viewModel = FoldableCollectionViewCell.ViewModel(color: color)
-        let generator = FoldableCollectionCellGenerator(with: viewModel)
+        let generator = FoldableCollectionViewCell.rddm.foldableGenerator(with: .init(color: color))
 
         // Configure foldable initial state
         generator.isExpanded = expanded

Example/ReactiveDataDisplayManager/Collection/Views/Cells/FoldableCollectionViewCell/FoldableCollectionViewCell.swift

@@ -10,7 +10,7 @@ import UIKit
 import ReactiveDataDisplayManager
 import Nuke
 
-final class FoldableCollectionViewCell: UICollectionViewCell {
+final class FoldableCollectionViewCell: UICollectionViewCell, FoldableStateHolder {
 
     // MARK: - ViewModel
 
@@ -36,9 +36,9 @@ final class FoldableCollectionViewCell: UICollectionViewCell {
         setupInitialState()
     }
 
-    // MARK: - Internal Methods
+    // MARK: - Foldable
 
-    func update(isExpanded: Bool) {
+    func setExpanded(_ isExpanded: Bool) {
         UIView.animate(withDuration: Constants.animationDuration) { [weak self] in
             self?.arrowImageView.transform = isExpanded ? .identity : CGAffineTransform(rotationAngle: .pi)
         }

Example/ReactiveDataDisplayManager/Collection/Views/Cells/Generators/FoldableCollectionCellGenerator.swift

@@ -176,7 +176,7 @@ private extension AllPluginsTableViewController {
 
         for _ in 0...3 {
             // Create foldable generator
-            let generator = FoldableCellGenerator(with: .init(title: "", isExpanded: false))
+            let generator = FoldableTableViewCell.rddm.foldableGenerator(with: .init(title: "", isExpanded: false))
 
             // Create and add child generators
             generator.childGenerators = Constants.titles.map { TitleTableViewCell.rddm.baseGenerator(with: $0) }

Example/ReactiveDataDisplayManager/Table/AllPluginsTableViewController/AllPluginsTableViewController.swift

@@ -56,6 +56,18 @@ private extension FoldableTableViewController {
         // Add foldable cell generator to adapter
         adapter.addCellGenerator(makeFoldableCellGenerator(id: "2"))
 
+        // Add foldable cell generator to adapter
+        adapter.addCellGenerator(makeFoldableCellGenerator(id: "3"))
+
+        // Add foldable cell generator to adapter
+        adapter.addCellGenerator(makeFoldableCellGenerator(id: "4"))
+
+        // Add foldable cell generator to adapter
+        adapter.addCellGenerator(makeFoldableCellGenerator(id: "5"))
+
+        // Add foldable cell generator to adapter
+        adapter.addCellGenerator(makeFoldableCellGenerator(id: "6"))
+
         // Tell adapter that we've changed generators
         adapter.forceRefill()
     }
@@ -68,9 +80,9 @@ private extension FoldableTableViewController {
         return generators
     }
 
-    func makeFoldableCellGenerator(id: String) -> FoldableCellGenerator {
+    func makeFoldableCellGenerator(id: String) -> TableCellGenerator {
         // Create foldable generator
-        let generator = FoldableCellGenerator(with: .init(title: id, isExpanded: false))
+        let generator = FoldableTableViewCell.rddm.foldableGenerator(with: .init(title: id, isExpanded: false))
 
         // Create and add child generators
         generator.childGenerators = Constants.titleForSubcells.map { TitleTableViewCell.rddm.baseGenerator(with: $0) }

Example/ReactiveDataDisplayManager/Table/FoldableTableViewController/FoldableTableViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import ReactiveDataDisplayManager
 
-final class FoldableTableViewCell: UITableViewCell {
+final class FoldableTableViewCell: UITableViewCell, FoldableStateHolder {
 
     struct Model {
         let title: String
@@ -35,9 +35,9 @@ final class FoldableTableViewCell: UITableViewCell {
         setupInitialState()
     }
 
-    // MARK: - Internal Methods
+    // MARK: - Foldable
 
-    func update(isExpanded: Bool) {
+    func setExpanded(_ isExpanded: Bool) {
         UIView.animate(withDuration: Constants.animationDuration) { [weak self] in
             self?.arrowImageView.transform = isExpanded ? .identity : CGAffineTransform(rotationAngle: .pi)
         }

Example/ReactiveDataDisplayManager/Table/Views/Cells/FoldableTableViewCell/FoldableTableViewCell.swift

@@ -8,7 +8,7 @@
 
 import ReactiveDataDisplayManager
 
-final class GravityFoldableCellGenerator: FoldableCellGenerator {
+final class GravityFoldableCellGenerator: FoldableCellGenerator<FoldableTableViewCell> {
 
     // MARK: - Properties
 

Example/ReactiveDataDisplayManager/Table/Views/Cells/Generators/FoldableCellGenerator.swift

@@ -0,0 +1,130 @@
+//
+//  BaseEventTests.swift
+//  ReactiveDataDisplayManager
+//
+//  Created by korshunov on 26.06.2023.
+//
+
+import XCTest
+@testable import ReactiveDataDisplayManager
+
+final class BaseEventTests: XCTestCase {
+
+    func testWhenValueInvokesCorrectly() {
+        // given
+
+        let event = BaseEvent<String>()
+        var result = ""
+
+        event.addListner { result = $0 }
+
+        // when
+
+        event.invoke(with: "invoked")
+
+        // then
+
+        XCTAssertEqual(result, "invoked")
+    }
+
+    func testWhenNListnersThenNEvents() {
+        // given
+
+        let event = BaseEvent<Int>()
+        let n = 100
+        var eventHandled = 0
+
+        for _ in 0..<n {
+            event.addListner({ _ in eventHandled += 1 })
+        }
+
+        // when
+
+        event.invoke(with: 0)
+
+        // then
+
+        XCTAssertEqual(eventHandled, n)
+    }
+
+    func testWhenNListnersThenClear() {
+        // given
+
+        let event = BaseEvent<Int>()
+        let n = 100
+
+        for _ in 0..<n {
+            event.addListner({ _ in })
+        }
+
+        // when
+
+        event.clear()
+
+        // then
+
+        XCTAssertTrue(event.isEmpty)
+    }
+
+    func testWhenUniqueListnerThenReplaced() {
+        // given
+
+        let event = BaseEvent<Int>()
+        let id = "uniqueId"
+        var result = 0
+
+        event.addListner(with: id) { _ in
+            result = 1
+        }
+
+        // when
+
+        event.addListner(with: id) { _ in
+            result = 2
+        }
+        event.invoke(with: 0)
+
+        // then
+
+        XCTAssertEqual(result, 2)
+        XCTAssertEqual(event.count, 1)
+    }
+
+    func testWhenNUniqueListnersThenReplaced() {
+        // given
+
+        let event = BaseEvent<Int>()
+        let n = 100
+        let ids = Array(repeating: 0, count: n).map { _ in UUID().uuidString }
+
+        ids.forEach { event.addListner(with: $0, { _ in }) }
+
+        // when
+
+        ids.forEach { event.addListner(with: $0, { _ in }) }
+
+        // then
+
+        XCTAssertEqual(event.count, n)
+    }
+
+    func testWhenClearThenNoEvents() {
+        // given
+
+        let event = BaseEvent<Int>()
+        var result = false
+
+        event.addListner { _ in result = true }
+
+        // when
+
+        event.clear()
+        event.invoke(with: 0)
+
+        // then
+
+        XCTAssertFalse(result)
+        XCTAssertTrue(event.isEmpty)
+    }
+
+}

Example/ReactiveDataDisplayManager/Table/Views/Cells/Generators/GravityFoldableCellGenerator.swift

@@ -17,3 +17,11 @@ public extension StaticDataDisplayWrapper where Base: UICollectionViewCell & Con
     }
 
 }
+
+public extension StaticDataDisplayWrapper where Base: UICollectionViewCell & ConfigurableItem & FoldableStateHolder {
+
+    func foldableGenerator(with model: Base.Model, and registerType: CellRegisterType = .nib) -> FoldableCollectionCellGenerator<Base> {
+        .init(with: model, registerType: registerType)
+    }
+
+}