Skip to content

Commit

Permalink
fix(Slideover): wait for transition to complete to reset state (#1624)
Browse files Browse the repository at this point in the history
  • Loading branch information
genu committed Apr 5, 2024
1 parent 9e90d17 commit 07a4d13
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 7 additions & 2 deletions src/runtime/components/overlays/Slideover.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<TransitionRoot as="template" :appear="appear" :show="isOpen">
<TransitionRoot as="template" :appear="appear" :show="isOpen" @after-leave="onAfterLeave">
<HDialog :class="[ui.wrapper, { 'justify-end': side === 'right' }]" v-bind="attrs" @close="close">
<TransitionChild v-if="overlay" as="template" :appear="appear" v-bind="ui.overlay.transition">
<div :class="[ui.overlay.base, ui.overlay.background]" />
Expand Down Expand Up @@ -71,7 +71,7 @@ export default defineComponent({
default: () => ({})
}
},
emits: ['update:modelValue', 'close', 'close-prevented'],
emits: ['update:modelValue', 'close', 'close-prevented', 'after-leave'],
setup (props, { emit }) {
const { ui, attrs } = useUI('slideover', toRef(props, 'ui'), config, toRef(props, 'class'))
Expand Down Expand Up @@ -109,6 +109,10 @@ export default defineComponent({
emit('close')
}
const onAfterLeave = () => {
emit('after-leave')
}
provideUseId(() => useId())
return {
Expand All @@ -117,6 +121,7 @@ export default defineComponent({
attrs,
isOpen,
transitionClass,
onAfterLeave,
close
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/runtime/components/overlays/Slideovers.client.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
v-if="slideoverState"
v-bind="slideoverState.props"
v-model="isOpen"
@after-leave="reset"
/>
</template>

Expand All @@ -13,5 +14,5 @@ import { useSlideover, slidOverInjectionKey } from '../../composables/useSlideov
const slideoverState = inject(slidOverInjectionKey)
const { isOpen } = useSlideover()
const { isOpen, reset } = useSlideover()
</script>
5 changes: 4 additions & 1 deletion src/runtime/composables/useSlideover.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ function _useSlideover () {
isOpen.value = true
}

function close () {
async function close () {
if (!slideoverState) return

isOpen.value = false
}

function reset () {
slideoverState.value = {
component: 'div',
props: {}
Expand All @@ -53,6 +55,7 @@ function _useSlideover () {
return {
open,
close,
reset,
patch,
isOpen
}
Expand Down

0 comments on commit 07a4d13

Please sign in to comment.