fix bug from issue #460

src/Transition.js

@@ -325,15 +325,18 @@ class Transition extends React.Component {
   onTransitionEnd(node, timeout, handler) {
     this.setNextCallback(handler)
 
-    if (node) {
-      if (this.props.addEndListener) {
-        this.props.addEndListener(node, this.nextCallback)
-      }
-      if (timeout != null) {
-        setTimeout(this.nextCallback, timeout)
-      }
-    } else {
+    const isNotHaveTimeoutOrListener = timeout == null && !this.props.addEndListener
+    if (!node || isNotHaveTimeoutOrListener) {
       setTimeout(this.nextCallback, 0)
+      return
+    }
+
+    if (this.props.addEndListener) {
+      this.props.addEndListener(node, this.nextCallback)
+    }
+
+    if (timeout != null) {
+      setTimeout(this.nextCallback, timeout)
     }
   }
 
@@ -442,9 +445,11 @@ Transition.propTypes = {
    * }}
    * ```
    *
-   * If the value of appear is not set, then the value from enter is taken.
+   * If the value of `appear` is not set, then the value from enter is taken.
+   *
+   * If the `enter` or `exit` value is `null` or `undefined`, then the timer is set to `0`
    *
-   * @type {number | { enter?: number, exit?: number }}
+   * @type {number | { enter: number, exit: number, appear?: number }}
    */
   timeout: (props, ...args) => {
     let pt = timeoutsShape

src/utils/PropTypes.js

@@ -5,8 +5,8 @@ export const timeoutsShape =
     ? PropTypes.oneOfType([
         PropTypes.number,
         PropTypes.shape({
-          enter: PropTypes.number,
-          exit: PropTypes.number,
+          enter: PropTypes.number.isRequired,
+          exit: PropTypes.number.isRequired,
           appear: PropTypes.number,
         }).isRequired
       ])

test/Transition-test.js

@@ -438,5 +438,48 @@ describe('Transition', () => {
 
       wrapper.setState({ in: false })
     })
+
+
+    it('should unmount at once if not have enter timeout', done => {
+      const wrapper = mount(
+        <UnmountTransition
+          initialIn={false}
+          timeout={{ exit: 10 }}
+          onEnter={() => {
+            expect(wrapper.getStatus()).toEqual(EXITED)
+            expect(ReactDOM.findDOMNode(wrapper)).toExist()
+
+            done()
+          }}
+        />
+      ).instance()
+
+      expect(wrapper.getStatus()).toEqual(UNMOUNTED)
+      expect(ReactDOM.findDOMNode(wrapper)).toBeNull()
+
+      wrapper.setState({ in: true })
+    })
+
+
+    it('should unmount at once if not have exit timeout', done => {
+      const wrapper = mount(
+        <UnmountTransition
+          initialIn
+          timeout={{ enter: 10 }}
+          onExited={() => {
+            setTimeout(() => {
+              expect(wrapper.getStatus()).toEqual(UNMOUNTED)
+              expect(ReactDOM.findDOMNode(wrapper)).not.toExist()
+              done()
+            })
+          }}
+        />
+      ).instance()
+
+      expect(wrapper.getStatus()).toEqual(ENTERED)
+      expect(ReactDOM.findDOMNode(wrapper)).toExist()
+
+      wrapper.setState({ in: false })
+    })
   })
 })