Fixed an issue where a crash would occur when applying an external update to list content while a live reorder event was occurring

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Fixed
 
 - Fixed an issue where supplementary views (headers or footers) that contained a first responder would result in the view being duplicated when scrolled off-screen.
+- Fixed an issue where a crash would occur when applying an external update to list content while a live reorder event was occurring.
 
 ### Added
 

Demo/Sources/Demos/Demo Screens/PaymentTypesViewController.swift

@@ -12,12 +12,21 @@ import BlueprintUICommonControls
 
 final class PaymentTypesViewController : ListViewController {
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+
+        Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { [weak self] _ in
+            self?.reload(animated: true)
+        }
+    }
+
     override func configure(list: inout ListProperties) {
 
         list.layout = .table { table in
             table.layout.interSectionSpacingWithNoFooter = 10.0
             table.bounds = .init(
-                padding: UIEdgeInsets(top: 0, left: 0, bottom: 100, right: 0)
+                padding: UIEdgeInsets(top: 0, left: 0, bottom: 100, right: 0),
+                width: .atMost(600)
             )
         }
 
@@ -30,21 +39,31 @@ final class PaymentTypesViewController : ListViewController {
         list += Section(SectionID.main) { section in
 
             section.header = PaymentTypeHeader(title: SectionID.main.title)
-
+                        
             section += types.filter { $0.isEnabled }
             .filter { $0.isMain }
             .sorted { $0.sortOrder < $1.sortOrder }
             .map(makeItem(with:))
+
+            if section.items.isEmpty {
+                section += EmptyRow()
+            }
         }
 
         list += Section(SectionID.more) { section in
 
             section.header = PaymentTypeHeader(title: SectionID.more.title)
 
+            section.reordering.minItemCount = 0
+
             section += types.filter { $0.isEnabled }
             .filter { $0.isMain == false }
             .sorted { $0.sortOrder < $1.sortOrder }
             .map(makeItem(with:))
+
+            if section.items.isEmpty {
+                section += EmptyRow()
+            }
         }
 
         list += Section(SectionID.disabled) { section in
@@ -136,7 +155,7 @@ fileprivate struct PaymentTypeHeader : BlueprintHeaderFooterContent, Equatable {
 
     var elementRepresentation: Element {
         Label(text: title) {
-            $0.font = .systemFont(ofSize: 18.0, weight: .medium)
+            $0.font = .systemFont(ofSize: 18.0, weight: .bold)
         }
         .inset(uniform: 15.0)
     }

ListableUI/Sources/ListView/ListChangesQueue.swift

@@ -11,7 +11,7 @@ import Foundation
 /// A queue used to synchronized and serialize changes made to the backing collection view,
 /// to work around either bugs or confusing behavior.
 ///
-/// ## Handling Re-ordering (`isQueuingForReorderEvent`)
+/// ## Handling Re-ordering (`isQueuingToApplyReorderEvent`)
 /// Collection View has an issue wherein if you perform a re-order event, and then within
 /// the same runloop, deliver an update to the collection view as a result of that re-order event
 /// that removes a row or section, the collection view will crash because it's internal index path
@@ -104,18 +104,24 @@ final class ListChangesQueue {
         self.runIfNeeded()
     }
 
-    /// Set by consumers to enable and disable queueing during a reorder event.
-    var isQueuingForReorderEvent : Bool = false {
+    /// Set by consumers to enable and disable queueing when a reorder event is being applied.
+    var isQueuingToApplyReorderEvent : Bool = false {
         didSet {
             self.runIfNeeded()
         }
     }
 
-    /// Prevents processing other events in the queue.
+    /// Should be set to `{ collectionView.hasUncommittedUpdates }`.
     ///
-    /// Note: Right now this just checks `isQueuingForReorderEvent`, but may check more props in the future.
+    /// When this closure returns `true`, the queue is paused, to avoid crashes when applying
+    /// content updates while there are index-changing reorder events in process.
+    var listHasUncommittedReorderUpdates : () -> Bool = {
+        fatalError("Must set `listHasUncommittedReorderUpdates` before using `ListChangesQueue`.")
+    }
+
+    /// Prevents processing other events in the queue.
     var isPaused : Bool {
-        self.isQueuingForReorderEvent
+        self.isQueuingToApplyReorderEvent || self.listHasUncommittedReorderUpdates()
     }
 
     var isEmpty : Bool {

ListableUI/Sources/ListView/ListView.DataSource.swift

@@ -152,7 +152,7 @@ internal extension ListView
             ///
             /// See `sendEndQueuingEditsAfterDelay` for a more in-depth explanation.
             ///
-            self.view.updateQueue.isQueuingForReorderEvent = true
+            self.view.updateQueue.isQueuingToApplyReorderEvent = true
 
             /// Perform the change in our data source.
 

ListableUI/Sources/ListView/ListView.Delegate.swift

@@ -288,7 +288,7 @@ extension ListView
         }
 
         func listViewShouldEndQueueingEditsForReorder() {
-            self.view.updateQueue.isQueuingForReorderEvent = false
+            self.view.updateQueue.isQueuingToApplyReorderEvent = false
         }
 
         // MARK: UIScrollViewDelegate

ListableUI/Sources/ListView/ListView.swift

@@ -67,6 +67,8 @@ public final class ListView : UIView
 
         self.closeActiveSwipesGesture = TouchDownGestureRecognizer()
 
+        self.updateQueue = ListChangesQueue()
+
         // Super init.
 
         super.init(frame: frame)
@@ -91,6 +93,10 @@ public final class ListView : UIView
             self?.shouldRecognizeCloseSwipeTouch(touch) ?? false
         }
 
+        self.updateQueue.listHasUncommittedReorderUpdates = { [weak collectionView] in
+            collectionView?.hasUncommittedUpdates ?? false
+        }
+
         // Register supplementary views.
 
         SupplementaryKind.allCases.forEach {
@@ -846,7 +852,7 @@ public final class ListView : UIView
         self.configure(with: description)
     }
 
-    let updateQueue = ListChangesQueue()
+    let updateQueue : ListChangesQueue
 
     public func configure(with properties : ListProperties)
     {

ListableUI/Tests/ListView/ListChangesQueueTests.swift

@@ -16,7 +16,7 @@ class ListChangesQueueTests : XCTestCase {
         let queue = ListChangesQueue()
 
         XCTAssertFalse(queue.isPaused)
-        XCTAssertFalse(queue.isQueuingForReorderEvent)
+        XCTAssertFalse(queue.isQueuingToApplyReorderEvent)
 
         var calls : [Int] = []
 
@@ -35,10 +35,10 @@ class ListChangesQueueTests : XCTestCase {
         XCTAssertEqual(queue.count, 0)
         XCTAssertEqual(calls, [1, 2])
 
-        queue.isQueuingForReorderEvent = true
+        queue.isQueuingToApplyReorderEvent = true
 
         XCTAssertTrue(queue.isPaused)
-        XCTAssertTrue(queue.isQueuingForReorderEvent)
+        XCTAssertTrue(queue.isQueuingToApplyReorderEvent)
 
         queue.add {
             calls += [3]
@@ -57,10 +57,10 @@ class ListChangesQueueTests : XCTestCase {
         XCTAssertEqual(queue.count, 3)
         XCTAssertEqual(calls, [1, 2])
 
-        queue.isQueuingForReorderEvent = false
+        queue.isQueuingToApplyReorderEvent = false
 
         XCTAssertFalse(queue.isPaused)
-        XCTAssertFalse(queue.isQueuingForReorderEvent)
+        XCTAssertFalse(queue.isQueuingToApplyReorderEvent)
 
         waitFor {
             queue.isEmpty