Skip to content

useOpenable: support for parent to be component #86

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

Open
tspears1 wants to merge 1 commit into
base: next
Choose a base branch
from
Open

useOpenable: support for parent to be component #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions resources/js/components/UseOpenable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const TAGS_WITH_DEFAULT_BEHAVIOR = ['A', 'BUTTON', 'IFRAME', 'INPUT', 'TEXTAREA'
* modals and dropdowns. It provides methods for handling focus, keyboard
* events, hover and delayed close.
*/
export default function useOpenable (el, focusOnClose = null) {
export default function useOpenable (el, focusOnClose = null, isComponent = false) {
let timeout = null
const isOpen = ref(false)

Expand All @@ -39,7 +39,11 @@ export default function useOpenable (el, focusOnClose = null) {
addEventListener('focusout', checkFocus)
addEventListener('keydown', checkKeydown)
nextTick(() => {
el.value.addEventListener('mousedown', checkMousedown)
if (isComponent) {
el.value.$el.addEventListener('mousedown', checkMousedown)
} else {
el.value.addEventListener('mousedown', checkMousedown)
}
})
}

Expand All @@ -56,7 +60,11 @@ export default function useOpenable (el, focusOnClose = null) {
isOpen.value = false
removeEventListener('focusout', checkFocus)
removeEventListener('keydown', checkKeydown)
el.value.removeEventListener('mousedown', checkMousedown)
if (isComponent) {
el.value.$el.removeEventListener('mousedown', checkMousedown)
} else {
el.value.removeEventListener('mousedown', checkMousedown)
}
}

/**
Expand All @@ -78,7 +86,8 @@ export default function useOpenable (el, focusOnClose = null) {
* component, and if so, closes the component.
*/
const checkFocus = (event) => {
if (isOpen.value && !el.value.contains(event.relatedTarget)) {
const element = isComponent ? el.value.$el : el.value
if (isOpen.value && !element.contains(event.relatedTarget)) {
close()
}
}
Expand Down