Commit 175b5ab

committed

fix: #424

1 parent 8381e14 commit 175b5abCopy full SHA for 175b5ab

File tree

+44

-2

lines changed

+44

-2

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+<script setup lang="ts">`
	`2`	`+import { VueFinalModal } from '~/index'`
	`3`	`+</script>`
	`4`	`+`
	`5`	`+<template>`
	`6`	`+ <VueFinalModal v-slot="{ close }">`
	`7`	`+ <button @click="() => close()">`
	`8`	`+ Close`
	`9`	`+ </button>`
	`10`	`+ </VueFinalModal>`
	`11`	`+</template>`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,26 @@`
	`1`	`+import App from './App.vue'`
	`2`	`+import ModalCloseByScopedSlot from './ModalCloseByScopedSlot.vue'`
	`3`	`+import { createVfm, useModal } from '~/index'`
	`4`	`+`
	`5`	`+describe('Test scopedSlot', () => {`
	`6`	`+ it('close() scoped slot ', () => {`
	`7`	`+ const vfm = createVfm()`
	`8`	`+ const modalName = 'modal-close-by-scoped-slot'`
	`9`	`+ useModal({`
	`10`	`+ defaultModelValue: true,`
	`11`	`+ component: ModalCloseByScopedSlot,`
	`12`	`+ attrs: { class: modalName },`
	`13`	`+ })`
	`14`	`+`
	`15`	`+ cy.mount(App, {`
	`16`	`+ global: {`
	`17`	`+ plugins: [vfm],`
	`18`	`+ stubs: { transition: false },`
	`19`	`+ },`
	`20`	`+ }).as('app')`
	`21`	`+`
	`22`	+ cy.get(`.${modalName}`).should('exist')
	`23`	+ cy.get(`.${modalName}`).find('button').click()
	`24`	+ cy.get(`.${modalName}`).should('not.exist')
	`25`	`+ })`
	`26`	`+})`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ defineOptions({ inheritAttrs: false })`
`35`	`35`	`const instance = getCurrentInstance()`
`36`	`36`
`37`	`37`	`defineSlots<{`
`38`		`- 'default'?(props: { close: () => boolean }): void`
	`38`	`+ 'default'?(props: { close: () => void }): void`
`39`	`39`	`'swipe-banner'?(): void`
`40`	`40`	`}>()`
`41`	`41`
`@@ -135,6 +135,11 @@ function close(): boolean {`
`135`	`135`	`return true`
`136`	`136`	`}`
`137`	`137`
	`138`	`+/** Close function for scoped slot */`
	`139`	`+function _close() {`
	`140`	`+ modelValueLocal.value = false`
	`141`	`+}`
	`142`	`+`
`138`	`143`	`onBeforeUnmount(() => {`
`139`	`144`	`enableBodyScroll()`
`140`	`145`	`arrayRemoveItem(modals, instance)`
`@@ -223,7 +228,7 @@ defineExpose({`
`223`	`228`	`v-bind="bindSwipe"`
`224`	`229`	`@mousedown="() => onMousedown()"`
`225`	`230`	`>`
`226`		`- <slot v-bind="{ close }" />`
	`231`	`+ <slot v-bind="{ close: _close }" />`
`227`	`232`
`228`	`233`	`<div`
`229`	`234`	`v-if="showSwipeBanner"`

Comments

(0)