fix(OverflowMenu): cleanup timeout upon unmount (carbon-design-system…

…#2259) Fixes carbon-design-system#2114.
joshblack · May 1, 2019 · 4b0a5cb · 4b0a5cb
1 parent 81f90a7
commit 4b0a5cb
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/components/OverflowMenu/OverflowMenu.js b/src/components/OverflowMenu/OverflowMenu.js
@@ -330,6 +330,12 @@ class OverflowMenu extends Component {
    */
   _hFocusIn = null;
 
+  /**
+   * The timeout handle for handling `blur` event.
+   * @private
+   */
+  _hBlurTimeout;
+
   shouldComponentUpdate(nextProps, nextState) {
     if (nextState.open && !this.state.open) {
       requestAnimationFrame(() => {
@@ -398,6 +404,10 @@ class OverflowMenu extends Component {
   }
 
   componentWillUnmount() {
+    if (typeof this._hBlurTimeout === 'number') {
+      clearTimeout(this._hBlurTimeout);
+      this._hBlurTimeout = undefined;
+    }
     this.hResize.release();
   }
 
@@ -460,7 +470,12 @@ class OverflowMenu extends Component {
     }
     evt.persist();
     // event loop hack
-    setTimeout(() => {
+    if (typeof this._hBlurTimeout === 'number') {
+      clearTimeout(this._hBlurTimeout);
+      this._hBlurTimeout = undefined;
+    }
+    this._hBlurTimeout = setTimeout(() => {
+      this._hBlurTimeout = undefined;
       if (!this.menuEl.contains(evt.target.ownerDocument.activeElement)) {
         this.setState({ open: false });
       }