From: Evan You <yyx990803@gmail.com>
Date: Wed, 18 Mar 2020 16:30:20 +0000 (-0400)
Subject: types: improve directive hook argument types
X-Git-Tag: v3.0.0-alpha.10~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be91b43564574839ff0a6d9bd9b1f6bdbdbd96c2;p=thirdparty%2Fvuejs%2Fcore.git

types: improve directive hook argument types
---

diff --git a/packages/runtime-core/src/directives.ts b/packages/runtime-core/src/directives.ts
index 434ab83f8a..f5e0eb1ba0 100644
--- a/packages/runtime-core/src/directives.ts
+++ b/packages/runtime-core/src/directives.ts
@@ -28,11 +28,11 @@ export interface DirectiveBinding {
   dir: ObjectDirective
 }
 
-export type DirectiveHook<T = any> = (
+export type DirectiveHook<T = any, Prev = VNode<any, T> | null> = (
   el: T,
   binding: DirectiveBinding,
   vnode: VNode<any, T>,
-  prevVNode: VNode<any, T> | null
+  prevVNode: Prev
 ) => void
 
 export type SSRDirectiveHook = (
@@ -41,12 +41,12 @@ export type SSRDirectiveHook = (
 ) => Data | undefined
 
 export interface ObjectDirective<T = any> {
-  beforeMount?: DirectiveHook<T>
-  mounted?: DirectiveHook<T>
-  beforeUpdate?: DirectiveHook<T>
-  updated?: DirectiveHook<T>
-  beforeUnmount?: DirectiveHook<T>
-  unmounted?: DirectiveHook<T>
+  beforeMount?: DirectiveHook<T, null>
+  mounted?: DirectiveHook<T, null>
+  beforeUpdate?: DirectiveHook<T, VNode<any, T>>
+  updated?: DirectiveHook<T, VNode<any, T>>
+  beforeUnmount?: DirectiveHook<T, null>
+  unmounted?: DirectiveHook<T, null>
   getSSRProps?: SSRDirectiveHook
 }
 
diff --git a/packages/runtime-dom/src/directives/vModel.ts b/packages/runtime-dom/src/directives/vModel.ts
index 4633648959..703ee7221e 100644
--- a/packages/runtime-dom/src/directives/vModel.ts
+++ b/packages/runtime-dom/src/directives/vModel.ts
@@ -1,6 +1,7 @@
 import {
   ObjectDirective,
   VNode,
+  DirectiveHook,
   DirectiveBinding,
   warn
 } from '@vue/runtime-core'
@@ -240,7 +241,7 @@ function callModelHook(
           modelToUse = vModelText
       }
   }
-  const fn = modelToUse[hook]
+  const fn = modelToUse[hook] as DirectiveHook
   fn && fn(el, binding, vnode, prevVNode)
 }