mirror/element-plus
2
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2024-11-27 02:01:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(components): [dropdown] adjust onItemLeave trigger (#13212)

Browse Source 
fix(components): trigger focus change when the trigger includes hover

closed #13131
This commit is contained in:
qiang 2023-08-22 21:38:05 +08:00 committed by GitHub
parent bb2cf0bfe9
commit 9cee96751c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/components/dropdown/src/dropdown.vue
View File

@ -110,7 +110,7 @@ import ElIcon from '@element-plus/components/icon'
import ElRovingFocusGroup from '@element-plus/components/roving-focus-group'
import { ElOnlyChild } from '@element-plus/components/slot'
import { useFormSize } from '@element-plus/components/form'
import { addUnit, isArray } from '@element-plus/utils'
import { addUnit, ensureArray } from '@element-plus/utils'
import { ArrowDown } from '@element-plus/icons-vue'
import { EVENT_CODE } from '@element-plus/constants'
import { useId, useLocale, useNamespace } from '@element-plus/hooks'
@ -154,6 +154,7 @@ export default defineComponent({
maxHeight: addUnit(props.maxHeight),
}))
const dropdownTriggerKls = computed(() => [ns.m(dropdownSize.value)])
const trigger = computed(() => ensureArray(props.trigger))
const defaultTriggerId = useId().value
const triggerId = computed<string>(() => {
@ -165,9 +166,8 @@ export default defineComponent({
// completely different element. For a permanent solution, remove all calls to any "element.focus()"
// that are triggered through pointer enter/leave events.
watch(
[triggeringElementRef, toRef(props, 'trigger')],
[triggeringElementRef, trigger],
([triggeringElement, trigger], [prevTriggeringElement]) => {
const triggerArray = isArray(trigger) ? trigger : [trigger]
if (prevTriggeringElement?.$el?.removeEventListener) {
prevTriggeringElement.$el.removeEventListener(
'pointerenter',
@ -182,7 +182,7 @@ export default defineComponent({
}
if (
triggeringElement?.$el?.addEventListener &&
triggerArray.includes('hover')
trigger.includes('hover')
) {
triggeringElement.$el.addEventListener(
'pointerenter',
@ -231,7 +231,7 @@ export default defineComponent({
function onItemLeave() {
const contentEl = unref(contentRef)
contentEl?.focus()
trigger.value.includes('hover') && contentEl?.focus()
currentTabId.value = null
}