Update dropdown.js

jacobmllr95 · jacobmllr95 · commit ebe54ea2eb78 · 2020-11-04T22:10:14.000+01:00
diff --git a/src/mixins/dropdown.js b/src/mixins/dropdown.js
@@ -172,6 +172,7 @@ export default {
   created() {
     // Create private non-reactive props
     this.$_popper = null
+    this.$_hideTimeout = null
   },
   /* istanbul ignore next */
   deactivated() /* istanbul ignore next: not easy to test */ {
@@ -184,6 +185,7 @@ export default {
     this.visible = false
     this.whileOpenListen(false)
     this.destroyPopper()
+    this.clearHideTimeout()
   },
   methods: {
     // Event emitter
@@ -249,6 +251,10 @@ export default {
         this.$_popper.scheduleUpdate()
       } catch {}
     },
+    clearHideTimeout() {
+      clearTimeout(this.$_hideTimeout)
+      this.$_hideTimeout = null
+    },
     getPopperConfig() {
       let placement = PLACEMENT_BOTTOM_START
       if (this.dropup) {
@@ -386,7 +392,8 @@ export default {
     hideHandler(evt) {
       const { target } = evt
       if (this.visible && !contains(this.$refs.menu, target) && !contains(this.toggler, target)) {
-        this.hide()
+        this.clearHideTimeout()
+        this.$_hideTimeout = setTimeout(() => this.hide(), this.inNavbar ? 300 : 0)
       }
     },
     // Document click-out listener
@@ -395,9 +402,7 @@ export default {
     },
     // Document focus-in listener
     focusInHandler(evt) {
-      setTimeout(() => {
-        this.hideHandler(evt)
-      }, this.inNavbar ? 300 : 0)
+      this.hideHandler(evt)
     },
     // Keyboard nav
     focusNext(evt, up) {
