Look up the view and hooks on the state object (paves the way for MithrilJS#618).

Author: pygy

render/render.js

@@ -95,8 +95,8 @@ module.exports = function($window) {
 		if (!vnode.state) vnode.state = {}
 		assign(vnode.state, vnode.tag)
 
-		initLifecycle(vnode.tag, vnode, hooks)
-		vnode.instance = Vnode.normalize(vnode.tag.view.call(vnode.state, vnode))
+		initLifecycle(vnode.state, vnode, hooks)
+		vnode.instance = Vnode.normalize(vnode.state.view.call(vnode.state, vnode))
 		if (vnode.instance != null) {
 			if (vnode.instance === vnode) throw Error("A view cannot return the vnode it received as arguments")
 			var element = createNode(vnode.instance, hooks, ns)
@@ -257,8 +257,8 @@ module.exports = function($window) {
 		}
 	}
 	function updateComponent(parent, old, vnode, hooks, nextSibling, recycling, ns) {
-		vnode.instance = Vnode.normalize(vnode.tag.view.call(vnode.state, vnode))
-		updateLifecycle(vnode.tag, vnode, hooks, recycling)
+		vnode.instance = Vnode.normalize(vnode.state.view.call(vnode.state, vnode))
+		updateLifecycle(vnode.state, vnode, hooks, recycling)
 		if (vnode.instance != null) {
 			if (old.instance == null) insertNode(parent, createNode(vnode.instance, hooks, ns), nextSibling)
 			else updateNode(parent, old.instance, vnode.instance, hooks, nextSibling, recycling, ns)
@@ -347,9 +347,9 @@ module.exports = function($window) {
 			expected++
 			vnode.attrs.onbeforeremove.call(vnode.state, vnode, once(continuation))
 		}
-		if (typeof vnode.tag !== "string" && vnode.tag.onbeforeremove) {
+		if (typeof vnode.tag !== "string" && vnode.state.onbeforeremove) {
 			expected++
-			vnode.tag.onbeforeremove.call(vnode.state, vnode, once(continuation))
+			vnode.state.onbeforeremove.call(vnode.state, vnode, once(continuation))
 		}
 		continuation()
 		function continuation() {
@@ -374,7 +374,7 @@ module.exports = function($window) {
 	}
 	function onremove(vnode) {
 		if (vnode.attrs && vnode.attrs.onremove) vnode.attrs.onremove.call(vnode.state, vnode)
-		if (typeof vnode.tag !== "string" && vnode.tag.onremove) vnode.tag.onremove.call(vnode.state, vnode)
+		if (typeof vnode.tag !== "string" && vnode.state.onremove) vnode.state.onremove.call(vnode.state, vnode)
 		if (vnode.instance != null) onremove(vnode.instance)
 		else {
 			var children = vnode.children
@@ -500,7 +500,7 @@ module.exports = function($window) {
 	function shouldUpdate(vnode, old) {
 		var forceVnodeUpdate, forceComponentUpdate
 		if (vnode.attrs != null && typeof vnode.attrs.onbeforeupdate === "function") forceVnodeUpdate = vnode.attrs.onbeforeupdate.call(vnode.state, vnode, old)
-		if (typeof vnode.tag !== "string" && typeof vnode.tag.onbeforeupdate === "function") forceComponentUpdate = vnode.tag.onbeforeupdate.call(vnode.state, vnode, old)
+		if (typeof vnode.tag !== "string" && typeof vnode.state.onbeforeupdate === "function") forceComponentUpdate = vnode.state.onbeforeupdate.call(vnode.state, vnode, old)
 		if (!(forceVnodeUpdate === undefined && forceComponentUpdate === undefined) && !forceVnodeUpdate && !forceComponentUpdate) {
 			vnode.dom = old.dom
 			vnode.domSize = old.domSize