Merge pull request #12 from kiva/compositional-layout

Support UICollectionViewCompositionalLayout
kean · Apr 3, 2021 · 23949ee · 23949ee
2 parents 1f960f9 + 9dba2c6
commit 23949ee
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Sources/Controller.swift b/Sources/Controller.swift
@@ -138,10 +138,19 @@ public protocol Preheated {
 
 extension UICollectionView: Preheated {
     public var orientation: ScrollOrientation {
-        switch (collectionViewLayout as! UICollectionViewFlowLayout).scrollDirection {
-        case .vertical: return .vertical
-        case .horizontal: return .horizontal
+        if let layout = collectionViewLayout as? UICollectionViewFlowLayout {
+            switch layout.scrollDirection {
+            case .vertical: return .vertical
+            case .horizontal: return .horizontal
+            }
+        } else if #available(iOS 13.0, tvOS 13.0, *), let layout = collectionViewLayout as? UICollectionViewCompositionalLayout {
+            switch layout.configuration.scrollDirection {
+            case .vertical: return .vertical
+            case .horizontal: return .horizontal
+            }
         }
+
+        preconditionFailure("Unknown collection view scroll orientation")
     }
 
     public func indexPaths(in rect: CGRect) -> [IndexPath] {