Fix crash in prepare() because isReordering is set even during scroll…

… invalidations.
square · Jul 27, 2021 · 49056c0 · 49056c0
1 parent 1a71aa9
commit 49056c0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/ListableUI/Sources/Layout/CollectionViewLayout.swift b/ListableUI/Sources/Layout/CollectionViewLayout.swift
@@ -162,9 +162,7 @@ final class CollectionViewLayout : UICollectionViewLayout
         let context = context as! InvalidationContext
 
         // Handle Moved Items
-
-        self.isReordering = context.interactiveMoveAction != nil
-
+
         if let action = context.interactiveMoveAction {
 
             switch action {
@@ -229,6 +227,8 @@ final class CollectionViewLayout : UICollectionViewLayout
         previousPosition: CGPoint
     ) -> UICollectionViewLayoutInvalidationContext
     {
+        self.isReordering = true
+
         let context = super.invalidationContext(
             forInteractivelyMovingItems: targetIndexPaths,
             withTargetPosition: targetPosition,
@@ -254,6 +254,8 @@ final class CollectionViewLayout : UICollectionViewLayout
         movementCancelled: Bool
     ) -> UICollectionViewLayoutInvalidationContext
     {
+        self.isReordering = false
+
         let context = super.invalidationContextForEndingInteractiveMovementOfItems(
             toFinalIndexPaths: indexPaths,
             previousIndexPaths: previousIndexPaths,
@@ -392,8 +394,12 @@ final class CollectionViewLayout : UICollectionViewLayout
 
             switch self.neededLayoutType {
             case .none: return true
-            case .relayout: self.performLayout()
-            case .rebuild: self.performRebuild(andLayout: shouldLayout)
+            case .relayout:
+                print("prepare: relayout")
+                self.performLayout()
+            case .rebuild:
+                print("prepare: rebuild")
+                self.performRebuild(andLayout: shouldLayout)
             }
 
             return true