Changing CITreeView Class For Manul Adding

cenksk · Feb 1, 2018 · 909273c · 909273c
1 parent 26743d4
commit 909273c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/CITreeViewClasses/CITreeView.swift b/CITreeViewClasses/CITreeView.swift
@@ -10,8 +10,8 @@ import UIKit
 
 protocol CITreeViewDataSource {
     func treeView(_ treeView:CITreeView, atIndexPath indexPath:IndexPath, withTreeViewNode treeViewNode:CITreeViewNode) -> UITableViewCell
-    func treeViewSelectedNodeChildren(for treeViewNodeItem:AnyObject) -> [AnyObject]
-    func treeViewDataArray() -> [AnyObject]
+    func treeViewSelectedNodeChildren(for treeViewNodeItem:Any) -> [Any]
+    func treeViewDataArray() -> [Any]
 }
 
 protocol CITreeViewDelegate {
@@ -68,18 +68,20 @@ class CITreeView: UITableView {
         self.endUpdates()
     }
 
-    fileprivate func collapseRows(for treeViewNode: CITreeViewNode, atIndexPath indexPath: IndexPath) {
+    fileprivate func collapseRows(for treeViewNode: CITreeViewNode, atIndexPath indexPath: IndexPath ,completion: @escaping () -> Void) {
 
         if #available(iOS 11.0, *) {
             self.performBatchUpdates({
                 deleteRows()
             }, completion: { (complete) in
                 self.treeViewDelegate?.didCollapseTreeViewNode(treeViewNode: treeViewNode, atIndexPath:indexPath)
+                completion()
             })
         } else {
             CATransaction.begin()
             CATransaction.setCompletionBlock({
                 self.treeViewDelegate?.didCollapseTreeViewNode(treeViewNode: treeViewNode, atIndexPath: indexPath)
+                completion()
             })
             deleteRows()
             CATransaction.commit()
@@ -126,25 +128,26 @@ extension CITreeView : UITableViewDelegate {
         var willExpandIndexPath = indexPath
         if (selectedTreeViewNode?.expand)! {
             treeViewController.collapseRows(for: selectedTreeViewNode!, atIndexPath: indexPath)
-            collapseRows(for: self.selectedTreeViewNode!, atIndexPath: indexPath)
+            collapseRows(for: self.selectedTreeViewNode!, atIndexPath: indexPath){}
         }
         else
         {
-            if collapseNoneSelectedRows, selectedTreeViewNode?.level == 0 {
-                if let collapsedTreeViewNode = treeViewController.collapseAllRows() {
-                    if treeViewController.indexPathsArray.count > 0 {
-                        collapseRows(for: collapsedTreeViewNode, atIndexPath: indexPath)
-                        for (index, treeViewNode) in mainDataArray.enumerated() {
-                            if treeViewNode == selectedTreeViewNode {
-                                willExpandIndexPath.row = index
-                            }
+            if collapseNoneSelectedRows, selectedTreeViewNode?.level == 0, let collapsedTreeViewNode = treeViewController.collapseAllRows(), treeViewController.indexPathsArray.count > 0 {
+
+                collapseRows(for: collapsedTreeViewNode, atIndexPath: indexPath){
+                    for (index, treeViewNode) in self.mainDataArray.enumerated() {
+                        if treeViewNode == self.selectedTreeViewNode {
+                            willExpandIndexPath.row = index
                         }
                     }
+                    self.treeViewController.expandRows(atIndexPath: willExpandIndexPath, with: self.selectedTreeViewNode!)
+                    self.expandRows(for: self.selectedTreeViewNode!, withSelected: indexPath)
                 }
+
+            }else{
+                treeViewController.expandRows(atIndexPath: willExpandIndexPath, with: selectedTreeViewNode!)
+                expandRows(for: self.selectedTreeViewNode!, withSelected: indexPath)
             }
-            treeViewController.expandRows(atIndexPath: willExpandIndexPath, with: selectedTreeViewNode!)
-
-            expandRows(for: self.selectedTreeViewNode!, withSelected: indexPath)
         }
     }
 }
@@ -169,7 +172,7 @@ extension CITreeView : UITableViewDataSource {
 }
 
 extension CITreeView : CITreeViewControllerDelegate {
-    func getChildren(forTreeViewNodeItem item: AnyObject, with indexPath: IndexPath) -> [AnyObject] {
+    func getChildren(forTreeViewNodeItem item: Any, with indexPath: IndexPath) -> [Any] {
         return (self.treeViewDataSource?.treeViewSelectedNodeChildren(for: item))!
     }
 

diff --git a/CITreeViewClasses/CITreeViewController.swift b/CITreeViewClasses/CITreeViewController.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 protocol CITreeViewControllerDelegate : NSObjectProtocol {
-    func getChildren(forTreeViewNodeItem item:AnyObject, with indexPath:IndexPath) -> [AnyObject]
+    func getChildren(forTreeViewNodeItem item:Any, with indexPath:IndexPath) -> [Any]
     func willExpandTreeViewNode(treeViewNode:CITreeViewNode, atIndexPath: IndexPath)
     func willCollapseTreeViewNode(treeViewNode:CITreeViewNode, atIndexPath: IndexPath)
 }
@@ -25,7 +25,7 @@ class CITreeViewController:NSObject  {
     }
 
     //MARK: Tree View Nodes Functions
-    func addTreeViewNode(with item:AnyObject){
+    func addTreeViewNode(with item:Any){
         let treeViewNode = CITreeViewNode(item: item)
         let hasNodeBefore = treeViewNodes.filter{$0 == treeViewNode}
 
@@ -39,7 +39,7 @@ class CITreeViewController:NSObject  {
         return treeViewNodes[index]
     }
 
-    func insertTreeViewNode(with item:AnyObject, to index : Int)
+    func insertTreeViewNode(with item:Any, to index : Int)
     {
         let treeViewNode = CITreeViewNode(item: item)
         treeViewNodes.insert(treeViewNode, at: index)

diff --git a/CITreeViewClasses/CITreeViewNode.swift b/CITreeViewClasses/CITreeViewNode.swift
@@ -11,9 +11,9 @@ import UIKit
 class CITreeViewNode: NSObject {
     var expand:Bool = false
     var level:Int = 0
-    var item:AnyObject
+    var item:Any
 
-    init(item:AnyObject) {
+    init(item:Any) {
         self.item = item
     }
 }