Revert "Fix CollectionViewLayout delegate lifetime" (#612)

Reverts #611 Which was accidentally automerged

Author: RoyalPineapple

CHANGELOG.md

@@ -2,8 +2,6 @@
 
 ### Fixed
 
-- Fixed a crash in `CollectionViewLayout` when the delegate was deallocated before the layout. The delegate is now held weakly rather than unowned.
-
 ### Added
 
 ### Removed

ListableUI/Sources/Layout/CollectionViewLayout.swift

@@ -14,7 +14,7 @@ final class CollectionViewLayout : UICollectionViewLayout
     // MARK: Properties
     //
 
-    private(set) weak var delegate : CollectionViewLayoutDelegate?
+    unowned let delegate : CollectionViewLayoutDelegate
 
     var layoutDescription : LayoutDescription
 
@@ -221,10 +221,8 @@ final class CollectionViewLayout : UICollectionViewLayout
         /// processing any further updates 🥴.
         ///
 
-        let delegate = self.delegate
-
-        OperationQueue.main.addOperation { [weak delegate] in
-            delegate?.listViewShouldEndQueueingEditsForReorder()
+        OperationQueue.main.addOperation {
+            self.delegate.listViewShouldEndQueueingEditsForReorder()
         }
     }
 
@@ -392,10 +390,6 @@ final class CollectionViewLayout : UICollectionViewLayout
 
         self.changesDuringCurrentUpdate = UpdateItems(with: [])
 
-        guard let delegate = self.delegate else {
-            return
-        }
-
         let size = self.collectionView?.bounds.size ?? .zero
 
         self.neededLayoutType.update(with: {
@@ -408,18 +402,18 @@ final class CollectionViewLayout : UICollectionViewLayout
             case .none:
                 return true
             case .relayout:
-                self.performLayout(delegate: delegate)
+                self.performLayout()
             case .rebuild:
-                self.performRebuild(andLayout: shouldLayout, delegate: delegate)
+                self.performRebuild(andLayout: shouldLayout)
             }
 
             return true
         }())
 
-        self.performLayoutUpdate(delegate: delegate)
+        self.performLayoutUpdate()
 
         if self.isReordering == false {
-            delegate.listViewLayoutDidLayoutContents()
+            self.delegate.listViewLayoutDidLayoutContents()
         }
     }
 
@@ -445,15 +439,15 @@ final class CollectionViewLayout : UICollectionViewLayout
     // MARK: Performing Layouts
     //
 
-    private func performRebuild(andLayout layout : Bool, delegate : CollectionViewLayoutDelegate)
+    private func performRebuild(andLayout layout : Bool)
     {
         self.previousLayout = self.layout
 
         self.layout = self.layoutDescription.configuration.createPopulatedLayout(
             appearance: self.appearance,
             behavior: self.behavior,
             content: {
-                delegate.listLayoutContent(defaults: $0)
+                self.delegate.listLayoutContent(defaults: $0)
             }
         )
 
@@ -465,34 +459,34 @@ final class CollectionViewLayout : UICollectionViewLayout
         )
 
         if layout {
-            self.performLayout(delegate: delegate)
+            self.performLayout()
         }
     }
 
-    private func performLayout(delegate : CollectionViewLayoutDelegate)
+    private func performLayout()
     {
         let view = self.collectionView!
 
         let context = ListLayoutLayoutContext(
             collectionView: view,
-            environment: delegate.listViewLayoutCurrentEnvironment()
+            environment: self.delegate.listViewLayoutCurrentEnvironment()
         )
 
         self.layout.performLayout(
-            with: delegate,
+            with: self.delegate,
             in: context
         )
 
         self.viewProperties = CollectionViewLayoutProperties(collectionView: view)
     }
 
-    private func performLayoutUpdate(delegate : CollectionViewLayoutDelegate)
+    private func performLayoutUpdate()
     {
         let view = self.collectionView!
 
         let context = ListLayoutLayoutContext(
             collectionView: view,
-            environment: delegate.listViewLayoutCurrentEnvironment()
+            environment: self.delegate.listViewLayoutCurrentEnvironment()
         )
 
         self.layout.positionStickyListHeaderIfNeeded(in: context)

ListableUI/Sources/ListView/ListView.LayoutManager.swift

@@ -45,12 +45,8 @@ extension ListView
                     self.collectionViewLayout.setNeedsRebuild(animated: animated)
                 }
             } else {
-                guard let delegate = self.collectionViewLayout.delegate else {
-                    listableInternalFatal("Cannot swap layout when the previous layout's delegate has been deallocated.")
-                }
-
                 self.collectionViewLayout = CollectionViewLayout(
-                    delegate: delegate,
+                    delegate: self.collectionViewLayout.delegate,
                     layoutDescription: layout,
                     appearance: self.collectionViewLayout.appearance,
                     behavior: self.collectionViewLayout.behavior