Merge branch 'dev' into next

packages/vant-cli/site/desktop/components/Header.vue

@@ -296,7 +296,7 @@ export default {
   &__subtitle {
     display: inline-block;
     color: #999;
-    margin-left: 8px;
+    margin-left: 4px;
     vertical-align: -4px;
     font-size: 13px;
   }

packages/vant/src/contact-edit/README.md

@@ -37,7 +37,10 @@ import { Toast } from 'vant';
 
 export default {
   setup() {
-    const editingContact = ref({});
+    const editingContact = ref({
+      tel: '',
+      name: '',
+    });
     const onSave = (contactInfo) => Toast('Save');
     const onDelete = (contactInfo) => Toast('Delete');
     return {

packages/vant/src/contact-edit/README.zh-CN.md

@@ -37,7 +37,10 @@ import { Toast } from 'vant';
 
 export default {
   setup() {
-    const editingContact = ref({});
+    const editingContact = ref({
+      tel: '',
+      name: '',
+    });
     const onSave = (contactInfo) => Toast('保存');
     const onDelete = (contactInfo) => Toast('删除');
     return {

packages/vant/src/contact-edit/demo/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import VanContactEdit from '..';
 import { ref } from 'vue';
+import VanContactEdit, { type ContactEditInfo } from '..';
 import { useTranslate } from '../../../docs/site/use-translate';
 import { Toast } from '../../toast';
 
@@ -13,7 +13,10 @@ const t = useTranslate({
   },
 });
 
-const editingContact = ref({});
+const editingContact = ref<ContactEditInfo>({
+  tel: '',
+  name: '',
+});
 
 const onSave = () => Toast(t('save'));
 const onDelete = () => Toast(t('delete'));

packages/vant/src/count-down/demo/index.vue

@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import VanCountDown from '..';
 import VanGrid from '../../grid';
 import VanGridItem from '../../grid-item';
+import VanCountDown, { type CountDownInstance } from '..';
 import { ref } from 'vue';
 import { useTranslate } from '../../../docs/site/use-translate';
 import { Toast } from '../../toast';
-import type { CountDownInstance } from '..';
 
 const t = useTranslate({
   'zh-CN': {

packages/vant/src/count-down/test/index.spec.tsx

@@ -1,7 +1,10 @@
-import { KeepAlive, nextTick } from 'vue';
-import { CountDown } from '..';
+import { nextTick, KeepAlive } from 'vue';
+import {
+  CountDown,
+  type CountDownInstance,
+  type CountDownCurrentTime,
+} from '..';
 import { mount, later } from '../../../test';
-import type { CountDownCurrentTime, CountDownInstance } from '../CountDown';
 
 test('should emit finish event when finished', async () => {
   const wrapper = mount(CountDown, {

packages/vant/src/index-bar/IndexBar.tsx

@@ -58,7 +58,7 @@ const indexBarProps = {
   highlightColor: String,
   stickyOffsetTop: makeNumberProp(0),
   indexList: {
-    type: Array as PropType<string[]>,
+    type: Array as PropType<Array<string | number>>,
     default: genAlphabet,
   },
 };
@@ -76,7 +76,7 @@ export default defineComponent({
 
   setup(props, { emit, slots }) {
     const root = ref<HTMLElement>();
-    const activeAnchor = ref('');
+    const activeAnchor = ref<string | number>('');
 
     const touch = useTouch();
     const scrollParent = useScrollParent(root);

packages/vant/src/notify/demo/index.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import VanCell from '../../cell';
 import VanIcon from '../../icon';
-import { Notify } from '..';
 import { ref } from 'vue';
+import { Notify, type NotifyType } from '..';
 import { useTranslate } from '../../../docs/site/use-translate';
-import { NotifyType } from '../Notify';
 
 const VanNotify = Notify.Component;
 

packages/vant/src/stepper/demo/index.vue

@@ -42,7 +42,7 @@ const disabledInput = ref(1);
 const beforeChange = () => {
   Toast.loading({ forbidClick: true });
 
-  return new Promise((resolve) => {
+  return new Promise<boolean>((resolve) => {
     setTimeout(() => {
       Toast.clear();
       resolve(true);

packages/vant/src/sticky/demo/index.vue

@@ -17,7 +17,7 @@ const t = useTranslate({
   },
 });
 
-const container = ref(null);
+const container = ref<Element>();
 </script>
 
 <template>

packages/vant/src/swipe-cell/demo/index.vue

@@ -38,10 +38,12 @@ const beforeClose = ({ position }: { position: string }) => {
     case 'outside':
       return true;
     case 'right':
-      return new Promise((resolve) => {
+      return new Promise<boolean>((resolve) => {
         Dialog.confirm({
           title: t('confirm'),
-        }).then(resolve);
+        }).then(() => {
+          resolve(true);
+        });
       });
   }
 };

packages/vant/src/tab/demo/index.vue

@@ -64,7 +64,7 @@ const beforeChange = (name: number) => {
   if (name === 1) {
     return false;
   }
-  return new Promise((resolve) => {
+  return new Promise<boolean>((resolve) => {
     resolve(name !== 3);
   });
 };

packages/vant/src/toast/Toast.tsx

@@ -4,6 +4,7 @@ import {
   onUnmounted,
   defineComponent,
   type PropType,
+  type TeleportProps,
   type CSSProperties,
   type ExtractPropTypes,
 } from 'vue';
@@ -49,6 +50,7 @@ const toastProps = {
   iconSize: numericProp,
   duration: makeNumberProp(2000),
   position: makeStringProp<ToastPosition>('middle'),
+  teleport: [String, Object] as PropType<TeleportProps['to']>,
   className: unknownProp,
   iconPrefix: String,
   transition: makeStringProp('van-fade'),

packages/vant/src/uploader/demo/index.vue

@@ -56,7 +56,7 @@ const fileList3 = ref([]);
 
 const fileList4 = ref([{ url: 'https://img.yzcdn.cn/vant/sand.jpg' }]);
 
-const fileList5 = ref([
+const fileList5 = ref<UploaderFileListItem[]>([
   { url: 'https://img.yzcdn.cn/vant/leaf.jpg' },
   {
     url: 'https://img.yzcdn.cn/vant/sand.jpg',
@@ -73,7 +73,7 @@ const fileList5 = ref([
   },
 ]);
 
-const statusFileList = ref([
+const statusFileList = ref<UploaderFileListItem[]>([
   {
     url: 'https://img.yzcdn.cn/vant/leaf.jpg',
     status: 'uploading',
@@ -86,16 +86,19 @@ const statusFileList = ref([
   },
 ]);
 
-const previewCoverFiles = ref([
+const previewCoverFiles = ref<UploaderFileListItem[]>([
   {
     url: 'https://img.yzcdn.cn/vant/leaf.jpg',
     file: {
       name: t('imageName'),
-    },
+    } as File,
   },
 ]);
 
-const beforeRead = (file: File) => {
+const beforeRead = (file: File | File[]) => {
+  if (Array.isArray(file)) {
+    return true;
+  }
   if (file.type !== 'image/jpeg') {
     Toast(t('invalidType'));
     return false;
@@ -103,11 +106,14 @@ const beforeRead = (file: File) => {
   return true;
 };
 
-const afterRead = (file: UploaderFileListItem, detail: unknown) => {
+const afterRead = (
+  file: UploaderFileListItem | UploaderFileListItem[],
+  detail: unknown
+) => {
   console.log(file, detail);
 };
 
-const afterReadFailed = (item: UploaderFileListItem) => {
+const setItemLoading = (item: UploaderFileListItem) => {
   item.status = 'uploading';
   item.message = t('uploading');
 
@@ -117,6 +123,16 @@ const afterReadFailed = (item: UploaderFileListItem) => {
   }, 1000);
 };
 
+const afterReadFailed = (
+  item: UploaderFileListItem | UploaderFileListItem[]
+) => {
+  if (Array.isArray(item)) {
+    item.forEach(setItemLoading);
+  } else {
+    setItemLoading(item);
+  }
+};
+
 const onOversize = (file: UploaderFileListItem, detail: unknown) => {
   console.log(file, detail);
   Toast(t('overSizeTip'));

packages/vant/src/uploader/test/index.spec.ts

@@ -99,7 +99,7 @@ test('set input name', (done) => {
         detail: { name: string | number; index: number }
       ) => {
         expect(detail.name).toEqual('uploader');
-        return file;
+        return true;
       },
       afterRead: (
         readFile: UploaderFileListItem | UploaderFileListItem[],

packages/vant/src/uploader/types.ts

@@ -20,15 +20,13 @@ export type UploaderFileListItem = {
 
 export type UploaderMaxSize = number | string | ((file: File) => boolean);
 
-type PromiseOrNot<T> = T | Promise<T>;
-
 export type UploaderBeforeRead = (
   file: File | File[],
   detail: {
     name: string | number;
     index: number;
   }
-) => PromiseOrNot<File | File[] | undefined>;
+) => boolean | undefined | Promise<File | File[] | undefined>;
 
 export type UploaderAfterRead = (
   items: UploaderFileListItem | UploaderFileListItem[],

packages/vant/src/utils/interceptor.ts

@@ -3,7 +3,7 @@ import { isPromise } from './validate';
 
 export type Interceptor = (
   ...args: any[]
-) => Promise<boolean> | boolean | undefined;
+) => Promise<boolean> | boolean | undefined | void;
 
 export function callInterceptor(
   interceptor: Interceptor | undefined,