ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASCollectionNode/ASTableNode] Fix a crash occurs while remeasuring cell nodes (#917)

Browse Source
This commit is contained in:
Huy Nguyen
2018-05-15 20:18:54 +01:00
committed by GitHub
parent 970ebd987e
commit 0830f6cf23
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/ASTableView.mm
View File

@@ -199,7 +199,6 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
// CountedSet because UIKit may display the same element in multiple cells e.g. during animations.
NSCountedSet<ASCollectionElement *> *_visibleElements;
BOOL _remeasuringCellNodes;
NSHashTable<ASCellNode *> *_cellsForLayoutUpdates;
// See documentation on same property in ASCollectionView
@@ -745,26 +744,27 @@ static NSString * const kCellReuseIdentifier = @"_ASTableViewCell";
- (void)layoutSubviews
{
// Remeasure all rows if our row width has changed.
_remeasuringCellNodes = YES;
UIEdgeInsets contentInset = self.contentInset;
CGFloat constrainedWidth = self.bounds.size.width - [self sectionIndexWidth] - contentInset.left - contentInset.right;
if (constrainedWidth > 0 && _nodesConstrainedWidth != constrainedWidth) {
_nodesConstrainedWidth = constrainedWidth;
[_cellsForLayoutUpdates removeAllObjects];
[self beginUpdates];
[_dataController relayoutAllNodesWithInvalidationBlock:nil];
[self endUpdatesAnimated:(ASDisplayNodeLayerHasAnimations(self.layer) == NO) completion:nil];
} else {
if (_cellsForLayoutUpdates.count > 0) {
NSMutableArray *nodesSizesChanged = [NSMutableArray array];
[_dataController relayoutNodes:_cellsForLayoutUpdates nodesSizeChanged:nodesSizesChanged];
if (nodesSizesChanged.count > 0) {
NSArray<ASCellNode *> *nodes = [_cellsForLayoutUpdates allObjects];
[_cellsForLayoutUpdates removeAllObjects];
NSMutableArray<ASCellNode *> *nodesSizeChanged = [NSMutableArray array];
[_dataController relayoutNodes:nodes nodesSizeChanged:nodesSizeChanged];
if (nodesSizeChanged.count > 0) {
[self requeryNodeHeights];
}
}
}
[_cellsForLayoutUpdates removeAllObjects];
_remeasuringCellNodes = NO;
// To ensure _nodesConstrainedWidth is up-to-date for every usage, this call to super must be done last
[super layoutSubviews];