Merge branch 'master' into xcode9.3

DeclarativeHub · Apr 14, 2018 · e730789 · e730789
2 parents aaf141a + 11c6657
commit e730789
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/Sources/Bond/UIKit/UICollectionView.swift b/Sources/Bond/UIKit/UICollectionView.swift
@@ -60,7 +60,11 @@
     /// A type used by the collection view bindings that provides binding options and actions.
     open class CollectionViewBinder<DataSource: DataSourceProtocol> {
 
-        open let createCell: (DataSource, IndexPath, UICollectionView) -> UICollectionViewCell
+        open let createCell: ((DataSource, IndexPath, UICollectionView) -> UICollectionViewCell)?
+
+        public init() {
+            createCell = nil
+        }
 
         /// - parameter createCell: A closure that creates cell for a given collection view and configures it with the given data source at the given index path.
         public init(_ createCell: @escaping (DataSource, IndexPath, UICollectionView) -> UICollectionViewCell) {
@@ -69,7 +73,11 @@
 
         /// - returns: A cell for the given collection view configured with the given data source at the given index path.
         open func cellForRow(at indexPath: IndexPath, collectionView: UICollectionView, dataSource: DataSource) -> UICollectionViewCell {
-            return createCell(dataSource, indexPath, collectionView)
+            if let createCell = createCell {
+                return createCell(dataSource, indexPath, collectionView)
+            } else {
+                fatalError("Subclass of CollectionViewBinder should override and implement cellForRow(at:collectionView:dataSource:) method. Do not call super.")
+            }
         }
     }
 

diff --git a/Sources/Bond/UIKit/UITableView.swift b/Sources/Bond/UIKit/UITableView.swift
@@ -63,7 +63,11 @@
 
         open var rowAnimation: UITableViewRowAnimation = .automatic
 
-        open let createCell: (DataSource, IndexPath, UITableView) -> UITableViewCell
+        open let createCell: ((DataSource, IndexPath, UITableView) -> UITableViewCell)?
+
+        public init() {
+            createCell = nil
+        }
 
         /// - parameter createCell: A closure that creates cell for a given table view and configures it with the given data source at the given index path.
         public init(_ createCell: @escaping (DataSource, IndexPath, UITableView) -> UITableViewCell) {
@@ -72,7 +76,11 @@
 
         /// - returns: A cell for the given table view configured with the given data source at the given index path.
         open func cellForRow(at indexPath: IndexPath, tableView: UITableView, dataSource: DataSource) -> UITableViewCell {
-            return createCell(dataSource, indexPath, tableView)
+            if let createCell = createCell {
+                return createCell(dataSource, indexPath, tableView)
+            } else {
+                fatalError("Subclass of TableViewBinder should override and implement cellForRow(at:tableView:dataSource:) method. Do not call super.")
+            }
         }
 
         /// Applies the given data source event to the table view.