diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm index a139bdecec..a94369fe35 100644 --- a/AsyncDisplayKit/ASCollectionView.mm +++ b/AsyncDisplayKit/ASCollectionView.mm @@ -22,6 +22,7 @@ static const NSUInteger kASCollectionViewAnimationNone = UITableViewRowAnimationNone; static const ASSizeRange kInvalidSizeRange = {CGSizeZero, CGSizeZero}; +static NSString * const reuseIdentifier = @"_ASCollectionViewCell"; #pragma mark - #pragma mark Proxying. @@ -245,7 +246,7 @@ static BOOL _isInterceptedSelector(SEL sel) self.backgroundColor = [UIColor whiteColor]; - [self registerClass:[_ASCollectionViewCell class] forCellWithReuseIdentifier:@"_ASCollectionViewCell"]; + [self registerClass:[_ASCollectionViewCell class] forCellWithReuseIdentifier:reuseIdentifier]; return self; } @@ -483,8 +484,6 @@ static BOOL _isInterceptedSelector(SEL sel) - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - static NSString *reuseIdentifier = @"_ASCollectionViewCell"; - _ASCollectionViewCell *cell = [self dequeueReusableCellWithReuseIdentifier:reuseIdentifier forIndexPath:indexPath]; ASCellNode *node = [_dataController nodeAtIndexPath:indexPath]; diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm index 7354bdcf55..5b4fa828dc 100644 --- a/AsyncDisplayKit/ASTableView.mm +++ b/AsyncDisplayKit/ASTableView.mm @@ -21,6 +21,8 @@ // FIXME: Temporary nonsense import until method names are finalized and exposed #import "ASDisplayNode+Subclasses.h" +static NSString * const reuseIdentifier = @"_ASCollectionViewCell"; + //#define LOG(...) NSLog(__VA_ARGS__) #define LOG(...) @@ -223,6 +225,8 @@ static BOOL _isInterceptedSelector(SEL sel) // If the initial size is 0, expect a size change very soon which is part of the initial configuration // and should not trigger a relayout. _ignoreNodesConstrainedWidthChange = (_nodesConstrainedWidth == 0); + + [self registerClass:_ASTableViewCell.class forCellReuseIdentifier:reuseIdentifier]; } - (instancetype)initWithFrame:(CGRect)frame style:(UITableViewStyle)style @@ -528,13 +532,8 @@ static BOOL _isInterceptedSelector(SEL sel) - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - static NSString *reuseIdentifier = @"_ASTableViewCell"; - - _ASTableViewCell *cell = [self dequeueReusableCellWithIdentifier:reuseIdentifier]; - if (!cell) { - cell = [[_ASTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier]; - cell.delegate = self; - } + _ASTableViewCell *cell = [self dequeueReusableCellWithIdentifier:reuseIdentifier forIndexPath:indexPath]; + cell.delegate = self; ASCellNode *node = [_dataController nodeAtIndexPath:indexPath]; [_rangeController configureContentView:cell.contentView forCellNode:node];