Toast: fixed animation restart on close

ChangJoo-Park · Mar 23, 2017 · f4552b1 · f4552b1
1 parent 6e35a69
commit f4552b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/js/components/Toast.js b/src/js/components/Toast.js
@@ -47,7 +47,9 @@ class ToastContents extends Component {
     clearTimeout(this._timer);
     this._timer = undefined;
     this.setState({ closing: true });
-    setTimeout(onClose, ANIMATION_DURATION);
+    if (onClose) {
+      setTimeout(onClose, ANIMATION_DURATION);
+    }
   }
 
   render () {

diff --git a/src/scss/grommet-core/_objects.toast.scss b/src/scss/grommet-core/_objects.toast.scss
@@ -29,6 +29,7 @@
 
 .#{$grommet-namespace}toast--closing {
   @include animation('toast-raise #{$animation-duration}');
+  animation-fill-mode: forwards;
 }
 
 .#{$grommet-namespace}toast__closer {