Skip to content

Commit

Permalink
fix: dismiss layer when focus outside combobox (#473)
Browse files Browse the repository at this point in the history
  • Loading branch information
zernonia committed Oct 27, 2023
1 parent 523246c commit 43c8fd8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
23 changes: 8 additions & 15 deletions packages/radix-vue/src/Combobox/ComboboxContentImpl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,7 @@ import {
useHideOthers,
} from '@/shared'
export type ComboboxContentImplEmits = {
closeAutoFocus: [event: Event]
/**
* Event handler called when the escape key is down.
* Can be prevented.
*/
escapeKeyDown: [event: KeyboardEvent]
/**
* Event handler called when the a `pointerdown` event happens outside of the `DismissableLayer`.
* Can be prevented.
*/
pointerDownOutside: [event: PointerDownOutsideEvent]
}
export type ComboboxContentImplEmits = DismissableLayerEmits
export interface ComboboxContentImplProps extends PopperContentProps {
position?: 'inline' | 'popper'
Expand All @@ -39,9 +27,9 @@ import {
toRefs,
} from 'vue'
import { injectComboboxRootContext } from './ComboboxRoot.vue'
import type { DismissableLayerEmits } from '@/DismissableLayer'
import {
DismissableLayer,
type PointerDownOutsideEvent,
} from '@/DismissableLayer'
import { PopperContent, type PopperContentProps } from '@/Popper'
import { Primitive, usePrimitiveElement } from '@/Primitive'
Expand Down Expand Up @@ -93,8 +81,13 @@ provideComboboxContentContext({ position })
<DismissableLayer
as-child
:disable-outside-pointer-events="disableOutsidePointerEvents"
@focus-outside.prevent
@dismiss="rootContext.onOpenChange(false)"
@focus-outside="(ev) => {
// if clicking inside the combobox, prevent dismiss
if (rootContext.parentElement.value?.contains(ev.target as Node)) ev.preventDefault()
emits('focusOutside', ev)
}"
@interact-outside="emits('interactOutside', $event)"
@escape-key-down="emits('escapeKeyDown', $event)"
@pointer-down-outside="(ev) => {
// if clicking inside the combobox, prevent dismiss
Expand Down
10 changes: 10 additions & 0 deletions packages/radix-vue/src/Combobox/ComboboxRoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ watch(modelValue, async (val) => {
searchTerm.value = ''
}, { immediate: true })
watch(open, (val) => {
if (val && modelValue.value) {
if (typeof modelValue.value === 'string' && !multiple.value)
selectedValue.value = modelValue.value
else if (Array.isArray(modelValue.value) && multiple.value)
selectedValue.value = modelValue.value[0]
}
})
const isFormControl = useFormControl(parentElement)
function scrollSelectedValueIntoView() {
Expand Down

0 comments on commit 43c8fd8

Please sign in to comment.