fixes on collection views

Author: rafiki270

Presentables/Classes/Collection views/PresentableCollectionViewDataManager.swift

@@ -10,6 +10,7 @@ import Foundation
 
 open class PresentableCollectionViewDataManager: NSObject, PresentableManager, UICollectionViewDataSource, UICollectionViewDelegate {
 
+    // TODO: Can we remove this?
     public var needsReloadData: (()->())?
     public var sizeForHeaderInSection: ((_ section: Int)->(CGSize))?
     public var sizeForFooterInSection: ((_ section: Int)->(CGSize))?
@@ -33,6 +34,7 @@ open class PresentableCollectionViewDataManager: NSObject, PresentableManager, U
     // MARK: Actions
 
     public func reloadData() {
+        collectionView?.collectionViewLayout.invalidateLayout()
         collectionView?.reloadData()
     }
 
@@ -68,38 +70,44 @@ open class PresentableCollectionViewDataManager: NSObject, PresentableManager, U
                 fatalError()
             }
             let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: presentable.identifier, for: indexPath)
+            presentable.runConfigure(with: view)
             return view
         }
         else {
             guard let presentable: AnyPresentable = data.footer(forSection: indexPath.section) else {
                 fatalError()
             }
             let view = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: presentable.identifier, for: indexPath)
+            presentable.runConfigure(with: view)
             return view
         }
     }
 
+    // MARK: Delegate
+    
+    open func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        let presentable: AnyPresentable = data.presentable(forIndexPath: indexPath)
+        presentable.selected?()
+        selectedItem?((presentable: presentable, indexPath: indexPath, collectionView: collectionView))
+    }
+    
+}
+
+
+extension PresentableCollectionViewDataManager: UICollectionViewDelegateFlowLayout {
+    
     open func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
         guard let _ = data.header(forSection: section) else {
             return CGSize.zero
         }
         return sizeForHeaderInSection?(section) ?? CGSize(width: collectionView.frame.width, height: 44)
     }
-
+    
     open func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
         guard let _ = data.footer(forSection: section) else {
             return CGSize.zero
         }
         return sizeForFooterInSection?(section) ?? CGSize(width: collectionView.frame.width, height: 44)
     }
-    
-    
-    // MARK: Delegate
-    
-    open func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let presentable: AnyPresentable = data.presentable(forIndexPath: indexPath)
-        presentable.selected?()
-        selectedItem?((presentable: presentable, indexPath: indexPath, collectionView: collectionView))
-    }
-    
+
 }

Presentables/Classes/Collection views/Presentables+UICollectionView.swift

@@ -21,6 +21,7 @@ extension UICollectionView: PresentableCollectionElement {
 
     func safeReloadData() {
         DispatchQueue.main.async {
+            self.collectionViewLayout.invalidateLayout()
             self.reloadData()
         }
     }

Presentables/Classes/Collection views/UICollectionView+Presentables.swift

@@ -16,4 +16,14 @@ extension UICollectionView {
         register(cellClass, forCellWithReuseIdentifier: identifier)
     }
 
+    open func register<T>(header viewClass: T.Type) where T: UICollectionReusableView {
+        let identifier = String(describing: T.self)
+        register(viewClass, forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, withReuseIdentifier: identifier)
+    }
+    
+    open func register<T>(footer viewClass: T.Type) where T: UICollectionReusableView {
+        let identifier = String(describing: T.self)
+        register(viewClass, forSupplementaryViewOfKind: UICollectionElementKindSectionFooter, withReuseIdentifier: identifier)
+    }
+    
 }