Added UITextField model and provider. Fixed header provider for collection.

Author: ivanvorobei

Sources/SPDiffable/Collection/DataSource/AppleCollectionDiffableDataSource.swift

@@ -32,7 +32,7 @@ class AppleCollectionDiffableDataSource: UICollectionViewDiffableDataSource<SPDi
         headerFooterProvider: SupplementaryViewProvider?
     ) {
         super.init(collectionView: collectionView, cellProvider: cellProvider)
-        self.supplementaryViewProvider = supplementaryViewProvider
+        self.supplementaryViewProvider = headerFooterProvider
     }
 
     // MARK: - Wrappers

Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource+HeaderFooterProvider.swift

@@ -32,7 +32,7 @@ extension SPDiffableCollectionDataSource {
             self.clouser = clouser
         }
 
-        public typealias Clouser = (_ collectionView: UICollectionView, _ section: Int, _ item: SPDiffableItem) -> UICollectionReusableView?
+        public typealias Clouser = (_ collectionView: UICollectionView, _ kind: String, _ indexPath: IndexPath, _ item: SPDiffableItem) -> UICollectionReusableView?
     }
 }
 

Sources/SPDiffable/Collection/DataSource/SPDiffableCollectionDataSource.swift

@@ -36,7 +36,7 @@ open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterfa
         collectionView: UICollectionView,
         cellProviders: [CellProvider],
         headerFooterProviders: [HeaderFooterProvider],
-        headerAsFirstCell: Bool = true
+        headerAsFirstCell: Bool
     ) {
         self.headerAsFirstCell = headerAsFirstCell
         self.collectionView = collectionView
@@ -71,12 +71,12 @@ open class SPDiffableCollectionDataSource: NSObject, SPDiffableDataSourceInterfa
                     switch elementKind {
                     case UICollectionView.elementKindSectionHeader:
                         guard let headerItem = section.header else { continue }
-                        if let view = provider.clouser(collectionView, sectionIndex, headerItem) {
+                        if let view = provider.clouser(collectionView, elementKind, indexPath, headerItem) {
                             return view
                         }
                     case UICollectionView.elementKindSectionFooter:
                         guard let footerItem = section.footer else { continue }
-                        if let view = provider.clouser(collectionView, sectionIndex, footerItem) {
+                        if let view = provider.clouser(collectionView, elementKind, indexPath, footerItem) {
                             return view
                         }
                     default:

Sources/SPDiffable/Collection/SPDiffableCollectionController.swift

@@ -38,12 +38,14 @@ open class SPDiffableCollectionController: UICollectionViewController {
     open func configureDiffable(
         sections: [SPDiffableSection],
         cellProviders: [SPDiffableCollectionDataSource.CellProvider],
-        headerFooterProviders: [SPDiffableCollectionDataSource.HeaderFooterProvider] = []
+        headerFooterProviders: [SPDiffableCollectionDataSource.HeaderFooterProvider] = [],
+        headerAsFirstCell: Bool
     ) {
         diffableDataSource = SPDiffableCollectionDataSource(
             collectionView: collectionView,
             cellProviders: cellProviders,
-            headerFooterProviders: headerFooterProviders
+            headerFooterProviders: headerFooterProviders,
+            headerAsFirstCell: headerAsFirstCell
         )
         diffableDataSource?.set(sections, animated: false)
     }

Sources/SPDiffable/Collection/SPDiffableCollectionView.swift

@@ -48,12 +48,14 @@ open class SPDiffableCollectionView: UICollectionView, UICollectionViewDelegate
     open func configureDiffable(
         sections: [SPDiffableSection],
         cellProviders: [SPDiffableCollectionDataSource.CellProvider],
-        headerFooterProviders: [SPDiffableCollectionDataSource.HeaderFooterProvider] = []
+        headerFooterProviders: [SPDiffableCollectionDataSource.HeaderFooterProvider] = [],
+        headerAsFirstCell: Bool
     ) {
         diffableDataSource = SPDiffableCollectionDataSource(
             collectionView: self,
             cellProviders: cellProviders,
-            headerFooterProviders: headerFooterProviders
+            headerFooterProviders: headerFooterProviders,
+            headerAsFirstCell: headerAsFirstCell
         )
         diffableDataSource?.set(sections, animated: false)
     }

Sources/SPDiffable/Table/DataSource/SPDiffableTableDataSource+CellProvider.swift

@@ -124,6 +124,7 @@ extension SPDiffableTableDataSource {
                 cell.textField.keyboardType = item.keyboardType
                 cell.textField.autocapitalizationType = item.autocapitalizationType
                 cell.textField.delegate = item.delegate
+                cell.textField.clearButtonMode = item.clearButtonMode
                 cell.accessoryView = .none
                 cell.selectionStyle = .none
                 return cell

Sources/SPDiffable/Table/Models/SPDiffableTableRowTextField.swift

@@ -28,6 +28,7 @@ open class SPDiffableTableRowTextField: SPDiffableItem {
     open var autocorrectionType: UITextAutocorrectionType
     open var keyboardType: UIKeyboardType
     open var autocapitalizationType: UITextAutocapitalizationType
+    open var clearButtonMode: UITextField.ViewMode
     open weak var delegate: UITextFieldDelegate?
 
     public init(
@@ -37,6 +38,7 @@ open class SPDiffableTableRowTextField: SPDiffableItem {
         autocorrectionType: UITextAutocorrectionType,
         keyboardType: UIKeyboardType,
         autocapitalizationType: UITextAutocapitalizationType,
+        clearButtonMode: UITextField.ViewMode,
         delegate: UITextFieldDelegate?
     ) {
         self.text = text
@@ -45,6 +47,7 @@ open class SPDiffableTableRowTextField: SPDiffableItem {
         self.autocorrectionType = autocorrectionType
         self.keyboardType = keyboardType
         self.autocapitalizationType = autocapitalizationType
+        self.clearButtonMode = clearButtonMode
         super.init(id: id)
     }
 }