diff --git a/Source/IGListDiffKit/IGListExperiments.h b/Source/IGListDiffKit/IGListExperiments.h index 1ba01963..63083d3d 100644 --- a/Source/IGListDiffKit/IGListExperiments.h +++ b/Source/IGListDiffKit/IGListExperiments.h @@ -31,9 +31,7 @@ typedef NS_OPTIONS (NSInteger, IGListExperiment) { /// Test invalidating layout when cell reloads/updates in IGListBindingSectionController. IGListExperimentInvalidateLayoutForUpdates = 1 << 8, /// Test using the collection view when asking for layout instead of accessing the data source. Only apply to IGListCollectionViewLayout. - IGListExperimentUseCollectionViewInsteadOfDataSourceInLayout = 1 << 9, - /// Test committing CATransactions inline instead of batching potentially unrelated animations - IGListExperimentPerformUpdatesWithoutDeferringCATransactionCommit = 1 << 10 + IGListExperimentUseCollectionViewInsteadOfDataSourceInLayout = 1 << 9 }; /** diff --git a/Source/IGListKit/IGListAdapterUpdater.m b/Source/IGListKit/IGListAdapterUpdater.m index 33f98d47..d533bf1d 100644 --- a/Source/IGListKit/IGListAdapterUpdater.m +++ b/Source/IGListKit/IGListAdapterUpdater.m @@ -260,22 +260,11 @@ willPerformBatchUpdatesWithCollectionView:collectionView batchUpdatesBlock(result); } completion:batchUpdatesCompletionBlock]; } else { - if (IGListExperimentEnabled(experiments, IGListExperimentPerformUpdatesWithoutDeferringCATransactionCommit)) { - [UIView performWithoutAnimation:^{ - [collectionView performBatchUpdates:^{ - batchUpdatesBlock(result); - } completion:batchUpdatesCompletionBlock]; - }]; - } else { - [CATransaction begin]; - [CATransaction setDisableActions:YES]; + [UIView performWithoutAnimation:^{ [collectionView performBatchUpdates:^{ batchUpdatesBlock(result); - } completion:^(BOOL finished) { - [CATransaction commit]; - batchUpdatesCompletionBlock(finished); - }]; - } + } completion:batchUpdatesCompletionBlock]; + }]; } } @catch (NSException *exception) { [delegate listAdapterUpdater:self