fix(lifecycle): deactivated should not run on unmounted lifecycle (vuejs#217)

LinusBorg · web-flow · commit 42c582af91b0 · 2020-02-18T13:33:26.000+08:00
close vuejs#178
diff --git a/src/apis/lifecycle.ts b/src/apis/lifecycle.ts
@@ -11,16 +11,6 @@ function createLifeCycle(lifeCyclehook: string) {
   };
 }
 
-function createLifeCycles(lifeCyclehooks: string[], name: string) {
-  return (callback: Function) => {
-    const currentVue = getCurrentVue();
-    const vm = ensureCurrentVMInFn(name);
-    lifeCyclehooks.forEach(lifeCyclehook =>
-      injectHookOption(currentVue, vm, lifeCyclehook, callback)
-    );
-  };
-}
-
 function injectHookOption(Vue: VueConstructor, vm: ComponentInstance, hook: string, val: Function) {
   const options = vm.$options as any;
   const mergeFn = Vue.config.optionMergeStrategies[hook];
@@ -33,8 +23,7 @@ export const onMounted = createLifeCycle('mounted');
 export const onBeforeUpdate = createLifeCycle('beforeUpdate');
 export const onUpdated = createLifeCycle('updated');
 export const onBeforeUnmount = createLifeCycle('beforeDestroy');
-// only one event will be fired between destroyed and deactivated when an unmount occurs
-export const onUnmounted = createLifeCycles(['destroyed', 'deactivated'], genName('unmounted'));
+export const onUnmounted = createLifeCycle('destroyed');
 export const onErrorCaptured = createLifeCycle('errorCaptured');
 export const onActivated = createLifeCycle('activated');
 export const onDeactivated = createLifeCycle('deactivated');
