refactor(runtime-core): remove the deactivated branch in unmountComponent method (#2012)

2020-09-02 09:03:50 +08:00
parent 691a4b9530
commit 0d0970f9cd
2 changed files with 42 additions and 32 deletions
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -2096,7 +2096,7 @@ function baseCreateRenderer(
      unregisterHMR(instance)
    }

-    const { bum, effects, update, subTree, um, da, isDeactivated } = instance
+    const { bum, effects, update, subTree, um } = instance
    // beforeUnmount hook
    if (bum) {
      invokeArrayFns(bum)
@@ -2116,14 +2116,6 @@ function baseCreateRenderer(
    if (um) {
      queuePostRenderEffect(um, parentSuspense)
    }
-    // deactivated hook
-    if (
-      da &&
-      !isDeactivated &&
-      instance.vnode.shapeFlag & ShapeFlags.COMPONENT_SHOULD_KEEP_ALIVE
-    ) {
-      queuePostRenderEffect(da, parentSuspense)
-    }
    queuePostRenderEffect(() => {
      instance.isUnmounted = true
    }, parentSuspense)