Merge pull request #253 from google-fabric/transition-timeout

Adds a timeout prop to Transition in test
google-fabric · May 9, 2019 · de6ba6f · de6ba6f
2 parents 5815dbf + 1cf7ab5
commit de6ba6f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### v1.4.3 (2019-05-09):
+
+Adds `timeout` prop to `Transition` in test to avoid a PropTypes warning.
+
 ### v1.4.2 (2018-11-14):
 
 Uses a `<Transition>` element in test/server mode to keep react-dom from warning

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "velocity-react",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "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
@@ -203,7 +203,8 @@ class VelocityTransitionGroup extends React.Component {
             // Wrapping in a no-op Transition to consume the props that
             // TransitionGroup gives its children. Fixes react-dom warnings
             // in test for those props appearing on divs and such.
-            child => child && React.createElement(Transition, {}, child)
+            child =>
+              child && React.createElement(Transition, { timeout: 0 }, child)
           )
     );
   }