Merge e38a504 into e026d9e

preactjs · Aug 5, 2017 · 530fa14 · 530fa14
2 parents e026d9e + e38a504
commit 530fa14
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "preact",
-  "version": "8.2.1",
+  "version": "8.2.2",
   "description": "Fast 3kb React alternative with the same ES6 API. Components & Virtual DOM.",
   "main": "dist/preact.js",
   "jsnext:main": "dist/preact.esm.js",
@@ -120,13 +120,21 @@
   },
   "babel": {
     "presets": [
-      ["env", {
-        "loose": true,
-        "exclude": ["transform-es2015-typeof-symbol"],
-        "targets": {
-          "browsers": ["last 2 versions", "IE >= 9"]
+      [
+        "env",
+        {
+          "loose": true,
+          "exclude": [
+            "transform-es2015-typeof-symbol"
+          ],
+          "targets": {
+            "browsers": [
+              "last 2 versions",
+              "IE >= 9"
+            ]
+          }
         }
-      }]
+      ]
     ],
     "plugins": [
       "transform-object-rest-spread",

diff --git a/src/vdom/index.js b/src/vdom/index.js
@@ -35,7 +35,9 @@ export function isNamedNode(node, nodeName) {
  */
 export function getNodeProps(vnode) {
 	let props = extend({}, vnode.attributes);
-	props.children = vnode.children;
+	if (vnode.children!==undefined) {
+		props.children = vnode.children;
+	}
 
 	let defaultProps = vnode.nodeName.defaultProps;
 	if (defaultProps!==undefined) {