Adds new Expansion style

ExpandableCell/ExpandableProcessor.swift

@@ -84,6 +84,24 @@ class ExpandableProcessor {
         expandableDatasPerSection[indexPath.section] = expandableDatas
     }
 
+    func deleteAllIndexPathsInSection(_ section: Int) -> (expandedIndexPaths:[IndexPath], indexPaths: [IndexPath]) {
+        var expandedIndexPaths = [IndexPath]()
+        var indexPaths = [IndexPath]()
+
+        if let expandableDataInSection = expandableDatasPerSection[section] {
+            for expandableData in expandableDataInSection {
+                indexPaths.append(expandableData.indexPath)
+                for expandedIndexPath in expandableData.expandedIndexPaths {
+                    expandedIndexPaths.append(expandedIndexPath)
+                }
+            }
+        }
+
+        expandableDatasPerSection.removeValue(forKey: section)
+
+        return (expandedIndexPaths, indexPaths)
+    }
+
     func deleteAllIndexPaths() -> (expandedIndexPaths:[IndexPath], indexPaths: [IndexPath]) {
         var expandedIndexPaths = [IndexPath]()
         var indexPaths = [IndexPath]()

ExpandableCell/ExpandableTableView.swift

@@ -34,6 +34,7 @@ extension ExpandableTableView {
     public enum ExpansionStyle {
         case multi
         case single
+        case singlePerSection
     }
 }
 
@@ -52,14 +53,20 @@ extension ExpandableTableView: UITableViewDataSource, UITableViewDelegate {
         let expandedData = expandableProcessor.isExpandedCell(at: indexPath)
         if !expandedData.isExpandedCell {
             delegate.expandableTableView(self, didSelectRowAt: indexPath)
+
             if expandableProcessor.isExpandable(at: indexPath) {
+                // Check if there are other rows expanded in section
+                let noExpandedRowsInSection = expandableProcessor.numberOfExpandedRowsInSection(section: indexPath.section) == 0
+
                 if let cell = self.cellForRow(at: indexPath) {
                     if self.expansionStyle == .single {
                         closeAll()
+                    } else if self.expansionStyle == .singlePerSection && !noExpandedRowsInSection {
+                        closeAllInSection(indexPath.section)
                     }
                     if let correctIndexPath = self.indexPath(for: cell) {
-                        // Check if there are other rows expanded in section
-                        if expandableProcessor.numberOfExpandedRowsInSection(section: correctIndexPath.section) == 0 {
+                        // If no other row is expanded in section
+                        if noExpandedRowsInSection {
                             let originalIndexPath = expandableProcessor.original(indexPath: correctIndexPath)
                             open(indexPath: originalIndexPath, delegate: delegate)
                         } else {
@@ -250,6 +257,25 @@ extension ExpandableTableView {
         _ = closeAllIndexPaths()
     }
 
+    public func closeAllInSection(_ section: Int) {
+        _ = closeAllIndexPathsInSection(section)
+    }
+
+    public func closeAllIndexPathsInSection(_ section: Int) -> [IndexPath] {
+        let allIndexPaths = expandableProcessor.deleteAllIndexPathsInSection(section)
+        let expandedIndexPaths = allIndexPaths.expandedIndexPaths
+        let indexPaths = allIndexPaths.indexPaths
+
+        for indexPath in indexPaths {
+            if let cell = self.cellForRow(at: indexPath) as? ExpandableCell {
+                cell.close()
+            }
+        }
+
+        self.deleteRows(at: expandedIndexPaths, with: animation)
+        return indexPaths
+    }
+
     public func close(at indexPath: IndexPath) {
         guard let cell = self.cellForRow(at: indexPath) as? ExpandableCell else { return }
         if cell.isExpanded() {

README.md

@@ -53,7 +53,7 @@ Set required `ExpandableDelegate` method.
 | Property | Type | Explanation |
 | -------- | ---- | ----------- |
 | `animation` | `UITableViewRowAnimation` | Animation when open and close | 
-| `expansionStyle` | `ExpandableTableView.ExpansionStyle` | Select expansion type: single: One row at a time, multi: Any number of rows at a time| 
+| `expansionStyle` | `ExpandableTableView.ExpansionStyle` | Select expansion type:<br>**single** - one row at a time;<br>**singlePerSection** - one row at a time, per section;<br>**multi** - any number of rows at a time| 
 
 #### ExpandableTableView methods
 | Method | Explanation |