fix(Slideover): remove dynamic component when closing (#1615)

Co-authored-by: Benjamin Canac <canacb1@gmail.com>
This commit is contained in:
Eugen Istoc
2024-04-05 06:43:50 -04:00
committed by GitHub
parent e909884d03
commit 58faa1053b
2 changed files with 56 additions and 40 deletions

View File

@@ -8,19 +8,27 @@ export const modalInjectionKey: InjectionKey<ShallowRef<ModalState>> = Symbol('n
function _useModal () { function _useModal () {
const modalState = inject(modalInjectionKey) const modalState = inject(modalInjectionKey)
const isOpen = ref(false) const isOpen = ref(false)
function open<T extends Component> (component: T, props?: Modal & ComponentProps<T>) { function open<T extends Component> (component: T, props?: Modal & ComponentProps<T>) {
if (!modalState) {
throw new Error('useModal() is called without provider')
}
modalState.value = { modalState.value = {
component, component,
props: props ?? {} props: props ?? {}
} }
isOpen.value = true isOpen.value = true
} }
function close () { function close () {
if (!modalState) return
isOpen.value = false isOpen.value = false
modalState.value = { modalState.value = {
component: 'div', component: 'div',
props: {} props: {}
@@ -31,6 +39,8 @@ function _useModal () {
* Allows updating the modal props * Allows updating the modal props
*/ */
function patch <T extends Component = {}> (props: Partial<Modal & ComponentProps<T>>) { function patch <T extends Component = {}> (props: Partial<Modal & ComponentProps<T>>) {
if (!modalState) return
modalState.value = { modalState.value = {
...modalState.value, ...modalState.value,
props: { props: {
@@ -41,11 +51,11 @@ function _useModal () {
} }
return { return {
isOpen,
open, open,
close, close,
patch patch,
isOpen
} }
} }
export const useModal = createSharedComposable(_useModal) export const useModal = createSharedComposable(_useModal)

View File

@@ -1,55 +1,61 @@
import { ref, inject } from 'vue' import { ref, inject } from 'vue'
import { createSharedComposable } from '@vueuse/core'
import type { ShallowRef, Component, InjectionKey } from 'vue' import type { ShallowRef, Component, InjectionKey } from 'vue'
import { createSharedComposable } from '@vueuse/core'
import type { ComponentProps } from '../types/component' import type { ComponentProps } from '../types/component'
import type { Slideover, SlideoverState } from '../types/slideover' import type { Slideover, SlideoverState } from '../types/slideover'
export const slidOverInjectionKey: InjectionKey<ShallowRef<SlideoverState>> = export const slidOverInjectionKey: InjectionKey<ShallowRef<SlideoverState>> = Symbol('nuxt-ui.slideover')
Symbol('nuxt-ui.slideover')
function _useSlideover () { function _useSlideover () {
const slideoverState = inject(slidOverInjectionKey) const slideoverState = inject(slidOverInjectionKey)
const isOpen = ref(false)
function open<T extends Component> (component: T, props?: Slideover & ComponentProps<T>) { const isOpen = ref(false)
if (!slideoverState) {
throw new Error('useSlideover() is called without provider')
}
slideoverState.value = { function open<T extends Component> (component: T, props?: Slideover & ComponentProps<T>) {
component, if (!slideoverState) {
props: props ?? {} throw new Error('useSlideover() is called without provider')
}
isOpen.value = true
} }
function close () { slideoverState.value = {
if (!slideoverState) return component,
props: props ?? {}
isOpen.value = false
} }
/** isOpen.value = true
* Allows updating the slideover props }
*/
function patch<T extends Component = {}> (props: Partial<Slideover & ComponentProps<T>>) {
if (!slideoverState) return
slideoverState.value = { function close () {
...slideoverState.value, if (!slideoverState) return
props: {
...slideoverState.value.props, isOpen.value = false
...props
} slideoverState.value = {
} component: 'div',
props: {}
} }
return { }
open,
close, /**
patch, * Allows updating the slideover props
isOpen */
function patch<T extends Component = {}> (props: Partial<Slideover & ComponentProps<T>>) {
if (!slideoverState) return
slideoverState.value = {
...slideoverState.value,
props: {
...slideoverState.value.props,
...props
}
} }
}
return {
open,
close,
patch,
isOpen
}
} }
export const useSlideover = createSharedComposable(_useSlideover) export const useSlideover = createSharedComposable(_useSlideover)