Skip to content

fix(b-dropdown): click handling on close (closes #5982) #6009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Nov 5, 2020
Merged

fix(b-dropdown): click handling on close (closes #5982) #6009

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
93974cd
fix(b-dropdown): click handling on close
jacobmllr95 Nov 4, 2020
954b883
Merge branch 'dev' into fix-dropdown-click-listener-on-hide
jacobmllr95 Nov 4, 2020
d2527d1
Update dropdown.js
jacobmllr95 Nov 4, 2020
5fd5f65
Merge branch 'fix-dropdown-click-listener-on-hide' of https://github.…
jacobmllr95 Nov 4, 2020
a84afe3
Merge branch 'dev' into fix-dropdown-click-listener-on-hide
jacobmllr95 Nov 4, 2020
ffa7967
Update dropdown.js
jacobmllr95 Nov 4, 2020
3548c49
Update dropdown.js
jacobmllr95 Nov 4, 2020
8761ea9
Update dropdown.js
jacobmllr95 Nov 4, 2020
3df3ff5
Update dropdown.js
jacobmllr95 Nov 4, 2020
5bf7a8f
Update dropdown.js
jacobmllr95 Nov 4, 2020
1481f0a
Update dropdown.js
jacobmllr95 Nov 4, 2020
6d7c365
Update dropdown.js
jacobmllr95 Nov 4, 2020
88cd1c4
Update dropdown.js
jacobmllr95 Nov 4, 2020
ebe54ea
Update dropdown.js
jacobmllr95 Nov 4, 2020
96d3440
Merge branch 'dev' into fix-dropdown-click-listener-on-hide
jacobmllr95 Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/mixins/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */ {
Expand All @@ -184,6 +185,7 @@ export default {
this.visible = false
this.whileOpenListen(false)
this.destroyPopper()
this.clearHideTimeout()
},
methods: {
// Event emitter
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -288,8 +294,8 @@ export default {
this.visible = false
}
},
// Public method to show dropdown
show() {
// Public method to show dropdown
if (this.disabled) {
return
}
Expand All @@ -299,10 +305,10 @@ export default {
this.visible = true
})
},
// Public method to hide dropdown
hide(refocus = false) {
// Public method to hide dropdown
/* istanbul ignore next */
if (this.disabled) {
/* istanbul ignore next */
return
}
this.visible = false
Expand Down Expand Up @@ -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
Expand Down