From 48576e582c4177572c2fd1764fbca53a6a30abe2 Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 6 Aug 2020 10:28:03 -0400 Subject: [PATCH] fix(transition): transition should accept multiple handlers on same event fix #1746 --- .../src/components/BaseTransition.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/runtime-core/src/components/BaseTransition.ts b/packages/runtime-core/src/components/BaseTransition.ts index 666b13dc204..3ca38498d9b 100644 --- a/packages/runtime-core/src/components/BaseTransition.ts +++ b/packages/runtime-core/src/components/BaseTransition.ts @@ -105,6 +105,8 @@ export function useTransitionState(): TransitionState { return state } +const TransitionHookValidator = [Function, Array] + const BaseTransitionImpl = { name: `BaseTransition`, @@ -113,20 +115,20 @@ const BaseTransitionImpl = { appear: Boolean, persisted: Boolean, // enter - onBeforeEnter: Function, - onEnter: Function, - onAfterEnter: Function, - onEnterCancelled: Function, + onBeforeEnter: TransitionHookValidator, + onEnter: TransitionHookValidator, + onAfterEnter: TransitionHookValidator, + onEnterCancelled: TransitionHookValidator, // leave - onBeforeLeave: Function, - onLeave: Function, - onAfterLeave: Function, - onLeaveCancelled: Function, + onBeforeLeave: TransitionHookValidator, + onLeave: TransitionHookValidator, + onAfterLeave: TransitionHookValidator, + onLeaveCancelled: TransitionHookValidator, // appear - onBeforeAppear: Function, - onAppear: Function, - onAfterAppear: Function, - onAppearCancelled: Function + onBeforeAppear: TransitionHookValidator, + onAppear: TransitionHookValidator, + onAfterAppear: TransitionHookValidator, + onAppearCancelled: TransitionHookValidator }, setup(props: BaseTransitionProps, { slots }: SetupContext) {