PSTCollection delegate messages for selection behavior does not match UICollectionView behavior

joelcarranza · joelcarranza · commit f0185f3f1080 · 2012-10-21T22:13:46.000-05:00
Delegate messages should only be sent when performed by user. didDeselect message is not sent when user changes selection
diff --git a/PSTCollectionView/PSTCollectionView.m b/PSTCollectionView/PSTCollectionView.m
@@ -545,7 +545,7 @@ - (void)cellTouchCancelled {
 
 - (void)userSelectedItemAtIndexPath:(NSIndexPath *)indexPath {
     if (self.allowsMultipleSelection && [_indexPathsForSelectedItems containsObject:indexPath]) {
-        [self deselectItemAtIndexPath:indexPath animated:YES];
+        [self deselectItemAtIndexPath:indexPath animated:YES notifyDelegate:YES];
     }
     else {
         [self selectItemAtIndexPath:indexPath animated:YES scrollPosition:PSTCollectionViewScrollPositionNone notifyDelegate:YES];
@@ -556,14 +556,16 @@ - (void)userSelectedItemAtIndexPath:(NSIndexPath *)indexPath {
 - (void)selectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(PSTCollectionViewScrollPosition)scrollPosition notifyDelegate:(BOOL)notifyDelegate {
 
     BOOL shouldSelect = YES;
-	if (_collectionViewFlags.delegateShouldSelectItemAtIndexPath) {
+	if (notifyDelegate && _collectionViewFlags.delegateShouldSelectItemAtIndexPath) {
         shouldSelect = [self.delegate collectionView:self shouldSelectItemAtIndexPath:indexPath];
     }
 
     if (shouldSelect) {
         if (!self.allowsMultipleSelection) {
             for (NSIndexPath *selectedIndexPath in [_indexPathsForSelectedItems copy]) {
-                [self deselectItemAtIndexPath:selectedIndexPath animated:animated];
+                if(![indexPath isEqual:selectedIndexPath]) {
+                    [self deselectItemAtIndexPath:selectedIndexPath animated:animated notifyDelegate:notifyDelegate];
+                }
             }
         }
         if (self.allowsSelection) {
@@ -582,22 +584,31 @@ - (void)selectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated s
 }
 
 - (void)selectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(PSTCollectionViewScrollPosition)scrollPosition {
-    [self selectItemAtIndexPath:indexPath animated:animated scrollPosition:scrollPosition notifyDelegate:YES];
+    [self selectItemAtIndexPath:indexPath animated:animated scrollPosition:scrollPosition notifyDelegate:NO];
+}
+
+- (void)deselectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated
+{
+    [self deselectItemAtIndexPath:indexPath animated:animated notifyDelegate:NO];
 }
 
-- (void)deselectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated {
+- (void)deselectItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated notifyDelegate:(BOOL)notify {
     if ([_indexPathsForSelectedItems containsObject:indexPath]) {
         PSTCollectionViewCell *selectedCell = [self cellForItemAtIndexPath:indexPath];
         selectedCell.selected = NO;
         [_indexPathsForSelectedItems removeObject:indexPath];
 
-        [self unhighlightItemAtIndexPath:indexPath animated:animated notifyDelegate:YES];
+        [self unhighlightItemAtIndexPath:indexPath animated:animated notifyDelegate:notify];
+        
+        if (notify && _collectionViewFlags.delegateDidDeselectItemAtIndexPath) {
+            [self.delegate collectionView:self didDeselectItemAtIndexPath:indexPath];
+        }
     }
 }
 
 - (BOOL)highlightItemAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(PSTCollectionViewScrollPosition)scrollPosition notifyDelegate:(BOOL)notifyDelegate {
     BOOL shouldHighlight = YES;
-    if (_collectionViewFlags.delegateShouldHighlightItemAtIndexPath) {
+    if (notifyDelegate && _collectionViewFlags.delegateShouldHighlightItemAtIndexPath) {
         shouldHighlight = [self.delegate collectionView:self shouldHighlightItemAtIndexPath:indexPath];
     }
 
