Merge 7fb5b00 into b49177c

fkhadra · Sep 24, 2018 · 94cd8f7 · 94cd8f7
2 parents b49177c + 7fb5b00
commit 94cd8f7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/dist/ReactToastify.css b/dist/ReactToastify.css
diff --git a/dist/ReactToastify.css.map b/dist/ReactToastify.css.map
diff --git a/dist/ReactToastify.js.map b/dist/ReactToastify.js.map
diff --git a/dist/ReactToastify.min.css b/dist/ReactToastify.min.css
diff --git a/scss/animations/_slide.scss b/scss/animations/_slide.scss
@@ -62,23 +62,23 @@
     }
 }
 
-@keyframes #{$rt-namespace}__slideOutUp {
+@keyframes #{$rt-namespace}__slideOutDown {
     from {
         @include transform;
     }
     to {
         visibility: hidden;
-        transform: translate3d(0, 110%, 0);
+        transform: translate3d(0, 500px, 0);
     }
 }
 
-@keyframes #{$rt-namespace}__slideOutDown {
+@keyframes #{$rt-namespace}__slideOutUp {
     from {
         @include transform;
     }
     to {
         visibility: hidden;
-        transform: translate3d(0, -110%, 0);
+        transform: translate3d(0, -500px, 0);
     }
 }
 

diff --git a/src/components/Toast.js b/src/components/Toast.js
@@ -22,7 +22,7 @@ function getY(e) {
     : e.clientY;
 }
 
-const noop = () => { };
+const noop = () => {};
 
 class Toast extends Component {
   static propTypes = {

diff --git a/src/components/ToastContainer.js b/src/components/ToastContainer.js
@@ -184,9 +184,9 @@ class ToastContainer extends Component {
     return closeButton === false
       ? false
       : cloneElement(closeButton, {
-        closeToast: () => this.removeToast(toastId),
-        type: type
-      });
+          closeToast: () => this.removeToast(toastId),
+          type: type
+        });
   }
 
   getAutoCloseDelay(toastAutoClose) {
@@ -259,7 +259,7 @@ class ToastContainer extends Component {
           : this.props.draggable,
       draggablePercent:
         typeof options.draggablePercent === 'number' &&
-          !isNaN(options.draggablePercent)
+        !isNaN(options.draggablePercent)
           ? options.draggablePercent
           : this.props.draggablePercent,
       closeOnClick:
@@ -339,18 +339,16 @@ class ToastContainer extends Component {
 
     // group toast by position
     collection.forEach(toastId => {
-      const {position, options, content} = this.collection[toastId];
+      const { position, options, content } = this.collection[toastId];
       toastToRender[position] || (toastToRender[position] = []);
 
       if (this.state.toast.indexOf(options.id) !== -1) {
-        toastToRender[position].push(
-          this.makeToast(content, options)
-        );
+        toastToRender[position].push(this.makeToast(content, options));
       } else {
         toastToRender[position].push(null);
         delete this.collection[toastId];
       }
-    })
+    });
 
     return Object.keys(toastToRender).map(position => {
       const disablePointer =