chore: adjust callInterceptor params (#9674)

* chore: adjust callInterceptor params

* chore: upd

packages/vant/src/dialog/Dialog.tsx

@@ -74,10 +74,7 @@ export default defineComponent({
 
     const close = (action: DialogAction) => {
       updateShow(false);
-
+      props.callback?.(action);
-      if (props.callback) {
-        props.callback(action);
-      }
     };
 
     const getActionHandler = (action: DialogAction) => () => {
@@ -90,8 +87,7 @@ export default defineComponent({
 
       if (props.beforeClose) {
         loading[action] = true;
-        callInterceptor({
+        callInterceptor(props.beforeClose, {
-          interceptor: props.beforeClose,
           args: [action],
           done() {
             close(action);

packages/vant/src/dialog/function-call.tsx

@@ -49,7 +49,7 @@ Dialog.defaultOptions = {
   className: '',
   allowHtml: false,
   lockScroll: true,
-  transition: 'van-dialog-bounce',
+  transition: undefined,
   beforeClose: null,
   overlayClass: '',
   overlayStyle: undefined,

packages/vant/src/image-preview/ImagePreview.tsx

@@ -100,8 +100,7 @@ export default defineComponent({
     const updateShow = (show: boolean) => emit('update:show', show);
 
     const emitClose = () => {
-      callInterceptor({
+      callInterceptor(props.beforeClose, {
-        interceptor: props.beforeClose,
         args: [state.active],
         done: () => updateShow(false),
       });

packages/vant/src/popup/Popup.tsx

@@ -113,8 +113,7 @@ export default defineComponent({
 
     const close = () => {
       if (opened) {
-        callInterceptor({
+        callInterceptor(props.beforeClose, {
-          interceptor: props.beforeClose,
           done() {
             opened = false;
             emit('close');

packages/vant/src/stepper/Stepper.tsx

@@ -128,9 +128,8 @@ export default defineComponent({
 
     const setValue = (value: string | number) => {
       if (props.beforeChange) {
-        callInterceptor({
+        callInterceptor(props.beforeChange, {
           args: [value],
-          interceptor: props.beforeChange,
           done() {
             current.value = value;
           },

packages/vant/src/swipe-cell/SwipeCell.tsx

@@ -162,8 +162,7 @@ export default defineComponent({
       emit('click', position);
 
       if (opened && !lockClick) {
-        callInterceptor({
+        callInterceptor(props.beforeClose, {
-          interceptor: props.beforeClose,
           args: [
             {
               name: props.name,

packages/vant/src/tabbar/Tabbar.tsx

@@ -83,8 +83,7 @@ export default defineComponent({
 
     const setActive = (active: number | string) => {
       if (active !== props.modelValue) {
-        callInterceptor({
+        callInterceptor(props.beforeChange, {
-          interceptor: props.beforeChange,
           args: [active],
           done() {
             emit('update:modelValue', active);

packages/vant/src/tabs/Tabs.tsx

@@ -307,8 +307,7 @@ export default defineComponent({
         // should be removed in next major version
         emit('disabled', name, title);
       } else {
-        callInterceptor({
+        callInterceptor(props.beforeChange, {
-          interceptor: props.beforeChange,
           args: [name],
           done: () => {
             setCurrentIndex(index);

packages/vant/src/uploader/UploaderPreviewItem.tsx

@@ -60,8 +60,7 @@ export default defineComponent({
     const onDelete = (event: MouseEvent) => {
       const { name, item, index, beforeDelete } = props;
       event.stopPropagation();
-      callInterceptor({
+      callInterceptor(beforeDelete, {
-        interceptor: beforeDelete,
         args: [item, { name, index }],
         done: () => emit('delete'),
       });

packages/vant/src/utils/interceptor.ts

@@ -3,17 +3,21 @@ import { isPromise } from './validate';
 
 export type Interceptor = (...args: any[]) => Promise<boolean> | boolean;
 
-export function callInterceptor(options: {
+export function callInterceptor(
-  interceptor?: Interceptor;
+  interceptor: Interceptor | undefined,
-  args?: any[];
+  {
-  done: () => void;
+    args = [],
-  canceled?: () => void;
+    done,
-}) {
+    canceled,
-  const { interceptor, args, done, canceled } = options;
+  }: {
-
+    args?: any[];
+    done: () => void;
+    canceled?: () => void;
+  }
+) {
   if (interceptor) {
     // eslint-disable-next-line prefer-spread
-    const returnVal = interceptor.apply(null, args || []);
+    const returnVal = interceptor.apply(null, args);
 
     if (isPromise(returnVal)) {
       returnVal

packages/vant/src/utils/test/interceptor.spec.ts

@@ -3,50 +3,47 @@ import { callInterceptor } from '../interceptor';
 
 test('callInterceptor', async () => {
   const done = jest.fn();
-  callInterceptor({ done });
+  callInterceptor(undefined, { done });
   expect(done).toHaveBeenCalledTimes(1);
 
-  callInterceptor({
+  callInterceptor(() => false, {
-    interceptor: () => false,
     done,
   });
   expect(done).toHaveBeenCalledTimes(1);
 
-  callInterceptor({
+  callInterceptor(() => true, {
-    interceptor: () => true,
     done,
   });
   expect(done).toHaveBeenCalledTimes(2);
 
-  callInterceptor({
+  callInterceptor(() => Promise.resolve(false), {
-    interceptor: () => Promise.resolve(false),
     done,
   });
   await later();
   expect(done).toHaveBeenCalledTimes(2);
 
-  callInterceptor({
+  callInterceptor(() => Promise.resolve(true), {
-    interceptor: () => Promise.resolve(true),
     done,
   });
   await later();
   expect(done).toHaveBeenCalledTimes(3);
 
-  callInterceptor({
+  callInterceptor(() => Promise.reject(), {
-    interceptor: () => Promise.reject(),
     done,
   });
   await later();
   expect(done).toHaveBeenCalledTimes(3);
 
-  callInterceptor({
+  callInterceptor(
-    interceptor: (...args) => {
+    (...args) => {
       expect(args).toEqual(['foo']);
       return false;
     },
-    args: ['foo'],
+    {
-    done,
+      args: ['foo'],
-  });
+      done,
+    }
+  );
 
   expect(done).toHaveBeenCalledTimes(3);
 });