nodes api improvements

Author: psharanda

Demos/Demos/TableViewController.swift

@@ -86,6 +86,18 @@ extension TableViewController: UITableViewDelegate, UITableViewDataSource {
     }
 }
 
+class MyView: UIView {
+    
+    var color: UIColor? {
+        set {
+            backgroundColor = newValue
+        }
+        get {
+            return backgroundColor
+        }
+    }
+}
+
 class SampleCell: UITableViewCell {
 
     override func layoutSubviews() {
@@ -111,6 +123,14 @@ class SampleCell: UITableViewCell {
         let rootNode: RootNode
     }
 
+    override func prepareForReuse() {
+        super.prepareForReuse()
+        
+        if let v = contentView.findViewWithTag(Tags.Highlight1) as? MyView {
+            v.color = UIColor.redColor().colorWithAlphaComponent(0.2)
+        }
+    }
+    
     var model: SampleModel?
     var cache: Cache?
 
@@ -131,9 +151,9 @@ class SampleCell: UITableViewCell {
             return v
         }
 
-        let h1Node = Node(tag: Tags.Highlight1) {
-            let v = $0 ?? UIView()
-            v.backgroundColor = UIColor.redColor().colorWithAlphaComponent(0.2)
+        let h1Node = Node<MyView>(tag: Tags.Highlight1) {
+            let v = $0 ?? MyView()
+            
             return v
         }
 

LayoutOps/LayoutOps/ImageNode.swift

@@ -5,10 +5,10 @@
 
 import UIKit
 
-public class ImageNode: Node {
+public class ImageNode: AnyNode {
 
     private let image: UIImage
-    public init<T: UIImageView>(tag: Taggable, image: UIImage, subnodes: [Node] = [], initializer: (T?)->T) {
+    public init<T: UIImageView>(tag: Taggable, image: UIImage, subnodes: [AnyNode] = [], initializer: (T?)->T) {
         self.image = image
         super.init(tag: tag, subnodes: subnodes) { (imageView: T?) -> T in
             let imgView = initializer(imageView)

LayoutOps/LayoutOps/LabelNode.swift

@@ -10,10 +10,10 @@ public enum LabelNodeString {
     case Attributed(NSAttributedString)
 }
 
-public class LabelNode: Node {
+public class LabelNode: AnyNode {
 
     private let text: LabelNodeString
-    public init<T: UILabel>(tag: Taggable, text: LabelNodeString, subnodes: [Node] = [], initializer: (T?)->T) {
+    public init<T: UILabel>(tag: Taggable, text: LabelNodeString, subnodes: [AnyNode] = [], initializer: (T?)->T) {
         self.text = text
         super.init(tag: tag, subnodes: subnodes) { (label: T?) -> T in
 
@@ -25,7 +25,6 @@ public class LabelNode: Node {
                 l.font = font
                 l.text = string
             }
-            initializer(l)
             return l
         }
     }

LayoutOps/LayoutOps/Node.swift

@@ -41,9 +41,27 @@ extension UIView {
             return objc_getAssociatedObject(self, &key) as? String
         }
     }
+    
+    private func _findViewWithTag(tag: Taggable) -> UIView? {
+        if tag.tag == stringTag {
+            return self
+        }
+        
+        for v in subviews {
+            if let v = v.findViewWithTag(tag) {
+                return v
+            }
+        }
+        
+        return nil
+    }
+    
+    public func findViewWithTag<T: UIView>(tag: Taggable) -> T? {
+        return _findViewWithTag(tag).flatMap { $0 as? T }
+    }
 }
 
-public class Node: Layoutable {
+public class AnyNode: Layoutable {
 
     public var bounds: CGRect {
         return CGRect(x: 0, y: 0, width: frame.width, height: frame.height)
@@ -55,8 +73,8 @@ public class Node: Layoutable {
         return size
     }
 
-    private var subnodes: [Node]
-    private var supernode: Node?
+    private var subnodes: [AnyNode]
+    private var supernode: AnyNode?
 
     public weak var parent: Layoutable? {
         return supernode
@@ -71,7 +89,7 @@ public class Node: Layoutable {
 
     private let tag: Tag
 
-    public init<T: UIView>(tag: Taggable, subnodes: [Node] = [], initializer: (T?)->T) {
+    public init<T: UIView>(tag: Taggable, subnodes: [AnyNode] = [], initializer: (T?)->T) {
 
         self.tag = .Tagged(tag)
         self.initializer = {
@@ -84,7 +102,7 @@ public class Node: Layoutable {
         }
     }
 
-    private init(rs: CGSize, subnodes: [Node]) {
+    private init(rs: CGSize, subnodes: [AnyNode]) {
 
         self.tag = .Root
 
@@ -98,7 +116,7 @@ public class Node: Layoutable {
         }
     }
 
-    private func installInView(rootView: UIView) {
+    public func installInRootView(rootView: UIView) {
 
         switch tag {
         case .Root:
@@ -117,30 +135,38 @@ public class Node: Layoutable {
 
             view.frame = frame
             subnodes.forEach {
-                $0.installInView(view)
+                $0.installInRootView(view)
             }
-            
         }
     }
 }
 
-public class RootNode: Node {
-    //root node
-    public init(size: CGSize, subnodes: [Node]) {
+public class RootNode: AnyNode {
+
+    public init(size: CGSize, subnodes: [AnyNode]) {
         super.init(rs: size, subnodes: subnodes)
     }
 
     public override func sizeThatFits(size: CGSize) -> CGSize {
         fatalError("RootNode is not intended to respond sizeThatFits")
     }
 
-    public func installInRootView(rootView: UIView) {
+    public override func installInRootView(rootView: UIView) {
         subnodes.forEach {
-            $0.installInView(rootView)
+            $0.installInRootView(rootView)
         }
     }
 }
 
+public class Node<T: UIView>: AnyNode {
+    
+    public override init(tag: Taggable, subnodes: [AnyNode] = [], initializer: (T?)->T) {
+        super.init(tag: tag, subnodes: subnodes) { (view: T?) -> T in            
+            return initializer(view)
+        }
+    }
+    
+}