Merge pull request #47 from joshaber/parent

Support view-less Elements

Author: joshaber

External/SwiftBox

@@ -21,6 +21,6 @@ internal func markNeedsDisplay(view: ViewType) {
 	view.needsDisplay = true
 }
 
-internal func configureViewToAutoresize(view: ViewType) {
-	view.autoresizingMask = .ViewWidthSizable | .ViewHeightSizable
+internal func configureViewToAutoresize(view: ViewType?) {
+	view?.autoresizingMask = .ViewWidthSizable | .ViewHeightSizable
 }

Few-Mac/Mac.swift

@@ -10,7 +10,7 @@ import Foundation
 
 extension Element {
 	public func debugQuickLookObject() -> AnyObject? {
-		let realizedSelf = realize()
+		let realizedSelf = realize(nil)
 		return realizedSelf.view
 	}
 

Few-Mac/QuickLook.swift

@@ -48,6 +48,13 @@ private class FewScrollView: NSView {
 	}
 }
 
+private class RealizedScrollViewElement: RealizedElement {
+	private override func addRealizedViewForChild(child: RealizedElement) {
+		let scrollVew = view as! FewScrollView
+		scrollVew.scrollView.documentView = child.view
+	}
+}
+
 private class ScrollViewElement: Element {
 	private let didScroll: CGRect -> ()
 
@@ -64,13 +71,12 @@ private class ScrollViewElement: Element {
 		return view
 	}
 
-	private override func addRealizedChildView(childView: ViewType, selfView: ViewType) {
-		let scrollVew = selfView as! FewScrollView
-		scrollVew.scrollView.documentView = childView
+	private override func createRealizedElement(view: ViewType?, parent: RealizedElement?) -> RealizedElement {
+		return RealizedScrollViewElement(element: self, view: view, parent: parent)
 	}
 
-	private override func realize() -> RealizedElement {
-		let realizedElement = super.realize()
+	private override func realize(parent: RealizedElement?) -> RealizedElement {
+		let realizedElement = super.realize(parent)
 
 		let scrollView = realizedElement.view as! FewScrollView
 		let documentView = scrollView.scrollView.documentView as! NSView

Few-Mac/ScrollView.swift

@@ -21,21 +21,14 @@ private class FewListCell: NSTableCellView {
 			if element.canDiff(realizedElement.element) {
 				element.applyDiff(realizedElement.element, realizedSelf: realizedElement)
 			} else {
-				realizedElement.element.derealize()
-				realizedElement.view.removeFromSuperview()
+				realizedElement.remove()
 
-				let newRealizedElement = element.realize()
-				newRealizedElement.view.autoresizingMask = .ViewWidthSizable | .ViewHeightSizable
-				newRealizedElement.view.frame = bounds
-				addSubview(newRealizedElement.view)
+				let parent = RealizedElement(element: Element(), view: self, parent: nil)
+				self.realizedElement = element.realize(parent)
 			}
 		} else {
-			let newRealizedElement = element.realize()
-			newRealizedElement.view.autoresizingMask = .ViewWidthSizable | .ViewHeightSizable
-			newRealizedElement.view.frame = bounds
-			addSubview(newRealizedElement.view)
-
-			realizedElement = newRealizedElement
+			let parent = RealizedElement(element: Element(), view: self, parent: nil)
+			realizedElement = element.realize(parent)
 		}
 	}
 

Few-Mac/TableView.swift

@@ -29,6 +29,14 @@ private class FewScrollView: UIScrollView, UIScrollViewDelegate {
     }
 }
 
+private class RealizedScrollViewElement: RealizedElement {
+	private override func addRealizedViewForChild(child: RealizedElement) {
+		let scrollView = view as! FewScrollView
+		scrollView.subviews.first?.removeFromSuperview()
+		scrollView.addSubview <^> child.view
+	}
+}
+
 private class ScrollViewElement: Element {
     private let didScroll: CGRect -> ()
 
@@ -41,15 +49,13 @@ private class ScrollViewElement: Element {
     private override func createView() -> ViewType {
         return FewScrollView(frame: frame, didScroll: didScroll)
     }
+
+	private override func createRealizedElement(view: ViewType?, parent: RealizedElement?) -> RealizedElement {
+		return RealizedScrollViewElement(element: self, view: view, parent: parent)
+	}
 
-    private override func addRealizedChildView(childView: ViewType, selfView: ViewType) {
-        let scrollView = selfView as! FewScrollView
-        scrollView.subviews.first?.removeFromSuperview()
-        scrollView.addSubview(childView)
-    }
-    
-    private override func realize() -> RealizedElement {
-        let realizedElement = super.realize()
+	private override func realize(parent: RealizedElement?) -> RealizedElement {
+        let realizedElement = super.realize(parent)
 
         let scrollView = realizedElement.view as! FewScrollView
         if let element = children.first {

Few-iOS/ScrollView.swift

@@ -20,19 +20,14 @@ private class FewListCell: UITableViewCell {
             if element.canDiff(realizedElement.element) {
                 element.applyDiff(realizedElement.element, realizedSelf: realizedElement)
             } else {
-                realizedElement.element.derealize()
-                realizedElement.view.removeFromSuperview()
-                
-                let newRealizedElement = element.realize()
-                newRealizedElement.view.frame = bounds
-                addSubview(newRealizedElement.view)
+				realizedElement.remove()
+
+				let parent = RealizedElement(element: Element(), view: self, parent: nil)
+				self.realizedElement = element.realize(parent)
             }
         } else {
-            let newRealizedElement = element.realize()
-            newRealizedElement.view.frame = bounds
-            addSubview(newRealizedElement.view)
-            
-            realizedElement = newRealizedElement
+			let parent = RealizedElement(element: Element(), view: self, parent: nil)
+			realizedElement = element.realize(parent)
         }
     }
 }

Few-iOS/TableView.swift

@@ -17,6 +17,6 @@ internal func compareAndSetAlpha(view: UIView, alpha: CGFloat) {
 	}
 }
 
-internal func configureViewToAutoresize(view: ViewType) {
-	view.autoresizingMask = .FlexibleWidth | .FlexibleHeight
+internal func configureViewToAutoresize(view: ViewType?) {
+	view?.autoresizingMask = .FlexibleWidth | .FlexibleHeight
 }

Few-iOS/iOS.swift

@@ -40,6 +40,8 @@ public class Component<S>: Element {
 	/// Is the component a root?
 	private var root = false
 
+	private var parent: RealizedElement?
+
 	private var frameChangedTrampoline = TargetActionTrampoline()
 
 	/// Initializes the component with its initial state. The render function
@@ -80,11 +82,10 @@ public class Component<S>: Element {
 	}
 
 	final private func realizeNewRoot(newRoot: Element) {
-		let realized = newRoot.realize()
+		let realized = newRoot.realize(parent)
 
 		configureViewToAutoresize(realized.view)
 
-		realizedRoot?.view.removeFromSuperview()
 		realizedRoot = realized
 	}
 
@@ -93,7 +94,7 @@ public class Component<S>: Element {
 		newRoot.frame = frame
 
 		let node = newRoot.assembleLayoutNode()
-		var layout: Layout!
+		let layout: Layout
 		if root {
 			layout = node.layout(maxWidth: frame.size.width)
 		} else {
@@ -112,13 +113,8 @@ public class Component<S>: Element {
 			if newRoot.canDiff(rootElement) {
 				newRoot.applyDiff(rootElement, realizedSelf: realizedRoot)
 			} else {
-				let superview = realizedRoot!.view.superview!
-				rootElement.derealize()
-
+				realizedRoot?.remove()
 				realizeNewRoot(newRoot)
-				superview.addSubview(realizedRoot!.view)
-
-				newRoot.elementDidRealize(realizedRoot!)
 			}
 
 			componentDidRender()
@@ -169,14 +165,12 @@ public class Component<S>: Element {
 	public func addToView(hostView: ViewType) {
 		root = true
 		frame = hostView.bounds
-		performInitialRenderIfNeeded()
-		realizeRootIfNeeded()
-		hostView.addSubview(realizedRoot!.view)
-		rootElement?.elementDidRealize(realizedRoot!)
+		let parent = RealizedElement(element: self, view: hostView, parent: nil)
+		realize(parent)
 
 #if os(OSX)
 		hostView.postsFrameChangedNotifications = true
-		realizedRoot!.view.autoresizesSubviews = false
+		realizedRoot!.view?.autoresizesSubviews = false
 
 		frameChangedTrampoline.action = { [weak self] in
 			if let strongSelf = self {
@@ -289,9 +283,9 @@ public class Component<S>: Element {
 	public override func applyDiff(old: Element, realizedSelf: RealizedElement?) {
 		super.applyDiff(old, realizedSelf: realizedSelf)
 
-		// Use `unsafeBitCast` instead of `as` to avoid a runtime crash.
-		let oldComponent = unsafeBitCast(old, Component.self)
+		let oldComponent = old as! Component
 
+		parent = oldComponent.parent
 		root = oldComponent.root
 		state = oldComponent.state
 		rootElement = oldComponent.rootElement
@@ -300,20 +294,22 @@ public class Component<S>: Element {
 		renderNewRoot()
 	}
 
-	public override func realize() -> RealizedElement {
+	public override func realize(parent: RealizedElement?) -> RealizedElement {
+		self.parent = parent
+
 		performInitialRenderIfNeeded()
 		realizeRootIfNeeded()
-		return RealizedElement(element: self, view: realizedRoot!.view)
+		return super.realize(parent)
 	}
 
 	public override func derealize() {
 		componentWillDerealize()
 
-		rootElement?.derealize()
+		realizedRoot?.remove()
+		realizedRoot = nil
 		rootElement = nil
 
-		realizedRoot?.view.removeFromSuperview()
-		realizedRoot = nil
+		parent = nil
 
 		componentDidDerealize()
 	}