Merge pull request #13 from michzio/improve-collection-view-sections

Improve supplementary views for sections
michzio · Sep 17, 2022 · d36c34d · d36c34d
2 parents 4c960ab + 85ee659
commit d36c34d
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 24 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - SwiftUICollectionView (0.0.7)
+  - SwiftUICollectionView (0.0.9)
 
 DEPENDENCIES:
   - SwiftUICollectionView (from `../SwiftUICollectionView`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../SwiftUICollectionView"
 
 SPEC CHECKSUMS:
-  SwiftUICollectionView: 7f9a87f1d369c2d769a93a551f073659e583016f
+  SwiftUICollectionView: 2a75c88b8b431e7b4c50411107e025479ba7b456
 
 PODFILE CHECKSUM: 9a1452a7a2e894f254370980293834ce1f7f2aa1
 

diff --git a/Example/Pods/Local Podspecs/SwiftUICollectionView.podspec.json b/Example/Pods/Local Podspecs/SwiftUICollectionView.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Target Support Files/SwiftUICollectionView/SwiftUICollectionView-Info.plist b/Example/Pods/Target Support Files/SwiftUICollectionView/SwiftUICollectionView-Info.plist
diff --git a/...llectionViewApp.xcworkspace/xcuserdata/michzio.xcuserdatad/UserInterfaceState.xcuserstate b/...llectionViewApp.xcworkspace/xcuserdata/michzio.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/SwiftUICollectionViewApp/ContentView.swift b/Example/SwiftUICollectionViewApp/ContentView.swift
@@ -24,15 +24,17 @@ struct ContentView: View {
                     .categories : Item.categoryItems
                 ],
                 supplementaryKinds: [UICollectionView.elementKindSectionHeader, UICollectionView.elementKindSectionFooter],
-                supplementaryContent: { kind, indexPath, item in
-                    switch kind {
-                    case UICollectionView.elementKindSectionHeader:
-                        return AnyView(Text("Header").font(.system(size: indexPath.section == 0 ? 30 : 16)))
-                    case UICollectionView.elementKindSectionFooter:
-                        return AnyView(Text("Footer"))
-                    default:
-                        return AnyView(EmptyView())
-                    }
+                supplementaryContent: { kind, indexPath, section, item in
+                    AnyView(Group {
+                        switch kind {
+                        case UICollectionView.elementKindSectionHeader:
+                            Text("Header").font(.system(size: indexPath.section == 0 ? 30 : 16))
+                        case UICollectionView.elementKindSectionFooter:
+                            Text("Footer")
+                        default:
+                            EmptyView()
+                        }
+                    })
                 },
             content: { indexPath, item in
                 let section = sections[indexPath.section]

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ dependencies: [
                     .categories : Item.categoryItems
                 ],
                 supplementaryKinds: [UICollectionView.elementKindSectionHeader, UICollectionView.elementKindSectionFooter],
-                supplementaryContent: { kind, indexPath, item in
+                supplementaryContent: { kind, indexPath, section, item in
                     switch kind {
                     case UICollectionView.elementKindSectionHeader:
                         return AnyView(Text("Header").font(.system(size: indexPath.section == 0 ? 30 : 16)))

diff --git a/SwiftUICollectionView/SwiftUICollectionView.podspec b/SwiftUICollectionView/SwiftUICollectionView.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name = "SwiftUICollectionView"
-  s.version = "0.0.9"
+  s.version = "0.1.0"
   s.summary = "SwiftUI representable of UIKit CollectionView that supports compositional layout."
 
   s.swift_version = '5.6'

diff --git a/SwiftUICollectionView/SwiftUICollectionView/CollectionView.swift b/SwiftUICollectionView/SwiftUICollectionView/CollectionView.swift
@@ -21,7 +21,7 @@ public struct CollectionView<Section: Hashable, Item: Hashable>: UIViewControlle
 
     // MARK: - Actions
     private let content: (_ indexPath: IndexPath, _ item: Item) -> AnyView
-    private let supplementaryContent: ((_ kind: String, _ indexPath: IndexPath, _ item: Item?) -> AnyView)?
+    private let supplementaryContent: ((_ kind: String, _ indexPath: IndexPath, _ section: Section?, _ item: Item?) -> AnyView)?
 
     private let snapshotProvider:(() -> NSDiffableDataSourceSnapshot<Section, Item>)?
     private let selectionAction: ((_ collectionView: UICollectionView, _ item: Item, _ indexPath: IndexPath) -> Void)?
@@ -35,7 +35,7 @@ public struct CollectionView<Section: Hashable, Item: Hashable>: UIViewControlle
         snapshotProvider: (() -> NSDiffableDataSourceSnapshot<Section, Item>)? = nil,
         selectedItem: Binding<Item?>? = nil,
         selectionAction: ((_ collectionView: UICollectionView, _ item: Item, _ indexPath: IndexPath) -> Void)? = nil,
-        supplementaryContent: ((_ kind: String, _ IndexPath: IndexPath, _ item: Item?) -> AnyView)? = nil,
+        @ViewBuilder supplementaryContent: @escaping (_ kind: String, _ IndexPath: IndexPath, _ section: Section?, _ item: Item?) -> AnyView,
         @ViewBuilder content:  @escaping (_ indexPath: IndexPath, _ item: Item) -> AnyView
     ) {
         self.layout = layout
@@ -53,6 +53,31 @@ public struct CollectionView<Section: Hashable, Item: Hashable>: UIViewControlle
         self.content = content
     }
 
+    public init(
+        layout: UICollectionViewLayout,
+        sections: [Section],
+        items: [Section: [Item]],
+        animateChanges: Bool? = nil,
+        snapshotProvider: (() -> NSDiffableDataSourceSnapshot<Section, Item>)? = nil,
+        selectedItem: Binding<Item?>? = nil,
+        selectionAction: ((_ collectionView: UICollectionView, _ item: Item, _ indexPath: IndexPath) -> Void)? = nil,
+        @ViewBuilder content:  @escaping (_ indexPath: IndexPath, _ item: Item) -> AnyView
+    ) {
+        self.layout = layout
+
+        self.sections = sections
+        self.items = items
+        self.snapshotProvider = snapshotProvider
+        self.selectionAction = selectionAction
+        self.animateChanges = animateChanges
+        self.selectedItem = selectedItem
+
+        self.supplementaryKinds = []
+        self.supplementaryContent = nil
+
+        self.content = content
+    }
+
     public func makeCoordinator() -> Coordinator {
         Coordinator(self)
     }

diff --git a/SwiftUICollectionView/SwiftUICollectionView/UIKit/CollectionViewController.swift b/SwiftUICollectionView/SwiftUICollectionView/UIKit/CollectionViewController.swift
@@ -16,7 +16,7 @@ public class CollectionViewController<Section, Item>: UIViewController, UICollec
     var snapshot: NSDiffableDataSourceSnapshot<Section, Item>!
 
     var supplementaryKinds: [String] = []
-    var supplementaryContent: ((_ kind: String, _ indexPath: IndexPath, _ item: Item?) -> AnyView)?
+    var supplementaryContent: ((_ kind: String, _ indexPath: IndexPath, _ section: Section?, _ item: Item?) -> AnyView)?
     var content: ((_ indexPath: IndexPath, _ item: Item) -> AnyView)!
 
     var onSelectItem: ((_ collectionView: UICollectionView, _ item: Item, _ indexPath: IndexPath) -> Void)?
@@ -157,9 +157,16 @@ extension CollectionViewController {
             fatalError("Could not load supplementary view")
         }
 
+        let section: Section?
+        if #available(iOS 15.0, *) {
+            section = dataSource.sectionIdentifier(for: indexPath.section)
+        } else {
+            section = nil
+        }
+
         let item = dataSource.itemIdentifier(for: indexPath)
 
-        guard let content = supplementaryContent?(kind, indexPath, item) else {
+        guard let content = supplementaryContent?(kind, indexPath, section, item) else {
             fatalError("Supplementary view content not provided for kind: \(kind), indexPath: \(indexPath). Please provide supplementaryContent closure parameter to CollectionView returning some View and provide kind in supplementaryKinds array parameter. Or remove this kind: \(kind) from layout definition.")
         }