Merge 39059d4 into 6f92873

grigaci · Nov 25, 2015 · 02f88d8 · 02f88d8
2 parents 6f92873 + 39059d4
commit 02f88d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/BIObjCHelpers/Datasource/CollectionView/BIDatasourceCollectionView.h b/BIObjCHelpers/Datasource/CollectionView/BIDatasourceCollectionView.h
@@ -22,6 +22,7 @@ typedef void(^BIDatasourceCollectionViewConfigureCell)(id __nonnull cell, NSInde
 @property (nonatomic, readonly, strong, nonnull) UICollectionView *collectionView;
 @property (nonatomic, copy, nullable) NSString *cellIdentifier;
 @property (nonatomic, strong, nullable) Class cellClass;
+@property (nonatomic, strong, nullable) UINib *cellNib;
 @property (nonatomic, copy, nullable) BIDatasourceCollectionViewConfigureCell configureCellBlock;
 
 - (void)configureCell:(nonnull UICollectionViewCell *)cell atIndexPath:(nonnull NSIndexPath *)indexPath;

diff --git a/BIObjCHelpers/Datasource/CollectionView/BIDatasourceCollectionView.m b/BIObjCHelpers/Datasource/CollectionView/BIDatasourceCollectionView.m
@@ -60,7 +60,11 @@ - (void)load {
     NSParameterAssert(self.cellIdentifier.length);
     NSParameterAssert([self.cellClass isSubclassOfClass:[UICollectionViewCell class]]);
 
-    [self.collectionView registerClass:self.cellClass forCellWithReuseIdentifier:self.cellIdentifier];
+    if (self.cellNib) {
+        [self.collectionView registerNib:self.cellNib forCellWithReuseIdentifier:self.cellIdentifier];
+    } else if (self.cellClass) {
+        [self.collectionView registerClass:self.cellClass forCellWithReuseIdentifier:self.cellIdentifier];
+    }
 }
 
 - (void)configureCell:(UICollectionViewCell *)cell atIndexPath:(NSIndexPath *)indexPath {