refactored the testing example for more correct deletion of sections. Exposed sectionForHeaderView: and deprecated section variable of the headerview.

Author: kgaidis

Example/Testing_Example/FZAccordionTableViewExample/AccordionHeaderView.h

@@ -13,6 +13,6 @@ static NSString *const kAccordionHeaderViewReuseIdentifier = @"AccordionHeaderVi
 
 @interface AccordionHeaderView : FZAccordionTableViewHeaderView
 
-@property (weak, nonatomic) IBOutlet UIButton *deleteButton;
+@property (copy, nonatomic) void (^pressedDeleteButtonBlock)(AccordionHeaderView *view);
 
 @end

Example/Testing_Example/FZAccordionTableViewExample/AccordionHeaderView.m

@@ -8,6 +8,23 @@
 
 #import "AccordionHeaderView.h"
 
+@interface AccordionHeaderView()
+
+@property (weak, nonatomic) IBOutlet UIButton *deleteButton;
+
+@end
+
 @implementation AccordionHeaderView
 
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    [self.deleteButton addTarget:self action:@selector(pressedDeleteButton) forControlEvents:UIControlEventTouchUpInside];
+}
+
+- (void)pressedDeleteButton {
+    if (self.pressedDeleteButtonBlock) {
+        self.pressedDeleteButtonBlock(self);
+    }
+}
+
 @end

Example/Testing_Example/FZAccordionTableViewExample/FirstViewController.m

@@ -45,14 +45,6 @@ - (void)setupTableView {
     [self.tableView registerNib:[UINib nibWithNibName:@"AccordionHeaderView" bundle:nil] forHeaderFooterViewReuseIdentifier:kAccordionHeaderViewReuseIdentifier];
 }
 
-#pragma mark - Action -
-
-- (IBAction)pressedDeleteButton:(UIButton *)sender {
-    // Don't use tag in real code
-    [self.sections removeObjectAtIndex:sender.tag];
-    [self.tableView deleteSections:[NSIndexSet indexSetWithIndex:sender.tag] withRowAnimation:UITableViewRowAnimationAutomatic];
-}
-
 #pragma mark - Class Overrides -
 
 - (BOOL)prefersStatusBarHidden {
@@ -94,8 +86,15 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     AccordionHeaderView *headerView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:kAccordionHeaderViewReuseIdentifier];
-    headerView.deleteButton.tag = section; // This is bad code, but works for testing!
-    [headerView.deleteButton addTarget:self action:@selector(pressedDeleteButton:) forControlEvents:UIControlEventTouchUpInside];
+    __weak typeof(self) weakSelf = self;
+    headerView.pressedDeleteButtonBlock = ^(AccordionHeaderView *headerView) {
+        typeof(self) strongSelf = weakSelf;
+        if (strongSelf) {
+            NSInteger section = [strongSelf.tableView sectionForHeaderView:headerView];
+            [strongSelf.sections removeObjectAtIndex:section];
+            [strongSelf.tableView deleteSections:[NSIndexSet indexSetWithIndex:section] withRowAnimation:UITableViewRowAnimationFade];
+        }
+    };
     return headerView;
 }
 

FZAccordionTableView/FZAccordionTableView.h

@@ -33,7 +33,7 @@
 /*!
  @desc  The section which this header view is part of.
  */
-@property (nonatomic, readonly) NSInteger section;
+@property (nonatomic, readonly) NSInteger section DEPRECATED_MSG_ATTRIBUTE("Use sectionForHeaderView: instead.");
 
 @end
 
@@ -104,6 +104,15 @@
  */
 - (void)toggleSection:(NSInteger)section;
 
+/*!
+ @desc  Finds the section of a header view.
+ 
+ @param headerView The header view whose section you want to find.
+ 
+ @returns The section of the header view.
+ */
+- (NSInteger)sectionForHeaderView:(UITableViewHeaderFooterView * _Nonnull)headerView;
+
 @end
 
 @protocol FZAccordionTableViewDelegate <NSObject>

FZAccordionTableView/FZAccordionTableView.m

@@ -37,13 +37,13 @@ @protocol FZAccordionTableViewHeaderViewDelegate;
 
 @interface FZAccordionTableViewHeaderView()
 
-@property (nonatomic) NSInteger section;
+//@property (nonatomic) NSInteger section;
 @property (nonatomic, weak) id <FZAccordionTableViewHeaderViewDelegate> delegate;
 
 @end
 
 @protocol FZAccordionTableViewHeaderViewDelegate <NSObject>
-- (void)headerView:(FZAccordionTableViewHeaderView *)sectionHeaderView didSelectHeaderInSection:(NSInteger)section;
+- (void)tappedHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView;
 @end
 
 @implementation FZAccordionTableViewHeaderView
@@ -67,10 +67,7 @@ - (void)singleInit {
 }
 
 - (void)touchedHeaderView:(UITapGestureRecognizer *)recognizer {
-    
-    
-    
-    [self.delegate headerView:self didSelectHeaderInSection:self.section];
+    [self.delegate tappedHeaderView:self];
 }
 
 @end
@@ -161,8 +158,34 @@ - (NSArray *)getIndexPathsForSection:(NSInteger)section {
 - (void)toggleSection:(NSInteger)section {
 
     FZAccordionTableViewHeaderView *headerView = (FZAccordionTableViewHeaderView *)[self headerViewForSection:section];
+    [self tappedHeaderView:headerView];
+}
+
+- (NSInteger)sectionForHeaderView:(UITableViewHeaderFooterView *)headerView {
+    
+    NSInteger section = NSNotFound;
+    NSInteger minSection = 0;
+    NSInteger maxSection = self.numberOfSections;
+    
+    CGRect headerViewFrame = headerView.frame;
+    CGRect compareHeaderViewFrame;
 
-    [self headerView:headerView didSelectHeaderInSection:section];
+    while (minSection <= maxSection) {
+        NSInteger middleSection = (minSection+maxSection)/2;
+        compareHeaderViewFrame = [self rectForHeaderInSection:middleSection];
+        if (CGRectEqualToRect(headerViewFrame, compareHeaderViewFrame)) {
+            section = middleSection;
+            break;
+        }
+        else if (headerViewFrame.origin.y > compareHeaderViewFrame.origin.y) {
+            minSection = middleSection+1;
+        }
+        else {
+            maxSection = middleSection-1;
+        }
+    }
+    
+    return section;
 }
 
 #pragma mark - UITableView Overrides -
@@ -245,40 +268,10 @@ - (void)setInitialOpenSections:(NSSet *)initialOpenedSections {
 
 #pragma mark - FZAccordionTableViewHeaderViewDelegate -
 
-
-
-- (NSInteger)sectionForHeaderView:(UITableViewHeaderFooterView *)headerView {
-    
-    NSInteger section = NSNotFound;
-    NSInteger min = 0;
-    NSInteger max = self.numberOfSections;
-    
-    CGRect headerViewFrame = headerView.frame;
-    CGRect compareHeaderViewFrame;
-    
-    while (min <= max) {
-        NSInteger mid = (min+max)/2;
-        compareHeaderViewFrame = [self rectForHeaderInSection:mid];
-        if (CGRectEqualToRect(headerViewFrame, compareHeaderViewFrame)) {
-            section = mid;
-            break;
-        }
-        else if (headerViewFrame.origin.y > compareHeaderViewFrame.origin.y) {
-            min = mid+1;
-        }
-        else {
-            max = mid-1;
-        }
-    }
-
-    return section;
-}
-
-
-
-- (void)headerView:(FZAccordionTableViewHeaderView *)sectionHeaderView didSelectHeaderInSection:(NSInteger)section {
+- (void)tappedHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
+    NSParameterAssert(sectionHeaderView);
 
-    section = [self sectionForHeaderView:sectionHeaderView];
+    NSInteger section = [self sectionForHeaderView:sectionHeaderView];
 
     // Do not interact with sections that are always opened
     if ([self isAlwaysOpenedSection:section]) {
@@ -445,7 +438,6 @@ - (UIView*)tableView:(UITableView*)tableView viewForHeaderInSection:(NSInteger)s
     if ([self.subclassDelegate respondsToSelector:@selector(tableView:viewForHeaderInSection:)]) {
         headerView = (FZAccordionTableViewHeaderView *)[self.subclassDelegate tableView:tableView viewForHeaderInSection:section];
         if ([headerView isKindOfClass:[FZAccordionTableViewHeaderView class]]) {
-            headerView.section = section;
             headerView.delegate = self;
         }
     }