wip: handle in-out mode

diff --git a/packages/runtime-vapor/src/block.ts b/packages/runtime-vapor/src/block.ts
index 383c4e8e9fdd89274eef96d0c7ae2fbab78e8c99..e0748fe879b104b400baf8535fc12f1590cc6a09 100644 (file)
--- a/packages/runtime-vapor/src/block.ts
+++ b/packages/runtime-vapor/src/block.ts
@@ -23,6 +23,7 @@ export type Block = (
   TransitionBlock
 
 export type TransitionBlock = {
+  key?: any
   transition?: TransitionHooks
   applyLeavingHooks?: (
     block: Block,
@@ -91,11 +92,14 @@ export class DynamicFragment extends VaporFragment {
     // teardown previous branch
     if (this.scope) {
       this.scope.stop()
-      if (this.transition && this.transition.mode) {
+      const mode = this.transition && this.transition.mode
+      if (mode) {
         const transition = this.applyLeavingHooks!(this.nodes, renderNewBranch)
         parent && remove(this.nodes, parent, transition)
-        resetTracking()
-        return
+        if (mode === 'out-in') {
+          resetTracking()
+          return
+        }
       } else {
         parent && remove(this.nodes, parent, this.transition)
       }

diff --git a/packages/runtime-vapor/src/components/Transition.ts b/packages/runtime-vapor/src/components/Transition.ts
index 9b9410234b7de5cd47790365d587d72f81dae4bd..b203db46698f1d2daa9a0724570ff8a05c95e047 100644 (file)
--- a/packages/runtime-vapor/src/components/Transition.ts
+++ b/packages/runtime-vapor/src/components/Transition.ts
@@ -41,14 +41,17 @@ export const vaporTransitionImpl: VaporTransitionInterface = {
     const { mode } = props
     // TODO check mode
 
-    child.applyLeavingHooks = (block: Block, afterLeaveCb: () => void) => {
+    child.applyLeavingHooks = (
+      leavingBlock: Block,
+      afterLeaveCb: () => void,
+    ) => {
       let leavingHooks = resolveTransitionHooks(
-        block as any,
+        leavingBlock as any,
         props,
         state,
         currentInstance!,
       )
-      setTransitionHooks(block, leavingHooks)
+      setTransitionHooks(leavingBlock, leavingHooks)
 
       if (mode === 'out-in') {
         state.isLeaving = true
@@ -58,8 +61,23 @@ export const vaporTransitionImpl: VaporTransitionInterface = {
           delete leavingHooks.afterLeave
         }
       } else if (mode === 'in-out') {
-        leavingHooks.delayLeave = (block: Block, earlyRemove, delayedLeave) => {
-          // TODO delay leave
+        leavingHooks.delayLeave = (
+          block: TransitionElement,
+          earlyRemove,
+          delayedLeave,
+        ) => {
+          const leavingNodeCache = getLeavingNodesForBlock(state, leavingBlock)
+          leavingNodeCache[String(leavingBlock.key)] = leavingBlock
+          // early removal callback
+          block[leaveCbKey] = () => {
+            earlyRemove()
+            block[leaveCbKey] = undefined
+            delete enterHooks.delayedLeave
+          }
+          enterHooks.delayedLeave = () => {
+            delayedLeave()
+            delete enterHooks.delayedLeave
+          }
         }
       }
       return leavingHooks
@@ -70,7 +88,7 @@ export const vaporTransitionImpl: VaporTransitionInterface = {
 }
 
 function resolveTransitionHooks(
-  block: Block & { key: string },
+  block: Block,
   props: TransitionProps,
   state: TransitionState,
   instance: GenericComponentInstance,