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

Sort in ascending order before removing nodes and restore FIXME

Browse Source
This commit is contained in:
Michael Schneider
2016-06-01 18:23:52 -07:00
parent 6566b7adb7
commit 6945555d60
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKit/Details/ASDataController.mm
View File

@@ -816,9 +816,8 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
[_editingTransactionQueue waitUntilAllOperationsAreFinished]; [_editingTransactionQueue waitUntilAllOperationsAreFinished];
// Sort indexPath in order to avoid messing up the index when deleting in several batches. // Sort indexPath in order to avoid messing up the index when deleting in several batches.
// When you delete at an index, you invalidate all subsequent indices, and we never want to use an invalid index // FIXME: Shouldn't deletes be sorted in descending order?
// in a later delete so we should have the sorted index path's array in descendent order NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(asdk_inverseCompare:)];
[_editingTransactionQueue addOperationWithBlock:^{ [_editingTransactionQueue addOperationWithBlock:^{
LOG(@"Edit Transaction - deleteRows: %@", indexPaths); LOG(@"Edit Transaction - deleteRows: %@", indexPaths);
@@ -840,6 +839,7 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
NSMutableArray<ASIndexedNodeContext *> *contexts = [[NSMutableArray alloc] initWithCapacity:indexPaths.count]; NSMutableArray<ASIndexedNodeContext *> *contexts = [[NSMutableArray alloc] initWithCapacity:indexPaths.count];
// Sort indexPath to avoid messing up the index when deleting // Sort indexPath to avoid messing up the index when deleting
// FIXME: Shouldn't deletes be sorted in descending order?
NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)]; NSArray *sortedIndexPaths = [indexPaths sortedArrayUsingSelector:@selector(compare:)];
id<ASEnvironment> environment = [self.environmentDelegate dataControllerEnvironment]; id<ASEnvironment> environment = [self.environmentDelegate dataControllerEnvironment];
@@ -854,13 +854,9 @@ static void *kASSizingQueueContext = &kASSizingQueueContext;
environmentTraitCollection:environmentTraitCollection]]; environmentTraitCollection:environmentTraitCollection]];
} }
// When you delete at an index, you invalidate all subsequent indices, and we never want to use an invalid
// index in a later delete so we should have the sorted index path's array in descendent order
NSArray *reverseSortedIndexPaths = [[sortedIndexPaths reverseObjectEnumerator] allObjects];
[_editingTransactionQueue addOperationWithBlock:^{ [_editingTransactionQueue addOperationWithBlock:^{
LOG(@"Edit Transaction - reloadRows: %@", indexPaths); LOG(@"Edit Transaction - reloadRows: %@", indexPaths);
[self _deleteNodesAtIndexPaths:reverseSortedIndexPaths withAnimationOptions:animationOptions]; [self _deleteNodesAtIndexPaths:sortedIndexPaths withAnimationOptions:animationOptions];
[self _batchLayoutNodesFromContexts:contexts withAnimationOptions:animationOptions]; [self _batchLayoutNodesFromContexts:contexts withAnimationOptions:animationOptions];
}]; }];
}]; }];