fix(VaPopover): Fixed closing other hover popovers on mouse leave

epicmaxco · May 30, 2024 · 3cdeff2 · 3cdeff2
1 parent 0ffdb22
commit 3cdeff2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/ui/src/components/va-dropdown/VaDropdown.vue b/packages/ui/src/components/va-dropdown/VaDropdown.vue
@@ -76,6 +76,7 @@ export default defineComponent({
     ariaLabel: useTranslationProp('$t:toggleDropdown'),
     role: { type: String as PropType<StringWithAutocomplete<'button' | 'none'>>, default: 'button' },
     contentClass: { type: String, default: '' },
+    focusAnchorOnClose: { type: Boolean, default: true },
   },
 
   emits: [...useStatefulEmits, 'anchor-click', 'anchor-right-click', 'content-click', 'click-outside', 'focus-outside', 'close', 'open', 'anchor-dblclick'],
@@ -189,7 +190,8 @@ export default defineComponent({
           focusFirstFocusableChild(el)
         })
       } else {
-        if (!anchorRef.value) { return }
+        if (!anchorRef.value || !props.focusAnchorOnClose) { return }
+
         focusFirstFocusableChild(anchorRef.value)
       }
     })

diff --git a/packages/ui/src/components/va-popover/VaPopover.vue b/packages/ui/src/components/va-popover/VaPopover.vue
@@ -6,6 +6,7 @@
     :offset="$props.offset"
     :content-class="$props.contentClass"
     class="va-popover"
+    :focusAnchorOnClose="false"
   >
     <template #default>
       <div
@@ -46,7 +47,7 @@ import { useComponentPresetProp, useColors, useTextColor } from '../../composabl
 
 import { VaDropdown, VaIcon } from '../'
 
-const VaDropdownProps = extractComponentProps(VaDropdown, ['closeOnClickOutside'])
+const VaDropdownProps = extractComponentProps(VaDropdown, ['closeOnClickOutside', 'focusAnchorOnClose'])
 </script>
 
 <script lang="ts" setup>