Merge pull request #242 from surfstudio/hotfix/SPT-1516

[SPT-1516][7.3.7] Правка ambiguity в параметрах

Author: NullIsOne

Gemfile.lock

@@ -72,6 +72,8 @@ GEM
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    nokogiri (1.14.3-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
     public_suffix (4.0.7)
@@ -101,6 +103,7 @@ GEM
     zeitwerk (2.6.7)
 
 PLATFORMS
+  arm64-darwin-22
   x86_64-darwin-21
 
 DEPENDENCIES

ReactiveDataDisplayManagerTests/Table/Manager/BaseTableManagerTests.swift

@@ -155,7 +155,7 @@ final class BaseTableManagerTests: XCTestCase {
         table.forceLayout()
 
         // when
-        ddm.remove(gen3, with: nil, needScrollAt: .top, needRemoveEmptySection: false)
+        ddm.remove(gen3, with: .notAnimated, needScrollAt: .top, needRemoveEmptySection: false)
         ddm.forceRefill()
 
         // then
@@ -176,7 +176,7 @@ final class BaseTableManagerTests: XCTestCase {
         table.forceLayout()
 
         // when
-        ddm.remove(gen1, with: nil, needScrollAt: nil, needRemoveEmptySection: false)
+        ddm.remove(gen1, with: .notAnimated, needScrollAt: nil, needRemoveEmptySection: false)
         ddm.forceRefill()
 
         // then

Source/Table/Manager/BaseTableManager.swift

@@ -89,7 +89,7 @@ open class BaseTableManager: TableGeneratorsProvider, DataDisplayManager {
     /// for row when scrolling concludes. See UITableViewScrollPosition for descriptions of valid constants.
     ///   - needRemoveEmptySection: Pass **true** if you need to remove section if it'll be empty after deleting.
     open func remove(_ generator: TableCellGenerator,
-                     with animation: UITableView.RowAnimation?,
+                     with animation: TableRowAnimation,
                      needScrollAt scrollPosition: UITableView.ScrollPosition?,
                      needRemoveEmptySection: Bool) {
         guard let index = findGenerator(generator) else { return }
@@ -99,6 +99,20 @@ open class BaseTableManager: TableGeneratorsProvider, DataDisplayManager {
                              needRemoveEmptySection: needRemoveEmptySection)
     }
 
+    // MARK: - Deprecated
+
+    @available(*, deprecated, message: "Please use method with a new `TableRowAnimation` parameter")
+    open func remove(_ generator: TableCellGenerator,
+                     with animation: UITableView.RowAnimation?,
+                     needScrollAt scrollPosition: UITableView.ScrollPosition?,
+                     needRemoveEmptySection: Bool) {
+        guard let index = findGenerator(generator) else { return }
+        self.removeGenerator(with: index,
+                             with: animation.map { .animated($0) } ?? .notAnimated,
+                             needScrollAt: scrollPosition,
+                             needRemoveEmptySection: needRemoveEmptySection)
+    }
+
 }
 
 // MARK: - Helper
@@ -115,7 +129,7 @@ extension BaseTableManager {
     }
 
     func removeGenerator(with index: (sectionIndex: Int, generatorIndex: Int),
-                         with animation: UITableView.RowAnimation? = .automatic,
+                         with animation: TableRowAnimation,
                          needScrollAt scrollPosition: UITableView.ScrollPosition? = nil,
                          needRemoveEmptySection: Bool = false) {
 
@@ -132,7 +146,7 @@ extension BaseTableManager {
         }
 
         // apply changes in table
-        modifier?.removeRows(at: [indexPath], and: sectionIndexPath, with: animation)
+        modifier?.removeRows(at: [indexPath], and: sectionIndexPath, with: animation.value)
 
         // scroll if needed
         if let scrollPosition = scrollPosition {
@@ -174,7 +188,7 @@ extension BaseTableManager {
     // MARK: - Inserting
 
     func insert(elements: [(generator: TableCellGenerator, sectionIndex: Int, generatorIndex: Int)],
-                with animation: UITableView.RowAnimation = .automatic) {
+                with animation: TableRowAnimation) {
 
         elements.forEach { [weak self] element in
             element.generator.registerCell(in: view)
@@ -185,12 +199,12 @@ extension BaseTableManager {
             IndexPath(row: $0.generatorIndex, section: $0.sectionIndex)
         }
 
-        modifier?.insertRows(at: indexPaths, with: animation)
+        modifier?.insertRows(at: indexPaths, with: animation.value)
     }
-    
+
     func insertManual(after generator: TableCellGenerator,
-                     new newGenerators: [TableCellGenerator],
-                     with animation: UITableView.RowAnimation = .automatic) {
+                      new newGenerators: [TableCellGenerator],
+                      with animation: TableRowAnimation) {
         guard let index = self.findGenerator(generator) else { return }
 
         let elements = newGenerators.enumerated().map { item in

Source/Table/Manager/GravityTableManager.swift

@@ -143,8 +143,45 @@ open class GravityTableManager: BaseTableManager {
 
     open func replace(oldGenerator: CellGeneratorType,
                       on newGenerator: CellGeneratorType,
-                      removeAnimation: UITableView.RowAnimation = .automatic,
-                      insertAnimation: UITableView.RowAnimation = .automatic) {
+                      removeInsertAnimation: TableRowAnimationGroup = .animated(.automatic, .automatic)) {
+        guard let index = self.findGenerator(oldGenerator) else { return }
+
+        generators[index.sectionIndex].remove(at: index.generatorIndex)
+        generators[index.sectionIndex].insert(newGenerator, at: index.generatorIndex)
+
+        let indexPath = IndexPath(row: index.generatorIndex, section: index.sectionIndex)
+
+        modifier?.replace(at: indexPath, with: removeInsertAnimation.value)
+    }
+
+    open func replace(header: HeaderGeneratorType, with animation: TableRowAnimation = .animated(.fade)) {
+        guard let indexOfHeader = self.sections.firstIndex(where: { $0 === header }) else {
+            self.addSectionHeaderGenerator(header)
+            return
+        }
+
+        self.sections[indexOfHeader] = header
+        modifier?.reloadSections(at: [indexOfHeader], with: animation.value)
+    }
+
+    open func remove(_ generator: CellGeneratorType,
+                     with animation: TableRowAnimation = .animated(.automatic),
+                     needScrollAt scrollPosition: UITableView.ScrollPosition? = nil,
+                     needRemoveEmptySection: Bool = false) {
+        guard let index = self.findGenerator(generator) else { return }
+        self.removeGenerator(with: index,
+                             with: animation,
+                             needScrollAt: scrollPosition,
+                             needRemoveEmptySection: needRemoveEmptySection)
+    }
+
+    // MARK: - Depcrecated
+
+    @available(*, deprecated, message: "Please use method with a new `TableRowAnimationGroup` parameters")
+    open func replace(oldGenerator: CellGeneratorType,
+                      on newGenerator: CellGeneratorType,
+                      removeAnimation: UITableView.RowAnimation,
+                      insertAnimation: UITableView.RowAnimation) {
         guard let index = self.findGenerator(oldGenerator) else { return }
 
         generators[index.sectionIndex].remove(at: index.generatorIndex)
@@ -154,7 +191,8 @@ open class GravityTableManager: BaseTableManager {
         modifier?.replace(at: indexPath, with: (remove: removeAnimation, insert: insertAnimation))
     }
 
-    open func replace(header: HeaderGeneratorType, with animation: UITableView.RowAnimation = .fade) {
+    @available(*, deprecated, message: "Please use method with a new `TableRowAnimation` parameter")
+    open func replace(header: HeaderGeneratorType, with animation: UITableView.RowAnimation) {
         guard let indexOfHeader = self.sections.firstIndex(where: { $0 === header }) else {
             self.addSectionHeaderGenerator(header)
             return
@@ -164,13 +202,14 @@ open class GravityTableManager: BaseTableManager {
         modifier?.reloadSections(at: [indexOfHeader], with: animation)
     }
 
+    @available(*, deprecated, message: "Please use method with a new `TableRowAnimation` parameter")
     open func remove(_ generator: CellGeneratorType,
-                     with animation: UITableView.RowAnimation = .automatic,
+                     with animation: UITableView.RowAnimation,
                      needScrollAt scrollPosition: UITableView.ScrollPosition? = nil,
                      needRemoveEmptySection: Bool = false) {
         guard let index = self.findGenerator(generator) else { return }
         self.removeGenerator(with: index,
-                             with: animation,
+                             with: .animated(animation),
                              needScrollAt: scrollPosition,
                              needRemoveEmptySection: needRemoveEmptySection)
     }