vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix onremove across components

Browse source
This commit is contained in:
Leo Horie 2016-07-15 22:22:34 -04:00
parent 7a5978df59
commit 519b352c2c
2 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
render/render.js
View file

@ -354,12 +354,14 @@ module.exports = function($window) {
function onremove(vnode) { function onremove(vnode) {
if (vnode.attrs && vnode.attrs.onremove) vnode.attrs.onremove.call(vnode.state, 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.tag.onremove) vnode.tag.onremove.call(vnode.state, vnode)
if (vnode.instance != null) onremove(vnode.instance)
var children = vnode.children else {
if (children instanceof Array) { var children = vnode.children
for (var i = 0; i < children.length; i++) { if (children instanceof Array) {
var child = children[i] for (var i = 0; i < children.length; i++) {
if (child != null) onremove(child) var child = children[i]
if (child != null) onremove(child)
}
} }
} }
} }

33
render/tests/test-onremove.js
View file

@ -79,6 +79,39 @@ o.spec("onremove", function() {
o(remove.this).equals(vnode.state) o(remove.this).equals(vnode.state)
o(remove.args[0]).equals(vnode) o(remove.args[0]).equals(vnode)
}) })
o("calls onremove on nested component", function() {
var spy = o.spy()
var comp = {
view: function() {return m(outer)}
}
var outer = {
view: function() {return m(inner)}
}
var inner = {
onremove: spy,
view: function() {return m("div")}
}
render(root, {tag: comp})
render(root, null)
o(spy.callCount).equals(1)
})
o("calls onremove on nested component child", function() {
var spy = o.spy()
var comp = {
view: function() {return m(outer)}
}
var outer = {
view: function() {return m(inner, m("a", {onremove: spy}))}
}
var inner = {
view: function(vnode) {return m("div", vnode.children)}
}
render(root, {tag: comp})
render(root, null)
o(spy.callCount).equals(1)
})
o("does not set onremove as an event handler", function() { o("does not set onremove as an event handler", function() {
var remove = o.spy() var remove = o.spy()
var vnode = {tag: "div", attrs: {onremove: remove}, children: []} var vnode = {tag: "div", attrs: {onremove: remove}, children: []}