Merge pull request #246 from surfstudio/hotfix/SPT-1546/insert_func_optimisation

Hotfix/spt 1546/insert func optimisation

Author: NullIsOne

Example/ReactiveDataDisplayManager/Table/AllPluginsTableViewController/AllPluginsTableViewController.swift

@@ -97,14 +97,33 @@ private extension AllPluginsTableViewController {
         addPrefetcherableSection()
 
         // Tell adapter that we've changed generators
-        adapter.forceRefill()
+        adapter.forceRefill { [weak self] in
+            self?.insertMoreSections()
+        }
     }
 
     func updateBarButtonItem(with title: String) {
         let button = UIBarButtonItem(title: title, style: .plain, target: self, action: #selector(changeTableEditing))
         navigationItem.rightBarButtonItem = button
     }
 
+    /// Insertion of new section with some cells
+    func insertMoreSections() {
+
+        guard let existingSectionGenerator = adapter.sections.last else {
+            return
+        }
+
+        // Create generators
+        let newHeaderGenerator = SectionTitleHeaderGenerator(model: "One more section", needSectionIndexTitle: true)
+        let generators = Constants.titles.map { TitleTableViewCell.rddm.baseGenerator(with: $0) }
+
+        // Insert them
+        adapter.insertSection(after: existingSectionGenerator,
+                              new: newHeaderGenerator,
+                              generators: generators)
+    }
+
     /// Use this method for UI stress test only.
     /// You can traine here usage of manual manager and different replacing and insertions.
     ///  - Note: some combinations of functions may cause crash and it's normal, because manualBuilder is just wrapper under tableView functions.

ReactiveDataDisplayManagerTests/Mocks/AutoMockable.generated.swift

@@ -1,4 +1,4 @@
-// Generated using Sourcery 1.9.2 — https://github.com/krzysztofzablocki/Sourcery
+// Generated using Sourcery 2.0.2 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
 // swiftlint:disable all
 

Source/Collection/Manager/BaseCollectionManager.swift

@@ -220,12 +220,14 @@ private extension BaseCollectionManager {
 
         elements.forEach { [weak self] element in
             element.generator.registerCell(in: view)
-            self?.generators[element.sectionIndex].insert(element.generator, at: element.generatorIndex)
+            if self?.generators.count == element.sectionIndex {
+                self?.generators.append([element.generator])
+            } else {
+                self?.generators[element.sectionIndex].insert(element.generator, at: element.generatorIndex)
+            }
         }
 
-        let indexPaths = elements.map {
-            IndexPath(row: $0.generatorIndex, section: $0.sectionIndex)
-        }
+        let indexPaths = elements.map { IndexPath(item: $0.generatorIndex, section: $0.sectionIndex) }
 
         modifier?.insertRows(at: indexPaths, with: .animated)
     }

Source/Collection/Modifier/CollectionCommonModifier.swift

@@ -83,10 +83,28 @@ class CollectionCommonModifier: Modifier<UICollectionView, CollectionItemAnimati
         }
     }
 
+    /// Insert new sections with items at specific position with animation
+    ///
+    /// - parameter indexDictionary: dictionary where **key** is new section index and value is location of items to insert
+    /// - parameter insertAnimation: animation of insert operation
+    ///  - Warning: make sure that you do not have mistake in indexes inside `indexDictionary`.
+    ///  For example, if you are inserting **many sections** using this method you should notice that **index** cannot be greater than **final number of sections**.
+    override func insertSectionsAndRows(at indexDictionary: [Int: [IndexPath]],
+                                        with insertAnimation: CollectionItemAnimation?) {
+        guard let view = view else { return }
+        animator?.perform(in: view, animated: insertAnimation != nil) { [weak view] in
+            let setOfKeys = IndexSet(indexDictionary.keys)
+            let allValues = indexDictionary.values.flatMap { $0 }
+            view?.insertSections(setOfKeys)
+            view?.insertItems(at: allValues)
+        }
+    }
+
     /// Insert sections with animation
     ///
     /// - parameter indexPaths: indexes of inserted sections
     /// - parameter insertAnimation: animation of inserted sections
+    ///  - Warning: This method will insert an **empty** section only. If you need to insert section with items use `insertSectionsAndRows` instead.
     override func insertSections(at indexPaths: IndexSet, with insertAnimation: CollectionItemAnimation?) {
         guard let view = view else { return }
         animator?.perform(in: view, animated: insertAnimation != nil) { [weak view] in

Source/Collection/Modifier/CollectionDiffableModifier.swift

@@ -86,6 +86,17 @@ class CollectionDiffableModifier: Modifier<UICollectionView, CollectionItemAnima
         apply(animated: animation != nil)
     }
 
+    /// Insert new sections with items at specific position with animation
+    ///
+    /// - parameter indexDictionary: **ignored**, automatically calculated using `DiffableSnapshot`
+    /// - parameter insertAnimation:
+    ///     - **allowed** nil to disable animation
+    ///     - **ignored** any other, because automatically selected by `UICollectionViewDiffableDataSource`
+    override func insertSectionsAndRows(at indexDictionary: [Int: [IndexPath]],
+                                        with insertAnimation: CollectionItemAnimation?) {
+        apply(animated: insertAnimation != nil)
+    }
+
     /// Update snapshot after sections inserted
     ///
     /// - parameter indexPaths: **ignored**, automatically calculated using `DiffableSnapshot`

Source/Protocols/Modifier/Modifier.swift

@@ -60,10 +60,21 @@ open class Modifier<View: UIView, Animation> {
         preconditionFailure("\(#function) must be overriden in child")
     }
 
+    /// Insert new sections with rows at specific position with animation
+    ///
+    /// - parameter indexDictionary: dictionary where **key** is new section index and value is location of subviews to insert
+    /// - parameter insertAnimation: animation of insert operation
+    ///  - Warning: make sure that you do not have mistake in indexes inside `indexDictionary`.
+    ///  For example, if you are inserting **many sections** using this method you should notice that **index** cannot be greater than **final number of sections**.
+    open func insertSectionsAndRows(at indexDictionary: [Int: [IndexPath]], with insertAnimation: Animation?) {
+        preconditionFailure("\(#function) must be overriden in child")
+    }
+
     /// Insert new sections at specific position with animation
     ///
     /// - parameter indexPaths: location of sections to insert
     /// - parameter insertAnimation: animation of insert operation
+    ///  - Warning: This method will insert an **empty** section only. If you need to insert section with rows use `insertSectionsAndRows: [Int : [IndexPath]]` instead.
     open func insertSections(at indexPaths: IndexSet, with insertAnimation: Animation?) {
         preconditionFailure("\(#function) must be overriden in child")
     }

Source/Table/Manager/BaseTableManager.swift

@@ -195,9 +195,7 @@ extension BaseTableManager {
             self?.generators[element.sectionIndex].insert(element.generator, at: element.generatorIndex)
         }
 
-        let indexPaths = elements.map {
-            IndexPath(row: $0.generatorIndex, section: $0.sectionIndex)
-        }
+        let indexPaths = elements.map { IndexPath(row: $0.generatorIndex, section: $0.sectionIndex) }
 
         modifier?.insertRows(at: indexPaths, with: animation.value)
     }