Merge pull request #266 from gavrix/flowlayout_crash_fix

#255 fix and better supplementary views support in animations
steipete · Mar 9, 2013 · f5c6dfa · f5c6dfa
2 parents 7dce692 + 3ed0e9f
commit f5c6dfa
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 49 deletions.
diff --git a/PSTCollectionView/PSTCollectionView.m b/PSTCollectionView/PSTCollectionView.m
@@ -1654,38 +1654,47 @@ - (void)updateWithItems:(NSArray *)items {
     for (PSTCollectionViewItemKey *key in [_allVisibleViewsDict keyEnumerator]) {
         PSTCollectionReusableView *view = _allVisibleViewsDict[key];
 
-        NSInteger oldGlobalIndex = [_update[@"oldModel"] globalIndexForItemAtIndexPath:key.indexPath];
+        if (key.type == PSTCollectionViewItemTypeCell) {
-		NSArray *oldToNewIndexMap = _update[@"oldToNewIndexMap"];
+            NSInteger oldGlobalIndex = [_update[@"oldModel"] globalIndexForItemAtIndexPath:key.indexPath];
-        NSInteger newGlobalIndex = NSNotFound;
+            NSArray *oldToNewIndexMap = _update[@"oldToNewIndexMap"];
-		if (oldGlobalIndex >= 0 && oldGlobalIndex < [oldToNewIndexMap count]) {
+            NSInteger newGlobalIndex = NSNotFound;
-			newGlobalIndex = [oldToNewIndexMap[oldGlobalIndex] intValue];
+            if (oldGlobalIndex >= 0 && oldGlobalIndex < [oldToNewIndexMap count]) {
-		}
+                newGlobalIndex = [oldToNewIndexMap[oldGlobalIndex] intValue];
-        NSIndexPath *newIndexPath = newGlobalIndex == NSNotFound ? nil : [_update[@"newModel"] indexPathForItemAtGlobalIndex:newGlobalIndex];
-        if (newIndexPath) {
-
-
-            PSTCollectionViewLayoutAttributes* startAttrs = nil;
-            PSTCollectionViewLayoutAttributes* finalAttrs = nil;
-
-            if (view.layoutAttributes && view.layoutAttributes.isSupplementaryView){
-                startAttrs  = [_layout layoutAttributesForSupplementaryViewOfKind:view.layoutAttributes.representedElementKind atIndexPath:newIndexPath];
-                finalAttrs = [_layout layoutAttributesForSupplementaryViewOfKind:view.layoutAttributes.representedElementKind atIndexPath:newIndexPath];
-
             }
-            else{
+            NSIndexPath *newIndexPath = newGlobalIndex == NSNotFound ? nil : [_update[@"newModel"] indexPathForItemAtGlobalIndex:newGlobalIndex];
+            if (newIndexPath) {
+
+
+                PSTCollectionViewLayoutAttributes* startAttrs = nil;
+                PSTCollectionViewLayoutAttributes* finalAttrs = nil;
+
                 startAttrs  = [_layout initialLayoutAttributesForAppearingItemAtIndexPath:newIndexPath];
                 finalAttrs = [_layout layoutAttributesForItemAtIndexPath:newIndexPath];
-
+
+                NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:@{@"view":view}];
+                if (startAttrs) dic[@"previousLayoutInfos"] = startAttrs;
+                if (finalAttrs) dic[@"newLayoutInfos"] = finalAttrs;
+
+                [animations addObject:dic];
+                PSTCollectionViewItemKey* newKey = [key copy];
+                [newKey setIndexPath:newIndexPath];
+                newAllVisibleView[newKey] = view;
             }
+        } else if (key.type == PSTCollectionViewItemTypeSupplementaryView) {
+            PSTCollectionViewLayoutAttributes* startAttrs = nil;
+            PSTCollectionViewLayoutAttributes* finalAttrs = nil;
+
+            startAttrs = view.layoutAttributes;
+            finalAttrs = [_layout layoutAttributesForSupplementaryViewOfKind:view.layoutAttributes.representedElementKind atIndexPath:key.indexPath];
 
             NSMutableDictionary *dic = [NSMutableDictionary dictionaryWithDictionary:@{@"view":view}];
             if (startAttrs) dic[@"previousLayoutInfos"] = startAttrs;
             if (finalAttrs) dic[@"newLayoutInfos"] = finalAttrs;
-
+            
             [animations addObject:dic];
             PSTCollectionViewItemKey* newKey = [key copy];
-            [newKey setIndexPath:newIndexPath];
             newAllVisibleView[newKey] = view;
+
         }
     }
     NSArray *allNewlyVisibleItems = [_layout layoutAttributesForElementsInRect:self.visibleBoundRects];

diff --git a/PSTCollectionView/PSTCollectionViewFlowLayout.m b/PSTCollectionView/PSTCollectionViewFlowLayout.m
@@ -215,22 +215,33 @@ - (PSTCollectionViewLayoutAttributes *)layoutAttributesForItemAtIndexPath:(NSInd
 - (PSTCollectionViewLayoutAttributes *)layoutAttributesForSupplementaryViewOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath {
     NSUInteger sectionIndex = indexPath.section;
 
+    PSTCollectionViewLayoutAttributes *layoutAttributes = nil;
+
     if (sectionIndex < _data.sections.count) {
         PSTGridLayoutSection *section = _data.sections[sectionIndex];
-        CGRect normalizedHeaderFrame = section.headerFrame;
+
-
+        CGRect normilazedFrame = CGRectZero;
-        if (!CGRectIsEmpty(normalizedHeaderFrame)) {
+
-            normalizedHeaderFrame.origin.x += section.frame.origin.x;
+        if ([kind isEqualToString:PSTCollectionElementKindSectionHeader]) {
-            normalizedHeaderFrame.origin.y += section.frame.origin.y;
+            normilazedFrame = section.headerFrame;
-
+        }
-            PSTCollectionViewLayoutAttributes *layoutAttributes = [[[self class] layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:PSTCollectionElementKindSectionHeader withIndexPath:[NSIndexPath indexPathForItem:0 inSection:sectionIndex]];
+        else if ([kind isEqualToString:PSTCollectionElementKindSectionFooter]) {
-            layoutAttributes.frame = normalizedHeaderFrame;
+            normilazedFrame = section.footerFrame;
-
-            return layoutAttributes;
         }
+
+        if (!CGRectIsEmpty(normilazedFrame)) {
+            normilazedFrame.origin.x += section.frame.origin.x;
+            normilazedFrame.origin.y += section.frame.origin.y;
+
+            layoutAttributes = [[[self class] layoutAttributesClass] layoutAttributesForSupplementaryViewOfKind:kind withIndexPath:[NSIndexPath indexPathForItem:0 inSection:sectionIndex]];
+            layoutAttributes.frame = normilazedFrame;
+
+        }
+
+
     }
 
-    return nil;
+    return layoutAttributes;
 }
 
 - (PSTCollectionViewLayoutAttributes *)layoutAttributesForDecorationViewWithReuseIdentifier:(NSString*)identifier atIndexPath:(NSIndexPath *)indexPath {

diff --git a/PSTCollectionView/PSTCollectionViewLayout.m b/PSTCollectionView/PSTCollectionViewLayout.m
@@ -298,32 +298,35 @@ - (void)prepareForCollectionViewUpdates:(NSArray *)updateItems {
 
     for (PSTCollectionReusableView *view in [[_collectionView visibleViewsDict] objectEnumerator]) {
         PSTCollectionViewLayoutAttributes *attr = [view.layoutAttributes copy];
-
+        if (attr.isCell) {
-        PSTCollectionViewData* oldModel = update[@"oldModel"];
+
-        NSInteger index = [oldModel globalIndexForItemAtIndexPath:[attr indexPath]];
+            NSInteger index = [update[@"oldModel"] globalIndexForItemAtIndexPath:[attr indexPath]];
-
+
-        if(index != NSNotFound) {
-            index = [update[@"oldToNewIndexMap"][index] intValue];
             if(index != NSNotFound) {
-                [attr setIndexPath:[update[@"newModel"] indexPathForItemAtGlobalIndex:index]];
+                index = [update[@"oldToNewIndexMap"][index] intValue];
-                _initialAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForLayoutAttributes:attr]] = attr;
+                if(index != NSNotFound) {
+                    [attr setIndexPath:[update[@"newModel"] indexPathForItemAtGlobalIndex:index]];
+                }
             }
         }
+        _initialAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForLayoutAttributes:attr]] = attr;
     }
 
     PSTCollectionViewData* collectionViewData = [_collectionView collectionViewData];
 
     CGRect bounds = [_collectionView visibleBoundRects];
 
     for (PSTCollectionViewLayoutAttributes* attr in [collectionViewData layoutAttributesForElementsInRect:bounds]) {
-        NSInteger index = [collectionViewData globalIndexForItemAtIndexPath:attr.indexPath];
+        if (attr.isCell) {
-
+            NSInteger index = [collectionViewData globalIndexForItemAtIndexPath:attr.indexPath];
-        index = [update[@"newToOldIndexMap"][index] intValue];
+
-        if(index != NSNotFound) {
+            index = [update[@"newToOldIndexMap"][index] intValue];
-            PSTCollectionViewLayoutAttributes* finalAttrs = [attr copy];
+            if(index != NSNotFound) {
-            [finalAttrs setIndexPath:[update[@"oldModel"] indexPathForItemAtGlobalIndex:index]];
+                PSTCollectionViewLayoutAttributes* finalAttrs = [attr copy];
-            [finalAttrs setAlpha:0];
+                [finalAttrs setIndexPath:[update[@"oldModel"] indexPathForItemAtGlobalIndex:index]];
-            _finalAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForLayoutAttributes:finalAttrs]] = finalAttrs;
+                [finalAttrs setAlpha:0];
+                _finalAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForLayoutAttributes:finalAttrs]] = finalAttrs;
+            }
         }
     }
 
@@ -388,7 +391,14 @@ - (PSTCollectionViewLayoutAttributes *)finalLayoutAttributesForDisappearingItemA
 }
 
 - (PSTCollectionViewLayoutAttributes *)initialLayoutAttributesForInsertedSupplementaryElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)elementIndexPath {
-    return nil;
+    PSTCollectionViewLayoutAttributes* attrs = _initialAnimationLayoutAttributesDict[[PSTCollectionViewItemKey collectionItemKeyForCellWithIndexPath:elementIndexPath]];
+
+    if([_insertedSectionsSet containsIndex:[elementIndexPath section]]) {
+        attrs = [attrs copy];
+        [attrs setAlpha:0];
+    }
+    return attrs;
+
 }
 
 - (PSTCollectionViewLayoutAttributes *)finalLayoutAttributesForDeletedSupplementaryElementOfKind:(NSString *)elementKind atIndexPath:(NSIndexPath *)elementIndexPath {