Merge pull request #66 from greg-js/opener

fixes #65: message pane staying open when clicked rapidly
henryboldi · Aug 5, 2016 · 714eecc · 714eecc
2 parents 481bc9b + 89b1279
commit 714eecc
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/components/keychain/KeychainComposerOpener.js b/app/components/keychain/KeychainComposerOpener.js
@@ -45,16 +45,22 @@ class KeychainComposerOpener extends Component {
 
   componentWillReceiveProps(nextProps) {
     if (!this.props.isShowingOpener && nextProps.isShowingOpener) {
-      dynamics.animate(this.refs.opener, {
-        translateY: 0,
-      }, {
-        type: dynamics.spring,
-        duration: 700,
-        friction: 400,
-      })
+      this.moveOpener(0, 'spring', 700, 400)
+    } else if (this.props.isShowingOpener && !nextProps.isShowingOpener) {
+      this.moveOpener(64, 'easeInOut', 400, 250)
     }
   }
 
+  moveOpener(y, style, duration, friction) {
+    dynamics.animate(this.refs.opener, {
+      translateY: y,
+    }, {
+      type: dynamics[style],
+      duration,
+      friction,
+    })
+  }
+
   render() {
     return (
       <div is="opener" ref="opener" onClick={ this.handleClick }>