bug(cssTransition): pass 'appearing' param from Transition to CSSTran…

…sition
reactjs · Aug 3, 2017 · 93cec5d · 93cec5d
1 parent 8968fd6
commit 93cec5d
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 6 deletions.
diff --git a/src/CSSTransition.js b/src/CSSTransition.js
@@ -160,10 +160,10 @@ class CSSTransition extends React.Component {
     const { className } = this.getClassNames(appearing ? 'appear' : 'enter')
 
     this.removeClasses(node, 'exit');
-    addClass(node, className)
+    addClass(node, className);
 
     if (this.props.onEnter) {
-      this.props.onEnter(node)
+      this.props.onEnter(node, appearing);
     }
   }
 
@@ -172,18 +172,18 @@ class CSSTransition extends React.Component {
       appearing ? 'appear' : 'enter'
     );
 
-    this.reflowAndAddClass(node, activeClassName)
+    this.reflowAndAddClass(node, activeClassName);
 
     if (this.props.onEntering) {
-      this.props.onEntering(node)
+      this.props.onEntering(node, appearing);
     }
   }
 
   onEntered = (node, appearing) => {
     this.removeClasses(node, appearing ? 'appear' : 'enter');
 
     if (this.props.onEntered) {
-      this.props.onEntered(node)
+      this.props.onEntered(node, appearing);
     }
   }
 

diff --git a/test/CSSTransition-test.js b/test/CSSTransition-test.js
@@ -90,7 +90,7 @@ describe('CSSTransition', () => {
           <div/>
         </CSSTransition>
       )
-      .render();
+        .render();
 
       instance.props({
         in: true,
@@ -112,6 +112,70 @@ describe('CSSTransition', () => {
         }
       });
     });
+
+    describe('isAppearing', () => {
+
+      it('should be false', done => {
+
+        instance = tsp(
+          <CSSTransition
+            timeout={10}
+            classNames="test"
+          >
+            <div/>
+          </CSSTransition>
+        )
+          .render();
+
+
+        instance.props({
+          in: true,
+          onEnter(node, isAppearing){
+            expect(isAppearing).toEqual(false);
+          },
+
+          onEntering(node, isAppearing){
+            expect(isAppearing).toEqual(false);
+          },
+
+          onEntered(node, isAppearing){
+            expect(isAppearing).toEqual(false);
+            done();
+          }
+        });
+      });
+
+      it('should be true', done => {
+
+        instance = tsp(
+          <CSSTransition
+            timeout={10}
+            appear={true}
+            in={true}
+            classNames="test"
+          >
+            <div/>
+          </CSSTransition>
+        )
+          .render();
+
+        instance.props({
+          onEnter(node, isAppearing){
+            expect(isAppearing).toEqual(true);
+          },
+
+          onEntering(node, isAppearing){
+            expect(isAppearing).toEqual(true);
+          },
+
+          onEntered(node, isAppearing){
+            expect(isAppearing).toEqual(true);
+            done();
+          }
+        });
+      });
+
+    });
   });
 
   describe('exiting', ()=> {