Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ASDataController] Fix a crash in table view caused by executing an empty change set during layoutSubviews #416

Merged
merged 2 commits into from
Jul 5, 2017
Merged

[ASDataController] Fix a crash in table view caused by executing an empty change set during layoutSubviews #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35adc49
Fix a crash in table view caused by executing an empty change set dur…
nguyenhuy Jul 4, 2017
4da9659
Update CHANGELOG
nguyenhuy Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
##2.3.5
- Fix an issue where inserting/deleting sections could lead to inconsistent supplementary element behavior. [Adlai Holler](https://github.com/Adlai-Holler)
- Overhaul logging and add activity tracing support. [Adlai Holler](https://github.com/Adlai-Holler)
- Fix a crash where scrolling a table view after entering editing mode could lead to bad internal states in the table. [Huy Nguyen](https://github.com/nguyenhuy) [#416](https://github.com/TextureGroup/Texture/pull/416/)

##2.3.4
- [Yoga] Rewrite YOGA_TREE_CONTIGUOUS mode with improved behavior and cleaner integration [Scott Goodson](https://github.com/appleguy)
Expand Down
43 changes: 19 additions & 24 deletions Source/Details/ASDataController.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,37 +551,32 @@ - (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet
}
}

// Since we waited for _editingTransactionGroup at the beginning of this method, at this point we can guarantee that _pendingMap equals to _visibleMap.
// So if the change set is empty, we don't need to modify data and can safely schedule to notify the delegate.
if (changeSet.isEmpty) {
[_mainSerialQueue performBlockOnMainThread:^{
[_delegate dataController:self willUpdateWithChangeSet:changeSet];
[_delegate dataController:self didUpdateWithChangeSet:changeSet];
}];
return;
}

BOOL canDelegateLayout;
BOOL canDelegateLayout = (_layoutDelegate != nil);
ASElementMap *newMap;
id layoutContext;
{
as_activity_scope(as_activity_create("Latch new data for collection update", changeSet.rootActivity, OS_ACTIVITY_FLAG_DEFAULT));
// Mutable copy of current data.
ASElementMap *previousMap = _pendingMap;
ASMutableElementMap *mutableMap = [previousMap mutableCopy];

canDelegateLayout = (_layoutDelegate != nil);
// Step 1: Populate a new map that reflects the data source's state and use it as pendingMap
ASElementMap *previousMap = self.pendingMap;
if (changeSet.isEmpty) {
// If the change set is empty, nothing has changed so we can just reuse the previous map
newMap = previousMap;
} else {
// Mutable copy of current data.
ASMutableElementMap *mutableMap = [previousMap mutableCopy];

// Step 1: Update the mutable copies to match the data source's state
[self _updateSectionContextsInMap:mutableMap changeSet:changeSet];
ASPrimitiveTraitCollection existingTraitCollection = [self.node primitiveTraitCollection];
[self _updateElementsInMap:mutableMap changeSet:changeSet traitCollection:existingTraitCollection shouldFetchSizeRanges:(! canDelegateLayout) previousMap:previousMap];
// Step 1.1: Update the mutable copies to match the data source's state
[self _updateSectionContextsInMap:mutableMap changeSet:changeSet];
ASPrimitiveTraitCollection existingTraitCollection = [self.node primitiveTraitCollection];
[self _updateElementsInMap:mutableMap changeSet:changeSet traitCollection:existingTraitCollection shouldFetchSizeRanges:(! canDelegateLayout) previousMap:previousMap];

// Step 2: Clone the new data
newMap = [mutableMap copy];
// Step 1.2: Clone the new data
newMap = [mutableMap copy];
}
self.pendingMap = newMap;

// Step 3: Ask layout delegate for contexts
// Step 2: Ask layout delegate for contexts
if (canDelegateLayout) {
layoutContext = [_layoutDelegate layoutContextWithElements:newMap];
}
Expand All @@ -592,7 +587,7 @@ - (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet
dispatch_group_async(_editingTransactionGroup, _editingTransactionQueue, ^{
__block __unused os_activity_scope_state_s preparationScope = {}; // unused if deployment target < iOS10
as_activity_scope_enter(as_activity_create("Prepare nodes for collection update", AS_ACTIVITY_CURRENT, OS_ACTIVITY_FLAG_DEFAULT), &preparationScope);
// Step 4: Allocate and layout elements if can't delegate
// Step 3: Allocate and layout elements if can't delegate
NSArray<ASCollectionElement *> *elementsToProcess;
if (canDelegateLayout) {
// Allocate all nodes before handling them to the layout delegate.
Expand All @@ -617,7 +612,7 @@ - (void)updateWithChangeSet:(_ASHierarchyChangeSet *)changeSet
as_activity_scope_leave(&preparationScope);
[_delegate dataController:self willUpdateWithChangeSet:changeSet];

// Step 5: Deploy the new data as "completed" and inform delegate
// Step 4: Deploy the new data as "completed" and inform delegate
self.visibleMap = newMap;

[_delegate dataController:self didUpdateWithChangeSet:changeSet];
Expand Down