Do not normalise component children on ingestion (#2155)

* Do not normalise component children on ingestion

* Don't normalise vnode children

* Component hyperscript tests: children aren't normalised

* test, not text

* Update change log: #2155 & #2064
This commit is contained in:
Barney Carroll 2018-05-29 10:53:16 +01:00 committed by GitHub
parent 0f498e0aec
commit 1579fe8430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 15 deletions

View file

@ -21,6 +21,7 @@
<script src="test-fragment.js"></script>
<script src="test-normalize.js"></script>
<script src="test-normalizeChildren.js"></script>
<script src="test-normalizeComponentChildren.js"></script>
<script src="test-createText.js"></script>
<script src="test-createHTML.js"></script>
<script src="test-createFragment.js"></script>

View file

@ -551,19 +551,29 @@ o.spec("hyperscript", function() {
o.spec("components", function() {
o("works with POJOs", function() {
var component = {
view: function() {
return m("div")
}
view: function() {}
}
var vnode = m(component, {id: "a"}, "b")
o(vnode.tag).equals(component)
o(vnode.attrs.id).equals("a")
o(vnode.children.length).equals(1)
o(vnode.children[0].tag).equals("#")
o(vnode.children[0].children).equals("b")
o(vnode.children[0]).equals("b")
})
o("works with functions", function() {
o("works with constructibles", function() {
var component = o.spy()
component.prototype.view = function() {}
var vnode = m(component, {id: "a"}, "b")
o(component.callCount).equals(0)
o(vnode.tag).equals(component)
o(vnode.attrs.id).equals("a")
o(vnode.children.length).equals(1)
o(vnode.children[0]).equals("b")
})
o("works with closures", function () {
var component = o.spy()
var vnode = m(component, {id: "a"}, "b")
@ -573,8 +583,7 @@ o.spec("hyperscript", function() {
o(vnode.tag).equals(component)
o(vnode.attrs.id).equals("a")
o(vnode.children.length).equals(1)
o(vnode.children[0].tag).equals("#")
o(vnode.children[0].children).equals("b")
o(vnode.children[0]).equals("b")
})
})
})

View file

@ -0,0 +1,34 @@
"use strict"
var o = require("../../ospec/ospec")
var m = require("../../render/hyperscript")
var domMock = require("../../test-utils/domMock")
var vdom = require("../../render/render")
o.spec("component children", function () {
var $window = domMock()
var root = $window.document.createElement("div")
var render = vdom($window).render
o.spec("component children", function () {
var component = {
view: function (vnode) {
return vnode.children
}
}
var vnode = m(component, "a")
render(root, vnode)
o("are not normalized on ingestion", function () {
o(vnode.children[0]).equals("a")
})
o("are normalized upon view interpolation", function () {
o(vnode.instance.children.length).equals(1)
o(vnode.instance.children[0].tag).equals("#")
o(vnode.instance.children[0].children).equals("a")
})
})
})