feat(runtime-vapor): vapor transition work with vapor keep-alive (#14050)

diff --git a/packages-private/vapor-e2e-test/__tests__/transition.spec.ts b/packages-private/vapor-e2e-test/__tests__/transition.spec.ts
index 0bfc30598cca9cf7c74e187e15b7d9eeebbcb564..0babdd8b8dc0da939c5359348319ed5d4d4ba546 100644 (file)
--- a/packages-private/vapor-e2e-test/__tests__/transition.spec.ts
+++ b/packages-private/vapor-e2e-test/__tests__/transition.spec.ts
@@ -903,7 +903,25 @@ describe('vapor transition', () => {
     )
   })
 
-  describe.todo('transition with KeepAlive', () => {})
+  describe('transition with KeepAlive', () => {
+    test('unmount innerChild (out-in mode)', async () => {
+      const btnSelector = '.keep-alive > button'
+      const containerSelector = '.keep-alive > div'
+
+      await transitionFinish()
+      expect(await html(containerSelector)).toBe('<div>0</div>')
+
+      await click(btnSelector)
+
+      await transitionFinish()
+      expect(await html(containerSelector)).toBe('')
+      const calls = await page().evaluate(() => {
+        return (window as any).getCalls('unmount')
+      })
+      expect(calls).toStrictEqual(['TrueBranch'])
+    })
+  })
+
   describe.todo('transition with Suspense', () => {})
   describe.todo('transition with Teleport', () => {})
 

diff --git a/packages-private/vapor-e2e-test/transition/App.vue b/packages-private/vapor-e2e-test/transition/App.vue
index 4855098243b6ae805430ea43bc0b5ddbdc583055..e437e07456d3fe5be05c710bf5cc1bade029ee4b 100644 (file)
--- a/packages-private/vapor-e2e-test/transition/App.vue
+++ b/packages-private/vapor-e2e-test/transition/App.vue
@@ -7,6 +7,7 @@ import {
   VaporTransition,
   createIf,
   template,
+  onUnmounted,
 } from 'vue'
 const show = ref(true)
 const toggle = ref(true)
@@ -28,6 +29,8 @@ let calls = {
   showLeaveCancel: [],
   showAppear: [],
   notEnter: [],
+
+  unmount: [],
 }
 window.getCalls = key => calls[key]
 window.resetCalls = key => (calls[key] = [])
@@ -90,6 +93,25 @@ const viewInOut = shallowRef(SimpleOne)
 function changeViewInOut() {
   viewInOut.value = viewInOut.value === SimpleOne ? Two : SimpleOne
 }
+
+const TrueBranch = defineVaporComponent({
+  name: 'TrueBranch',
+  setup() {
+    onUnmounted(() => {
+      calls.unmount.push('TrueBranch')
+    })
+    return template('<div>0</div>')()
+  },
+})
+const includeRef = ref(['TrueBranch'])
+const click = () => {
+  toggle.value = !toggle.value
+  if (toggle.value) {
+    includeRef.value = ['TrueBranch']
+  } else {
+    includeRef.value = []
+  }
+}
 </script>
 
 <template>
@@ -481,6 +503,19 @@ function changeViewInOut() {
     </div>
     <!-- mode end -->
 
+    <!-- with keep-alive -->
+    <div class="keep-alive">
+      <div>
+        <transition mode="out-in">
+          <KeepAlive :include="includeRef">
+            <TrueBranch v-if="toggle"></TrueBranch>
+          </KeepAlive>
+        </transition>
+      </div>
+      <button @click="click">button</button>
+    </div>
+    <!-- with keep-alive end -->
+
     <!-- vdom interop -->
     <div class="vdom">
       <button @click="toggleVdom = !toggleVdom">toggle vdom component</button>

diff --git a/packages/runtime-vapor/src/components/KeepAlive.ts b/packages/runtime-vapor/src/components/KeepAlive.ts
index 3367ea089bd461129272e08dc13cda9dc654a4b1..c6ff01000d8dafe997b5b16bfb85899288e708f5 100644 (file)
--- a/packages/runtime-vapor/src/components/KeepAlive.ts
+++ b/packages/runtime-vapor/src/components/KeepAlive.ts
@@ -150,6 +150,7 @@ export const VaporKeepAliveImpl: ObjectVaporComponent = defineVaporComponent({
     }
 
     keepAliveInstance.deactivate = instance => {
+      current = undefined
       deactivate(instance, storageContainer)
     }