Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"@vorms/core": "^1.1.0",
"@vue-final-modal/nuxt": "workspace:1.0.3",
"vue-final-modal": "workspace:4.5.2",
"vue-final-modal": "workspace:4.5.3",
"vue3-drag-resize": "^2.0.5"
}
}
2 changes: 1 addition & 1 deletion examples/nuxt3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"dependencies": {
"@vue-final-modal/nuxt": "^1.0.3",
"vue-final-modal": "^4.5.2"
"vue-final-modal": "^4.5.3"
}
}
2 changes: 1 addition & 1 deletion examples/vue3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"vue": "^3.3.7",
"vue-final-modal": "^4.5.2"
"vue-final-modal": "^4.5.3"
},
"devDependencies": {
"@iconify/vue": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"dependencies": {
"@nuxt/kit": "^3.8.2",
"vue-final-modal": "^4.5.2"
"vue-final-modal": "^4.5.3"
},
"devDependencies": {
"@nuxt/module-builder": "^0.5.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<script setup lang="ts">
import { VueFinalModal } from '~/index'
</script>

<template>
<VueFinalModal v-slot="{ close }">
<button @click="() => close()">
Close
</button>
</VueFinalModal>
</template>
26 changes: 26 additions & 0 deletions packages/vue-final-modal/cypress/components/scopedSlot.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import App from './App.vue'
import ModalCloseByScopedSlot from './ModalCloseByScopedSlot.vue'
import { createVfm, useModal } from '~/index'

describe('Test scopedSlot', () => {
it('close() scoped slot ', () => {
const vfm = createVfm()
const modalName = 'modal-close-by-scoped-slot'
useModal({
defaultModelValue: true,
component: ModalCloseByScopedSlot,
attrs: { class: modalName },
})

cy.mount(App, {
global: {
plugins: [vfm],
stubs: { transition: false },
},
}).as('app')

cy.get(`.${modalName}`).should('exist')
cy.get(`.${modalName}`).find('button').click()
cy.get(`.${modalName}`).should('not.exist')
})
})
2 changes: 1 addition & 1 deletion packages/vue-final-modal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@cypress/vue": "^5.0.5",
"@release-it/conventional-changelog": "^5.1.1",
"@vue-macros/volar": "^0.8.4",
"cypress": "^13.6.0",
"cypress": "^13.6.4",
"release-it": "^16.1.3",
"unplugin-vue-define-options": "^1.3.8",
"unplugin-vue-macros": "^2.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ defineOptions({ inheritAttrs: false })
const instance = getCurrentInstance()

defineSlots<{
'default'?(props: { close: () => boolean }): void
'default'?(props: { close: () => void }): void
'swipe-banner'?(): void
}>()

Expand Down Expand Up @@ -135,6 +135,11 @@ function close(): boolean {
return true
}

/** Close function for scoped slot */
function _close() {
modelValueLocal.value = false
}

onBeforeUnmount(() => {
enableBodyScroll()
arrayRemoveItem(modals, instance)
Expand Down Expand Up @@ -223,7 +228,7 @@ defineExpose({
v-bind="bindSwipe"
@mousedown="() => onMousedown()"
>
<slot v-bind="{ close }" />
<slot v-bind="{ close: _close }" />

<div
v-if="showSwipeBanner"
Expand Down
27 changes: 10 additions & 17 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viteplay/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"vue": "^3.3.7",
"vue-final-modal": "workspace:4.5.2",
"vue-final-modal": "workspace:4.5.3",
"vue-router": "^4.2.5"
},
"devDependencies": {
Expand Down