refactor: refactor vnode hooks invocation

diff --git a/packages/runtime-core/src/directives.ts b/packages/runtime-core/src/directives.ts
index f128fcffc14cb8e2d732612adf3e01d831ded086..eb897c3552ee278ee673a28aaf239912d0a80ac1 100644 (file)
--- a/packages/runtime-core/src/directives.ts
+++ b/packages/runtime-core/src/directives.ts
@@ -11,7 +11,7 @@ return withDirectives(h(comp), [
 ])
 */
 
-import { VNode } from './vnode'
+import { VNode, VNodeHook } from './vnode'
 import { isFunction, EMPTY_OBJ, makeMap, EMPTY_ARR } from '@vue/shared'
 import { warn } from './warning'
 import { ComponentInternalInstance, Data } from './component'
@@ -154,7 +154,7 @@ export function withDirectives<T extends VNode>(
 }
 
 export function invokeDirectiveHook(
-  hook: ((...args: any[]) => any) | ((...args: any[]) => any)[],
+  hook: VNodeHook | VNodeHook[],
   instance: ComponentInternalInstance | null,
   vnode: VNode,
   prevVNode: VNode | null = null

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
index 1f1b0ffeb50c4c172a0c43b9e0c7071afcd0e886..7849b941bc97ab75c216c16a931bb4e8fd2eba73 100644 (file)
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -9,7 +9,8 @@ import {
   createVNode,
   isSameVNodeType,
   Static,
-  VNodeNormalizedRef
+  VNodeNormalizedRef,
+  VNodeHook
 } from './vnode'
 import {
   ComponentInternalInstance,
@@ -524,6 +525,7 @@ function baseCreateRenderer<
     optimized: boolean
   ) => {
     let el: HostElement
+    let vnodeHook: VNodeHook | undefined | null
     const { type, props, shapeFlag, transition, scopeId, patchFlag } = vnode
     if (
       vnode.el !== null &&
@@ -543,8 +545,8 @@ function baseCreateRenderer<
             hostPatchProp(el, key, null, props[key], isSVG)
           }
         }
-        if (props.onVnodeBeforeMount != null) {
-          invokeDirectiveHook(props.onVnodeBeforeMount, parentComponent, vnode)
+        if ((vnodeHook = props.onVnodeBeforeMount) != null) {
+          invokeDirectiveHook(vnodeHook, parentComponent, vnode)
         }
       }
 
@@ -581,14 +583,12 @@ function baseCreateRenderer<
     }
 
     hostInsert(el, container, anchor)
-    const vnodeMountedHook = props && props.onVnodeMounted
     if (
-      vnodeMountedHook != null ||
+      (vnodeHook = props && props.onVnodeMounted) != null ||
       (transition != null && !transition.persisted)
     ) {
       queuePostRenderEffect(() => {
-        vnodeMountedHook &&
-          invokeDirectiveHook(vnodeMountedHook, parentComponent, vnode)
+        vnodeHook && invokeDirectiveHook(vnodeHook, parentComponent, vnode)
         transition && !transition.persisted && transition.enter(el)
       }, parentSuspense)
     }
@@ -633,9 +633,10 @@ function baseCreateRenderer<
     let { patchFlag, dynamicChildren } = n2
     const oldProps = (n1 && n1.props) || EMPTY_OBJ
     const newProps = n2.props || EMPTY_OBJ
+    let vnodeHook: VNodeHook | undefined | null
 
-    if (newProps.onVnodeBeforeUpdate != null) {
-      invokeDirectiveHook(newProps.onVnodeBeforeUpdate, parentComponent, n2, n1)
+    if ((vnodeHook = newProps.onVnodeBeforeUpdate) != null) {
+      invokeDirectiveHook(vnodeHook, parentComponent, n2, n1)
     }
 
     if (__HMR__ && parentComponent && parentComponent.renderUpdated) {
@@ -749,9 +750,9 @@ function baseCreateRenderer<
       )
     }
 
-    if (newProps.onVnodeUpdated != null) {
+    if ((vnodeHook = newProps.onVnodeUpdated) != null) {
       queuePostRenderEffect(() => {
-        invokeDirectiveHook(newProps.onVnodeUpdated, parentComponent, n2, n1)
+        invokeDirectiveHook(vnodeHook!, parentComponent, n2, n1)
       }, parentSuspense)
     }
   }
@@ -1617,6 +1618,7 @@ function baseCreateRenderer<
     doRemove = false
   ) => {
     const { props, ref, children, dynamicChildren, shapeFlag } = vnode
+    let vnodeHook: VNodeHook | undefined | null
 
     // unset ref
     if (ref !== null && parentComponent !== null) {
@@ -1637,8 +1639,8 @@ function baseCreateRenderer<
       return
     }
 
-    if (props != null && props.onVnodeBeforeUnmount != null) {
-      invokeDirectiveHook(props.onVnodeBeforeUnmount, parentComponent, vnode)
+    if ((vnodeHook = props && props.onVnodeBeforeUnmount) != null) {
+      invokeDirectiveHook(vnodeHook, parentComponent, vnode)
     }
 
     if (dynamicChildren != null) {
@@ -1652,9 +1654,9 @@ function baseCreateRenderer<
       remove(vnode)
     }
 
-    if (props != null && props.onVnodeUnmounted != null) {
+    if ((vnodeHook = props && props.onVnodeUnmounted) != null) {
       queuePostRenderEffect(() => {
-        invokeDirectiveHook(props.onVnodeUnmounted!, parentComponent, vnode)
+        invokeDirectiveHook(vnodeHook!, parentComponent, vnode)
       }, parentSuspense)
     }
   }

diff --git a/packages/runtime-core/src/vnode.ts b/packages/runtime-core/src/vnode.ts
index d8dfb64665595c2f6277ed8332049986b27f7651..ea0e1dbeff781bd26723bd87a52c262234fbab1e 100644 (file)
--- a/packages/runtime-core/src/vnode.ts
+++ b/packages/runtime-core/src/vnode.ts
@@ -59,18 +59,22 @@ export type VNodeRef =
 
 export type VNodeNormalizedRef = [ComponentInternalInstance, VNodeRef]
 
+type VNodeMountHook = (vnode: VNode) => void
+type VNodeUpdateHook = (vnode: VNode, oldVNode: VNode) => void
+export type VNodeHook = VNodeMountHook | VNodeUpdateHook
+
 export interface VNodeProps {
   [key: string]: any
   key?: string | number
   ref?: VNodeRef
 
   // vnode hooks
-  onVnodeBeforeMount?: (vnode: VNode) => void
-  onVnodeMounted?: (vnode: VNode) => void
-  onVnodeBeforeUpdate?: (vnode: VNode, oldVNode: VNode) => void
-  onVnodeUpdated?: (vnode: VNode, oldVNode: VNode) => void
-  onVnodeBeforeUnmount?: (vnode: VNode) => void
-  onVnodeUnmounted?: (vnode: VNode) => void
+  onVnodeBeforeMount?: VNodeMountHook
+  onVnodeMounted?: VNodeMountHook
+  onVnodeBeforeUpdate?: VNodeUpdateHook
+  onVnodeUpdated?: VNodeUpdateHook
+  onVnodeBeforeUnmount?: VNodeMountHook
+  onVnodeUnmounted?: VNodeMountHook
 }
 
 type VNodeChildAtom<HostNode, HostElement> =