Fix bugs Add code improvements

Kharauzov · Kharauzov · commit 5f9e0ffe9106 · 2019-08-27T21:20:53.000+03:00
Bug #1: Section arrow image had wrong diraction when opening from code Bug #2: Section headers were using wrong that caused wrong diraction of arrow for open/close sections
diff --git a/CollapseTableView.xcodeproj/project.pbxproj b/CollapseTableView.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 		4919EFE122AC27A200CD5A74 /* CollapseTableView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4922F97122AAE53700967BB5 /* CollapseTableView.framework */; };
 		4919EFE222AC27A200CD5A74 /* CollapseTableView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4922F97122AAE53700967BB5 /* CollapseTableView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4922F97622AAE53700967BB5 /* CollapseTableView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4922F97422AAE53700967BB5 /* CollapseTableView.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		49F918182312E1BB0075D644 /* ReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49F918172312E1BB0075D644 /* ReusableView.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -60,6 +61,7 @@
 		4922F97122AAE53700967BB5 /* CollapseTableView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CollapseTableView.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4922F97422AAE53700967BB5 /* CollapseTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CollapseTableView.h; sourceTree = "<group>"; };
 		4922F97522AAE53700967BB5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		49F918172312E1BB0075D644 /* ReusableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReusableView.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -93,6 +95,7 @@
 		4919EFCC22AC25D400CD5A74 /* CollapseTableViewDemo */ = {
 			isa = PBXGroup;
 			children = (
+				49F918172312E1BB0075D644 /* ReusableView.swift */,
 				4919EFCD22AC25D400CD5A74 /* AppDelegate.swift */,
 				4919EFDD22AC263D00CD5A74 /* SectionHeaderView.swift */,
 				4919EFDE22AC263D00CD5A74 /* SectionHeaderView.xib */,
@@ -250,6 +253,7 @@
 				4919EFD022AC25D400CD5A74 /* ViewController.swift in Sources */,
 				4919EFDF22AC263D00CD5A74 /* SectionHeaderView.swift in Sources */,
 				4919EFCE22AC25D400CD5A74 /* AppDelegate.swift in Sources */,
+				49F918182312E1BB0075D644 /* ReusableView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/CollapseTableView.xcodeproj/project.xcworkspace/xcuserdata/serhii_kharauzov.xcuserdatad/UserInterfaceState.xcuserstate b/CollapseTableView.xcodeproj/project.xcworkspace/xcuserdata/serhii_kharauzov.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/CollapseTableView.xcodeproj/xcuserdata/serhii_kharauzov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/CollapseTableView.xcodeproj/xcuserdata/serhii_kharauzov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>
diff --git a/CollapseTableView/Source/CollapseSectionHeader.swift b/CollapseTableView/Source/CollapseSectionHeader.swift
@@ -17,10 +17,10 @@ public protocol CollapseSectionHeader {
     
     /// Default implementation: rotates `indicatorImageView` in
     /// appropriate direction.
-    func handleChangeToOpenState()
+    func updateViewForOpenState(animated: Bool)
     /// Default implementation: rotates `indicatorImageView` in
     /// appropriate direction.
-    func handleChangeToCloseState()
+    func updateViewForCloseState(animated: Bool)
 }
 
 // MARK: Default implementation of methods and properties.
@@ -32,14 +32,16 @@ extension CollapseSectionHeader {
         return 0.25
     }
     
-    public func handleChangeToOpenState() {
-        UIView.animate(withDuration: imageAnimationDuration) {
+    public func updateViewForOpenState(animated: Bool) {
+        let duration = animated ? imageAnimationDuration : 0
+        UIView.animate(withDuration: duration) {
             self.indicatorImageView.transform = CGAffineTransform(rotationAngle: CGFloat(Double.pi))
         }
     }
     
-    public func handleChangeToCloseState() {
-        UIView.animate(withDuration: imageAnimationDuration) {
+    public func updateViewForCloseState(animated: Bool) {
+        let duration = animated ? imageAnimationDuration : 0
+        UIView.animate(withDuration: duration) {
             self.indicatorImageView.transform = CGAffineTransform(rotationAngle: CGFloat(2 * Double.pi))
         }
     }
diff --git a/CollapseTableView/Source/CollapseTableView.swift b/CollapseTableView/Source/CollapseTableView.swift
@@ -60,18 +60,15 @@ open class CollapseTableView: UITableView {
     
     // MARK: Public methods
     
-    public func toggleSection(_ sectionIndex: Int, sectionView: UIView, animated: Bool) {
+    public func toggleSection(_ sectionIndex: Int, animated: Bool) {
         if sectionIndex >= sectionStates.count {
             return
         }
         let sectionIsOpen = sectionStates[sectionIndex]
-        let collapseSectionHeader = sectionView as? CollapseSectionHeader
         if sectionIsOpen {
-            collapseSectionHeader?.handleChangeToCloseState()
             closeSection(sectionIndex, animated: animated)
             didTapSectionHeaderView?(sectionIndex, false)
         } else {
-            collapseSectionHeader?.handleChangeToOpenState()
             openSection(sectionIndex, animated: animated)
             didTapSectionHeaderView?(sectionIndex, true)
         }
@@ -82,6 +79,9 @@ open class CollapseTableView: UITableView {
             return
         }
         setSectionAtIndex(sectionIndex, open: true)
+        if let headerView = headerView(forSection: sectionIndex) as? CollapseSectionHeader {
+            headerView.updateViewForOpenState(animated: true)
+        }
         if animated {
             if let indexPathsToInsert = indexPathsForRowsInSectionAtIndex(sectionIndex) {
                 insertRows(at: indexPathsToInsert, with: .top)
@@ -92,7 +92,13 @@ open class CollapseTableView: UITableView {
     }
     
     public func closeSection(_ sectionIndex: Int, animated: Bool) {
+        if sectionIndex >= sectionStates.count {
+            return
+        }
         setSectionAtIndex(sectionIndex, open: false)
+        if let headerView = headerView(forSection: sectionIndex) as? CollapseSectionHeader {
+            headerView.updateViewForCloseState(animated: true)
+        }
         if animated {
             if let indexPathsToDelete = indexPathsForRowsInSectionAtIndex(sectionIndex) {
                 deleteRows(at: indexPathsToDelete, with: .top)
@@ -134,7 +140,7 @@ open class CollapseTableView: UITableView {
         guard let view = sender.view, view.tag >= 0 else {
             return
         }
-        toggleSection(view.tag, sectionView: view, animated: true)
+        toggleSection(view.tag, animated: true)
     }
 }
 
@@ -181,10 +187,17 @@ extension CollapseTableView: UITableViewDelegate {
                 }
             }
             if !tapGestureFound {
-                view.tag = section
                 view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))))
             }
         }
+        view.tag = section
+        if let collapseSectionHeader = view as? CollapseSectionHeader {
+            if isOpenSection(section) {
+                collapseSectionHeader.updateViewForOpenState(animated: false)
+            } else {
+                collapseSectionHeader.updateViewForCloseState(animated: false)
+            }
+        }
         return view
     }
 }
diff --git a/CollapseTableViewDemo/Base.lproj/Main.storyboard b/CollapseTableViewDemo/Base.lproj/Main.storyboard
@@ -20,36 +20,29 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="mlE-gm-cwW" customClass="CollapseTableView" customModule="CollapseTableView">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="blue" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="customCell" editingAccessoryType="disclosureIndicator" textLabel="59f-Q8-5t4" detailTextLabel="cKH-tz-ejd" style="IBUITableViewCellStyleSubtitle" id="KXn-bp-oiK">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="blue" indentationWidth="10" reuseIdentifier="customCell" editingAccessoryType="disclosureIndicator" textLabel="JoT-hf-pFa" style="IBUITableViewCellStyleDefault" id="KXn-bp-oiK">
                                         <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="KXn-bp-oiK" id="ACh-8J-1QC">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="59f-Q8-5t4">
-                                                    <rect key="frame" x="15" y="5" width="33.5" height="20.5"/>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JoT-hf-pFa">
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Detail" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cKH-tz-ejd">
-                                                    <rect key="frame" x="15" y="25.5" width="33" height="14.5"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <nil key="textColor"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="tsZ-KP-nHI" firstAttribute="trailing" secondItem="mlE-gm-cwW" secondAttribute="trailing" id="Enb-Jv-DVp"/>
                             <constraint firstItem="mlE-gm-cwW" firstAttribute="leading" secondItem="tsZ-KP-nHI" secondAttribute="leading" id="JFZ-1t-DnH"/>
diff --git a/CollapseTableViewDemo/ReusableView.swift b/CollapseTableViewDemo/ReusableView.swift
@@ -0,0 +1,21 @@
+//
+//  ReusableView.swift
+//
+//
+//  Created by Serhii Kharauzov on 1/9/18.
+//  Copyright © 2018 Serhii Kharauzov. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+/// Object, that adopts this protocol, will use identifier that matches name of its class.
+protocol ReusableView: class {}
+
+extension ReusableView {
+    static var reuseIdentifier: String {
+        return String(describing: self)
+    }
+}
+
+extension UIView: ReusableView {}
diff --git a/CollapseTableViewDemo/SectionHeaderView.swift b/CollapseTableViewDemo/SectionHeaderView.swift
@@ -9,11 +9,17 @@
 import UIKit
 import CollapseTableView
 
-class SectionHeaderView: UIView, CollapseSectionHeader {
+class SectionHeaderView: UITableViewHeaderFooterView, CollapseSectionHeader {
     
     @IBOutlet weak var imageView: UIImageView!
     
     var indicatorImageView: UIImageView {
         return imageView
     }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        imageView.image = #imageLiteral(resourceName: "arrow_down").withRenderingMode(.alwaysTemplate)
+        imageView.tintColor = .white
+    }
 }
diff --git a/CollapseTableViewDemo/SectionHeaderView.xib b/CollapseTableViewDemo/SectionHeaderView.xib
@@ -12,22 +12,33 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SectionHeaderView" customModule="CollapseTableView" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="66"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SectionHeaderView" customModule="CollapseTableViewDemo" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="diD-fa-6dA">
-                    <rect key="frame" x="360" y="11" width="44" height="44"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ur3-jR-pmv">
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="diD-fa-6dA">
+                            <rect key="frame" x="360" y="3" width="44" height="44"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="44" id="2BN-V4-DGF"/>
+                                <constraint firstAttribute="width" constant="44" id="CV0-rK-Tkv"/>
+                            </constraints>
+                        </imageView>
+                    </subviews>
+                    <color key="backgroundColor" red="0.85098039219999999" green="0.81568627449999997" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="44" id="Ms1-d3-7lQ"/>
-                        <constraint firstAttribute="width" constant="44" id="thi-hR-BN3"/>
+                        <constraint firstAttribute="trailing" secondItem="diD-fa-6dA" secondAttribute="trailing" constant="10" id="B9b-CG-6RP"/>
+                        <constraint firstItem="diD-fa-6dA" firstAttribute="centerY" secondItem="ur3-jR-pmv" secondAttribute="centerY" id="bhd-ax-ALd"/>
                     </constraints>
-                </imageView>
+                </view>
             </subviews>
-            <color key="backgroundColor" red="0.25098039220000001" green="0.75972222219999996" blue="0.33663194439999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="diD-fa-6dA" secondAttribute="trailing" constant="10" id="0M4-uM-535"/>
-                <constraint firstItem="diD-fa-6dA" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="Pwf-eP-iLx"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="ur3-jR-pmv" secondAttribute="trailing" id="2u4-0M-rwC"/>
+                <constraint firstItem="ur3-jR-pmv" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Ucq-FP-CIK"/>
+                <constraint firstItem="ur3-jR-pmv" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="az1-GB-tiY"/>
+                <constraint firstAttribute="bottom" secondItem="ur3-jR-pmv" secondAttribute="bottom" id="cRe-SW-VXf"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
diff --git a/CollapseTableViewDemo/ViewController.swift b/CollapseTableViewDemo/ViewController.swift
@@ -15,13 +15,29 @@ class ViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        tableView.delegate = self
-        tableView.dataSource = self
+        setupTableView()
         tableView.didTapSectionHeaderView = { (sectionIndex, isOpen) in
             debugPrint("sectionIndex \(sectionIndex), isOpen \(isOpen)")
         }
+        reloadTableView { [unowned self] in
+            self.tableView.openSection(0, animated: true)
+        }
+    }
+    
+    func setupTableView() {
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.tableFooterView = UIView(frame: .zero)
+        tableView.register(UINib(nibName: SectionHeaderView.reuseIdentifier, bundle: nil), forHeaderFooterViewReuseIdentifier: SectionHeaderView.reuseIdentifier)
+    }
+    
+    func reloadTableView(_ completion: @escaping () -> Void) {
+        CATransaction.begin()
+        CATransaction.setCompletionBlock({
+            completion()
+        })
         tableView.reloadData()
-        tableView.openSection(0, animated: true)
+        CATransaction.commit()
     }
 }
 
@@ -36,13 +52,15 @@ extension ViewController: UITableViewDataSource, UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "customCell", for: indexPath)
-        cell.textLabel?.text = "textLabel \(indexPath.row)"
-        cell.detailTextLabel?.text = "detailTextLabel  \(indexPath.row)"
+        cell.textLabel?.text = "Text for cell #\(indexPath.row + 1)"
         return cell
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        let view = Bundle.main.loadNibNamed("SectionHeaderView", owner: self, options: nil)?.first as? SectionHeaderView
+        guard let view = tableView.dequeueReusableHeaderFooterView(withIdentifier: SectionHeaderView.reuseIdentifier) else {
+            let view = Bundle.main.loadNibNamed(SectionHeaderView.reuseIdentifier, owner: self, options: nil)?.first as? SectionHeaderView
+            return view
+        }
         return view
     }
     
@@ -51,7 +69,7 @@ extension ViewController: UITableViewDataSource, UITableViewDelegate {
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 60
+        return 44
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ public protocol CollapseSectionHeader {`
`17`	`17`
`18`	`18`	/// Default implementation: rotates `indicatorImageView` in
`19`	`19`	`/// appropriate direction.`
`20`		`- func handleChangeToOpenState()`
	`20`	`+ func updateViewForOpenState(animated: Bool)`
`21`	`21`	/// Default implementation: rotates `indicatorImageView` in
`22`	`22`	`/// appropriate direction.`
`23`		`- func handleChangeToCloseState()`
	`23`	`+ func updateViewForCloseState(animated: Bool)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`// MARK: Default implementation of methods and properties.`
`@@ -32,14 +32,16 @@ extension CollapseSectionHeader {`
`32`	`32`	`return 0.25`
`33`	`33`	`}`
`34`	`34`
`35`		`- public func handleChangeToOpenState() {`
`36`		`- UIView.animate(withDuration: imageAnimationDuration) {`
	`35`	`+ public func updateViewForOpenState(animated: Bool) {`
	`36`	`+ let duration = animated ? imageAnimationDuration : 0`
	`37`	`+ UIView.animate(withDuration: duration) {`
`37`	`38`	`self.indicatorImageView.transform = CGAffineTransform(rotationAngle: CGFloat(Double.pi))`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`41`		`- public func handleChangeToCloseState() {`
`42`		`- UIView.animate(withDuration: imageAnimationDuration) {`
	`42`	`+ public func updateViewForCloseState(animated: Bool) {`
	`43`	`+ let duration = animated ? imageAnimationDuration : 0`
	`44`	`+ UIView.animate(withDuration: duration) {`
`43`	`45`	`self.indicatorImageView.transform = CGAffineTransform(rotationAngle: CGFloat(2 * Double.pi))`
`44`	`46`	`}`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,18 +60,15 @@ open class CollapseTableView: UITableView {`
`60`	`60`
`61`	`61`	`// MARK: Public methods`
`62`	`62`
`63`		`- public func toggleSection(_ sectionIndex: Int, sectionView: UIView, animated: Bool) {`
	`63`	`+ public func toggleSection(_ sectionIndex: Int, animated: Bool) {`
`64`	`64`	`if sectionIndex >= sectionStates.count {`
`65`	`65`	`return`
`66`	`66`	`}`
`67`	`67`	`let sectionIsOpen = sectionStates[sectionIndex]`
`68`		`- let collapseSectionHeader = sectionView as? CollapseSectionHeader`
`69`	`68`	`if sectionIsOpen {`
`70`		`- collapseSectionHeader?.handleChangeToCloseState()`
`71`	`69`	`closeSection(sectionIndex, animated: animated)`
`72`	`70`	`didTapSectionHeaderView?(sectionIndex, false)`
`73`	`71`	`} else {`
`74`		`- collapseSectionHeader?.handleChangeToOpenState()`
`75`	`72`	`openSection(sectionIndex, animated: animated)`
`76`	`73`	`didTapSectionHeaderView?(sectionIndex, true)`
`77`	`74`	`}`
`@@ -82,6 +79,9 @@ open class CollapseTableView: UITableView {`
`82`	`79`	`return`
`83`	`80`	`}`
`84`	`81`	`setSectionAtIndex(sectionIndex, open: true)`
	`82`	`+ if let headerView = headerView(forSection: sectionIndex) as? CollapseSectionHeader {`
	`83`	`+ headerView.updateViewForOpenState(animated: true)`
	`84`	`+ }`
`85`	`85`	`if animated {`
`86`	`86`	`if let indexPathsToInsert = indexPathsForRowsInSectionAtIndex(sectionIndex) {`
`87`	`87`	`insertRows(at: indexPathsToInsert, with: .top)`
`@@ -92,7 +92,13 @@ open class CollapseTableView: UITableView {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public func closeSection(_ sectionIndex: Int, animated: Bool) {`
	`95`	`+ if sectionIndex >= sectionStates.count {`
	`96`	`+ return`
	`97`	`+ }`
`95`	`98`	`setSectionAtIndex(sectionIndex, open: false)`
	`99`	`+ if let headerView = headerView(forSection: sectionIndex) as? CollapseSectionHeader {`
	`100`	`+ headerView.updateViewForCloseState(animated: true)`
	`101`	`+ }`
`96`	`102`	`if animated {`
`97`	`103`	`if let indexPathsToDelete = indexPathsForRowsInSectionAtIndex(sectionIndex) {`
`98`	`104`	`deleteRows(at: indexPathsToDelete, with: .top)`
`@@ -134,7 +140,7 @@ open class CollapseTableView: UITableView {`
`134`	`140`	`guard let view = sender.view, view.tag >= 0 else {`
`135`	`141`	`return`
`136`	`142`	`}`
`137`		`- toggleSection(view.tag, sectionView: view, animated: true)`
	`143`	`+ toggleSection(view.tag, animated: true)`
`138`	`144`	`}`
`139`	`145`	`}`
`140`	`146`
`@@ -181,10 +187,17 @@ extension CollapseTableView: UITableViewDelegate {`
`181`	`187`	`}`
`182`	`188`	`}`
`183`	`189`	`if !tapGestureFound {`
`184`		`- view.tag = section`
`185`	`190`	`view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(handleTapGesture(_:))))`
`186`	`191`	`}`
`187`	`192`	`}`
	`193`	`+ view.tag = section`
	`194`	`+ if let collapseSectionHeader = view as? CollapseSectionHeader {`
	`195`	`+ if isOpenSection(section) {`
	`196`	`+ collapseSectionHeader.updateViewForOpenState(animated: false)`
	`197`	`+ } else {`
	`198`	`+ collapseSectionHeader.updateViewForCloseState(animated: false)`
	`199`	`+ }`
	`200`	`+ }`
`188`	`201`	`return view`
`189`	`202`	`}`
`190`	`203`	`}`