Modified code so toggleSection: call does not require a headerView to exist (be visible). Modified tests to support new changes.

Author: kgaidis

FZAccordionTableView/FZAccordionTableView.m

@@ -199,7 +199,7 @@ - (BOOL)isSectionOpen:(NSInteger)section {
 
 - (void)toggleSection:(NSInteger)section { 
     FZAccordionTableViewHeaderView *headerView = (FZAccordionTableViewHeaderView *)[self headerViewForSection:section];
-    [self tappedHeaderView:headerView];
+    [self toggleSection:section withHeaderView:headerView];
 }
 
 - (NSInteger)sectionForHeaderView:(UITableViewHeaderFooterView *)headerView {
@@ -259,11 +259,46 @@ - (void)tappedHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
     NSParameterAssert(sectionHeaderView);
 
     NSInteger section = [self sectionForHeaderView:sectionHeaderView];
+    [self toggleSection:section withHeaderView:sectionHeaderView];
+}
+
+- (void)closeAllSectionsExcept:(NSInteger)section {
+    // Get all of the sections that we need to close
+    NSMutableSet *sectionsToClose = [[NSMutableSet alloc] init];
+    for (NSInteger i = 0; i < self.numberOfSections; i++) {
+        FZAccordionTableViewSectionInfo *sectionInfo = self.sectionInfos[i];
+        if (section != i && sectionInfo.isOpen) {
+            [sectionsToClose addObject:@(i)];
+        }
+    }
 
+    // Close the found sections
+    for (NSNumber *sectionToClose in sectionsToClose) {
+        
+        // Change animations based off which sections are closed
+        UITableViewRowAnimation closeAnimation = UITableViewRowAnimationTop;
+        if (section < sectionToClose.integerValue) {
+            closeAnimation = UITableViewRowAnimationBottom;
+        }
+        if (self.enableAnimationFix) {
+            if (!self.allowsMultipleSelection &&
+                (sectionToClose.integerValue == self.sectionInfos.count - 1 ||
+                 sectionToClose.integerValue == self.sectionInfos.count - 2)) {
+                    closeAnimation = UITableViewRowAnimationFade;
+                }
+        }
+        
+        [self closeSection:sectionToClose.integerValue withHeaderView:(FZAccordionTableViewHeaderView *)[self headerViewForSection:sectionToClose.integerValue] rowAnimation:closeAnimation];
+    }
+}
+
+#pragma mark - Open / Closing
+
+- (void)toggleSection:(NSInteger)section withHeaderView:(nullable FZAccordionTableViewHeaderView *)sectionHeaderView {
     if (![self canInteractWithHeaderAtSection:section]) {
         return;
     }
-
+    
     // Keep at least one section open
     if (self.keepOneSectionOpen) {
         NSInteger countOfOpenSections = 0;
@@ -273,7 +308,7 @@ - (void)tappedHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
                 countOfOpenSections++;
             }
         }
-
+        
         if (countOfOpenSections == 1 && [self isSectionOpen:section]) {
             return;
         }
@@ -299,39 +334,7 @@ - (void)tappedHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
     [self endUpdates];
 }
 
-- (void)closeAllSectionsExcept:(NSInteger)section {
-    // Get all of the sections that we need to close
-    NSMutableSet *sectionsToClose = [[NSMutableSet alloc] init];
-    for (NSInteger i = 0; i < self.numberOfSections; i++) {
-        FZAccordionTableViewSectionInfo *sectionInfo = self.sectionInfos[i];
-        if (section != i && sectionInfo.isOpen) {
-            [sectionsToClose addObject:@(i)];
-        }
-    }
-    
-    // Close the found sections
-    for (NSNumber *sectionToClose in sectionsToClose) {
-        
-        // Change animations based off which sections are closed
-        UITableViewRowAnimation closeAnimation = UITableViewRowAnimationTop;
-        if (section < sectionToClose.integerValue) {
-            closeAnimation = UITableViewRowAnimationBottom;
-        }
-        if (self.enableAnimationFix) {
-            if (!self.allowsMultipleSelection &&
-                (sectionToClose.integerValue == self.sectionInfos.count - 1 ||
-                 sectionToClose.integerValue == self.sectionInfos.count - 2)) {
-                    closeAnimation = UITableViewRowAnimationFade;
-                }
-        }
-        
-        [self closeSection:sectionToClose.integerValue withHeaderView:(FZAccordionTableViewHeaderView *)[self headerViewForSection:sectionToClose.integerValue] rowAnimation:closeAnimation];
-    }
-}
-
-#pragma mark - Open / Closing
-
-- (void)openSection:(NSInteger)section withHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
+- (void)openSection:(NSInteger)section withHeaderView:(nullable FZAccordionTableViewHeaderView *)sectionHeaderView {
     if (![self canInteractWithHeaderAtSection:section]) {
         return;
     }
@@ -370,11 +373,11 @@ - (void)openSection:(NSInteger)section withHeaderView:(FZAccordionTableViewHeade
     [self endUpdates];
 }
 
-- (void)closeSection:(NSInteger)section withHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView {
+- (void)closeSection:(NSInteger)section withHeaderView:(nullable FZAccordionTableViewHeaderView *)sectionHeaderView {
     [self closeSection:section withHeaderView:sectionHeaderView rowAnimation:UITableViewRowAnimationTop];
 }
 
-- (void)closeSection:(NSInteger)section withHeaderView:(FZAccordionTableViewHeaderView *)sectionHeaderView rowAnimation:(UITableViewRowAnimation)rowAnimation {
+- (void)closeSection:(NSInteger)section withHeaderView:(nullable FZAccordionTableViewHeaderView *)sectionHeaderView rowAnimation:(UITableViewRowAnimation)rowAnimation {
     if (![self canInteractWithHeaderAtSection:section]) {
         return;
     }

Tests/FZAccordionTableViewUnitTests/FZAccordionTableViewDelegateTests.m

@@ -122,27 +122,23 @@ - (void)testClosingInteraction
 
 #pragma mark - <FZAccordionTableViewDelegate> -
 
-- (void)tableView:(FZAccordionTableView * _Nonnull)tableView willOpenSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header {
+- (void)tableView:(FZAccordionTableView * _Nonnull)tableView willOpenSection:(NSInteger)section withHeader:(nullable UITableViewHeaderFooterView *)header {
     XCTAssertNotNil(tableView);
-    XCTAssertNotNil(header);
     self.willOpenSectionCalled = YES;
 }
 
-- (void)tableView:(FZAccordionTableView * _Nonnull)tableView didOpenSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header {
+- (void)tableView:(FZAccordionTableView * _Nonnull)tableView didOpenSection:(NSInteger)section withHeader:(nullable UITableViewHeaderFooterView *)header {
     XCTAssertNotNil(tableView);
-    XCTAssertNotNil(header);
     self.didOpenSectionCalled = YES;
 }
 
-- (void)tableView:(FZAccordionTableView * _Nonnull)tableView willCloseSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header {
+- (void)tableView:(FZAccordionTableView * _Nonnull)tableView willCloseSection:(NSInteger)section withHeader:(nullable UITableViewHeaderFooterView *)header {
     XCTAssertNotNil(tableView);
-    XCTAssertNotNil(header);
     self.willCloseSectionCalled = YES;
 }
 
-- (void)tableView:(FZAccordionTableView * _Nonnull)tableView didCloseSection:(NSInteger)section withHeader:(UITableViewHeaderFooterView * _Nonnull)header {
+- (void)tableView:(FZAccordionTableView * _Nonnull)tableView didCloseSection:(NSInteger)section withHeader:(nullable UITableViewHeaderFooterView *)header {
     XCTAssertNotNil(tableView);
-    XCTAssertNotNil(header);
     self.didCloseSectionCalled = YES;
 }
 

Tests/FZAccordionTableViewUnitTests/FZAccordionTableViewGeneralTests.m

@@ -54,17 +54,17 @@ - (void)testSectionToggling {
     self.tableView.allowMultipleSectionsOpen = YES;
     self.tableView.keepOneSectionOpen = NO;
 
+    // Make sure UITableView methods get called / loaded
+    [self waitForHeaderViewInSection:0];
+    
     // First, open all of the sections
     for (NSInteger i = 0; i < [self.tableView numberOfSections];  i++) {
-        [self waitForHeaderViewInSection:i];
         [self.tableView toggleSection:i];
-        
         XCTAssert([self.tableView isSectionOpen:i], @"Section %d should be open.", (int)i);
     }
 
     // Second, close all of the section
     for (NSInteger i = 0; i < [self.tableView numberOfSections]; i++) {
-        [self waitForHeaderViewInSection:i];
         [self.tableView toggleSection:i];
 
         XCTAssert(![self.tableView isSectionOpen:i], @"Section %d should be closed.", (int)i);