Merge pull request #241 from google-fabric/falsey-children

Adds guard against falsey children
google-fabric · Apr 17, 2018 · b65e87f · b65e87f
2 parents 760d1c5 + dab1b1e
commit b65e87f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v1.4.1 (2018-04-17):
+
+Fixes false children bug #240. (Thanks for the report, @tiffanytangt!)
+
 ### v1.4.0 (2018-04-12):
 
 Dependency upgrades! No new features.

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ details about why and how we built this.
 
 See the [live demo](http://google-fabric.github.io/velocity-react/).
 
-**Latest version:** v1.4.0 Removes some React 16.3 deprecations and warnings
+**Latest version:** v1.4.1 Fixes a `null` child regression in v1.4.0
 
 *Note: v1.1.0 and later require React 0.14.x*
 *Note: v1.3.0 and later require React 15.3.x and should work with React 16*

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "velocity-react",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "React components to wrap Velocity animations",
   "main": "index.js",
   "scripts": {

diff --git a/src/velocity-transition-group.js b/src/velocity-transition-group.js
@@ -444,6 +444,12 @@ class VelocityTransitionGroup extends React.Component {
   }
 
   _wrapChild(child) {
+    // Need to guard against falsey children, which React will sometimes pass
+    // in.
+    if (!child) {
+      return null;
+    }
+
     return React.createElement(
       VelocityTransitionGroupChild,
       {