ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-14 02:10:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1219 from binl/bl_reloads_indexPaths_in_changeSet

Browse Source 
[ASDataController] Adjust index paths for reloads contained in the same changeset as deletes / inserts.
This commit is contained in:
appleguy 2016-02-11 17:48:30 -08:00
commit 3a86a9d99e
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsyncDisplayKit/Private/_ASHierarchyChangeSet.h
View File

@ -30,8 +30,10 @@ typedef NS_ENUM(NSInteger, _ASHierarchyChangeType) {
@property (nonatomic, readonly) ASDataControllerAnimationOptions animationOptions; @property (nonatomic, readonly) ASDataControllerAnimationOptions animationOptions;
/// Index paths are sorted descending for changeType .Delete, ascending otherwise /// Index paths are sorted descending for changeType .Delete, ascending otherwise
@property (nonatomic, strong, readonly) NSArray *indexPaths; @property (nonatomic, strong) NSArray *indexPaths;
@property (nonatomic, readonly) _ASHierarchyChangeType changeType; @property (nonatomic, readonly) _ASHierarchyChangeType changeType;
+ (NSDictionary *)sectionToIndexSetMapFromChanges:(NSArray *)changes ofType:(_ASHierarchyChangeType)changeType;
@end @end
@interface _ASHierarchyChangeSet : NSObject @interface _ASHierarchyChangeSet : NSObject

54
AsyncDisplayKit/Private/_ASHierarchyChangeSet.m
View File

@ -198,9 +198,41 @@
// Ignore item inserts in reloaded(new)/inserted sections. // Ignore item inserts in reloaded(new)/inserted sections.
[_ASHierarchyItemChange sortAndCoalesceChanges:_insertItemChanges ignoringChangesInSections:insertedOrReloaded]; [_ASHierarchyItemChange sortAndCoalesceChanges:_insertItemChanges ignoringChangesInSections:insertedOrReloaded];
// reload itemsChanges need to be adjusted so that we access the correct indexPaths in the datasource
NSDictionary *insertedIndexPathsMap = [_ASHierarchyItemChange sectionToIndexSetMapFromChanges:_insertItemChanges ofType:_ASHierarchyChangeTypeInsert];
NSDictionary *deletedIndexPathsMap = [_ASHierarchyItemChange sectionToIndexSetMapFromChanges:_deleteItemChanges ofType:_ASHierarchyChangeTypeDelete];
for (_ASHierarchyItemChange *change in _reloadItemChanges) {
NSAssert(change.changeType == _ASHierarchyChangeTypeReload, @"It must be a reload change to be in here");
NSMutableArray *newIndexPaths = [NSMutableArray array];
// Every indexPaths in the change need to update its section and/or row
// depending on all the deletions and insertions
for (NSIndexPath *indexPath in change.indexPaths) {
NSUInteger section = indexPath.section;
NSUInteger row = indexPath.row;
section -= [_deletedSections countOfIndexesInRange:NSMakeRange(0, section)];
section += [_insertedSections countOfIndexesInRange:NSMakeRange(0, section)];
NSIndexSet *indicesInsertedInSection = insertedIndexPathsMap[@(section).stringValue];
row += [indicesInsertedInSection countOfIndexesInRange:NSMakeRange(0, row)];
NSIndexSet *indicesDeletedInSection = deletedIndexPathsMap[@(section).stringValue];
row += [indicesDeletedInSection countOfIndexesInRange:NSMakeRange(0, row)];
//TODO: reuse the old indexPath object if section and row aren't changed
NSIndexPath *newIndexPath = [NSIndexPath indexPathForRow:row inSection:section];
[newIndexPaths addObject:newIndexPath];
}
change.indexPaths = newIndexPaths;
}
} }
} }
@end @end
@implementation _ASHierarchySectionChange @implementation _ASHierarchySectionChange
@ -301,6 +333,28 @@
return self; return self;
} }
// Create a mapping out of changes indexPaths to a {@section : [indexSet]} fashion
// e.g. changes: (0 - 0), (0 - 1), (2 - 5)
// will become: {@0 : [0, 1], @2 : [5]}
+ (NSDictionary *)sectionToIndexSetMapFromChanges:(NSArray *)changes ofType:(_ASHierarchyChangeType)changeType
{
NSMutableDictionary *sectionToIndexSetMap = [NSMutableDictionary dictionary];
for (_ASHierarchyItemChange *change in changes) {
NSAssert(change.changeType == changeType, @"The map we created must all be of the same changeType as of now");
for (NSIndexPath *indexPath in change.indexPaths) {
NSString *sectionKey = @(indexPath.section).stringValue;
NSMutableIndexSet *indexSet = sectionToIndexSetMap[sectionKey];
if (indexSet) {
[indexSet addIndex:indexPath.row];
} else {
indexSet = [NSMutableIndexSet indexSetWithIndex:indexPath.row];
sectionToIndexSetMap[sectionKey] = indexSet;
}
}
}
return sectionToIndexSetMap;
}
+ (void)sortAndCoalesceChanges:(NSMutableArray *)changes ignoringChangesInSections:(NSIndexSet *)sections + (void)sortAndCoalesceChanges:(NSMutableArray *)changes ignoringChangesInSections:(NSIndexSet *)sections
{ {
if (changes.count < 1) { if (changes.count < 1) {