Merge pull request #62 from GeekTree0101/feature/VEditorKit-Improvement-safe-and-performance

improve unused _ASTableCellView manage safe and performance

Author: OhKanghoon

Example/VEditorKit/Controllers/EditorNodeController.swift

@@ -221,25 +221,17 @@ extension EditorNodeController {
     }
 
     @objc func pushXMLViewer() {
-        self.node.synchronizeFetchContents { [weak self] () in
-            
-            guard let output = self?.node.buildXML(packageTag: "content") else {
-                return
-            }
-            let vc = XMLViewController.init(output)
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
+        self.node.synchronizeFetchContents()
+        guard let output = self.node.buildXML(packageTag: "content") else { return }
+        let vc = XMLViewController.init(output)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
 
     @objc func previewViewer() {
-        self.node.synchronizeFetchContents { [weak self] () in
-            guard let xmlString = self?.node
-                .buildXML(packageTag: "content") else {
-                    return
-            }
-            let vc = EditorNodeController(isEditMode: false, xmlString: xmlString)
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
+        self.node.synchronizeFetchContents()
+        let xmlString = self.node.buildXML(packageTag: "content")
+        let vc = EditorNodeController(isEditMode: false, xmlString: xmlString)
+        self.navigationController?.pushViewController(vc, animated: true)
     }
 }
 

VEditorKit/Classes/VEditorNode.swift

@@ -69,7 +69,7 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
         }
     }
 
-    open var activeTextContainCellNode: VEditorTextCellNode? {
+    open weak var activeTextContainCellNode: VEditorTextCellNode? {
         didSet {
             self.observeActiveTextNode()
         }
@@ -93,6 +93,7 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
 
     private var typingControls: [VEditorTypingControlNode] = []
     private var activeTextDisposeBag = DisposeBag()
+    private let synchronizeContentLock = NSLock()
 
     public init(editorRule: VEditorRule,
                 controlAreaNode: ASDisplayNode?) {
@@ -194,7 +195,6 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
                     .disposed(by: cellNode.disposeBag)
 
                 cellNode.rx.failed
-                    .observeOn(MainScheduler.instance)
                     .bind(to: self.rx.deleteContent(animated: true))
                     .disposed(by: cellNode.disposeBag)
 
@@ -235,6 +235,27 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
         }
     }
 
+    private func removeUnusedInternalASTableCellViewIfNeeds() {
+        // Bug Issue:  https://github.com/TextureGroup/Texture/issues/1407
+        let currentActiveTextASCellView = self.activeTextContainCellNode?.view.superview?.superview
+        
+        let invalidSubViews = self.tableNode.view.subviews
+            .filter({ subView -> Bool in
+                return !self.tableNode.view.visibleCells.map({ $0.frame }).contains(subView.frame)
+            })
+            .filter({ $0 != currentActiveTextASCellView })
+        
+        guard !invalidSubViews.filter({ $0 != currentActiveTextASCellView }).isEmpty else { return }
+        
+        for view in invalidSubViews {
+            view.removeFromSuperview()
+        }
+    }
+    
+    open func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        self.removeUnusedInternalASTableCellViewIfNeeds()
+    }
+    
     /**
      Register Typing Control Nodes
 
@@ -531,8 +552,10 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
      - section: editor target section
      - complate: complate syncronize callback
      */
-    open func synchronizeFetchContents(in section: Int = 0,
-                                       _ complate: @escaping () -> Void) {
+    open func synchronizeFetchContents(in section: Int = 0) {
+        defer { self.synchronizeContentLock.unlock() }
+        self.synchronizeContentLock.lock()
+        
         let numberOfSection = self.tableNode.numberOfSections
         guard section >= 0, section < numberOfSection else {
             fatalError("Invalid access section \(section) in \(numberOfSection)")
@@ -552,8 +575,6 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
                     .attributedString() else { return }
             self.editorContents[index] = currentAttributedText
         }
-        
-        complate()
     }
 
     /**
@@ -617,21 +638,10 @@ open class VEditorNode: ASDisplayNode, ASTableDelegate, ASTableDataSource {
             self.editorContents.remove(at: indexPath.row)
         }
 
-        for deleteIndexPath in deleteIndexPaths {
-            self.tableNode.view.cellForRow(at: deleteIndexPath)?.removeFromSuperview()
-        }
-        
         self.tableNode.performBatchUpdates({
             self.tableNode.deleteRows(at: deleteIndexPaths,
                                       with: animated ? .automatic: .none)
-        }, completion: { _ in
-            // Texture Bug Issue, ref: https://github.com/TextureGroup/Texture/issues/1407
-            _ = self.tableNode.view.subviews
-                .filter({ $0 is UITableViewCell })
-                .filter { $0.subviews.first?.subviews.isEmpty ?? false ||
-                    $0.subviews.first?.subviews.first is UIImageView }
-                .map { $0.removeFromSuperview() }
-        })
+        }, completion: nil)
     }
 
     /**
@@ -875,7 +885,12 @@ extension VEditorNode {
         switch scope {
         case .automatic:
             if let activeTextNode = self.activeTextNode {
-                return .splitIndex(activeTextNode.selectedRange.location)
+                if activeTextNode.selectedRange.location == 0,
+                    let indexPath = activeTextContainCellNode?.indexPath {
+                    return .indexPath(indexPath)
+                } else {
+                    return .splitIndex(activeTextNode.selectedRange.location)
+                }
             } else {
                 let lastIndex: Int = max(0, self.editorContents.count)
                 return .indexPath(.init(row: lastIndex, section: section))