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
25 changes: 25 additions & 0 deletions packages-private/vapor-e2e-test/__tests__/transition.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,31 @@ describe('vapor transition', () => {
},
E2E_TIMEOUT,
)

test(
'prevent enter when leaving',
async () => {
const sectionSelector = '.if-prevent-enter-when-leaving'
const btnSelector = `${sectionSelector} > button`
const containerSelector = `${sectionSelector} .container`

await click(btnSelector)
await waitForInnerHTML(containerSelector, '')
await nextTick()

const calls = await page().evaluate(() => {
return (window as any).getCalls('preventEnterWhenLeaving')
})
expect(calls).toStrictEqual([
'beforeEnter',
'beforeLeave',
'leave',
'afterLeave',
])
expect(await html(containerSelector)).toBe('')
},
E2E_TIMEOUT,
)
})

describe('transition with KeepAlive', () => {
Expand Down
47 changes: 47 additions & 0 deletions packages-private/vapor-e2e-test/transition/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ let calls = {
withAppear: [],
cssFalse: [],
ifInOut: [],
preventEnterWhenLeaving: [],

show: [],
showLeaveCancel: [],
Expand All @@ -52,6 +53,22 @@ let calls = {
window.getCalls = key => calls[key]
window.resetCalls = key => (calls[key] = [])

const preventEnterToggle = ref(false)
const preventEnterVisible = ref(true)
const togglePreventEnter = () => {
preventEnterToggle.value = !preventEnterToggle.value
if (preventEnterToggle.value) {
preventEnterVisible.value = true
}
}

const PreventEnterComp = defineVaporComponent({
setup() {
preventEnterVisible.value = false
return []
},
})

const activeComponent = shallowRef(VaporCompB)
function toggleComponent() {
activeComponent.value =
Expand Down Expand Up @@ -550,6 +567,36 @@ const Comp2 = defineVaporComponent({
</div>
<button @click="changeViewInOut">button</button>
</div>
<div class="if-prevent-enter-when-leaving">
<div class="content" v-if="preventEnterToggle">
<div class="container">
<transition
appear
@before-enter="
() => calls.preventEnterWhenLeaving.push('beforeEnter')
"
@enter="() => calls.preventEnterWhenLeaving.push('enter')"
@enter-cancelled="
() => calls.preventEnterWhenLeaving.push('enterCancelled')
"
@after-enter="
() => calls.preventEnterWhenLeaving.push('afterEnter')
"
@before-leave="
() => calls.preventEnterWhenLeaving.push('beforeLeave')
"
@leave="() => calls.preventEnterWhenLeaving.push('leave')"
@after-leave="
() => calls.preventEnterWhenLeaving.push('afterLeave')
"
>
<div v-if="preventEnterVisible">content</div>
</transition>
</div>
<PreventEnterComp />
</div>
<button @click="togglePreventEnter">button</button>
</div>
<!-- work with vif end -->

<!-- work with vshow -->
Expand Down
Loading