fix(keep-alive): should remove wrapped version of injected keep alive hooks (#1959)

2020-08-25 22:02:39 +08:00
parent a47626a4a3
commit 1ea24000c8
2 changed files with 7 additions and 4 deletions
--- a/packages/runtime-core/src/components/KeepAlive.ts
+++ b/packages/runtime-core/src/components/KeepAlive.ts
@@ -360,14 +360,16 @@ function registerKeepAliveHook(
 }

 function injectToKeepAliveRoot(
-  hook: Function,
+  hook: Function & { __weh?: Function },
  type: LifecycleHooks,
  target: ComponentInternalInstance,
  keepAliveRoot: ComponentInternalInstance
 ) {
-  injectHook(type, hook, keepAliveRoot, true /* prepend */)
+  // injectHook wraps the original for error handling, so make sure to remove
+  // the wrapped version.
+  const injected = injectHook(type, hook, keepAliveRoot, true /* prepend */)
  onUnmounted(() => {
-    remove(keepAliveRoot[type]!, hook)
+    remove(keepAliveRoot[type]!, injected)
  }, target)
 }