vant 3.2.2 → 3.2.6

package/lib/icon/index.less

@@ -1,4 +1,4 @@
-@import '~@vant/icons/src/encode-woff2.less';
+@import '@vant/icons/src/encode-woff2.less';
 
 .van-icon {
   &__image {

package/lib/image/Image.d.ts

@@ -14,17 +14,17 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    errorIcon: {
+        type: PropType<string>;
+        default: string;
+    };
     iconPrefix: StringConstructor;
     showLoading: {
         type: BooleanConstructor;
         default: true;
     };
-    errorIcon: {
-        type: StringConstructor;
-        default: string;
-    };
     loadingIcon: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("error" | "load")[], "error" | "load", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
@@ -38,26 +38,26 @@ declare const _default: import("vue").DefineComponent<{
     lazyLoad?: unknown;
     iconSize?: unknown;
     showError?: unknown;
+    errorIcon?: unknown;
     iconPrefix?: unknown;
     showLoading?: unknown;
-    errorIcon?: unknown;
     loadingIcon?: unknown;
 } & {
     round: boolean;
     showError: boolean;
     lazyLoad: boolean;
-    showLoading: boolean;
     errorIcon: string;
+    showLoading: boolean;
     loadingIcon: string;
 } & {
-    iconPrefix?: string | undefined;
-    iconSize?: string | number | undefined;
     width?: string | number | undefined;
-    src?: string | undefined;
-    alt?: string | undefined;
-    fit?: ImageFit | undefined;
     height?: string | number | undefined;
+    iconPrefix?: string | undefined;
+    alt?: string | undefined;
+    src?: string | undefined;
+    iconSize?: string | number | undefined;
     radius?: string | number | undefined;
+    fit?: ImageFit | undefined;
 }> & {
     onLoad?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -65,8 +65,8 @@ declare const _default: import("vue").DefineComponent<{
     round: boolean;
     showError: boolean;
     lazyLoad: boolean;
-    showLoading: boolean;
     errorIcon: string;
+    showLoading: boolean;
     loadingIcon: string;
 }>;
 export default _default;

package/lib/image/Image.js

@@ -20,22 +20,16 @@ var _default = (0, _vue.defineComponent)({
     alt: String,
     fit: String,
     round: Boolean,
-    width: [Number, String],
-    height: [Number, String],
-    radius: [Number, String],
+    width: _utils.numericProp,
+    height: _utils.numericProp,
+    radius: _utils.numericProp,
     lazyLoad: Boolean,
-    iconSize: [Number, String],
+    iconSize: _utils.numericProp,
     showError: _utils.truthProp,
+    errorIcon: (0, _utils.makeStringProp)('photo-fail'),
     iconPrefix: String,
     showLoading: _utils.truthProp,
-    errorIcon: {
-      type: String,
-      default: 'photo-fail'
-    },
-    loadingIcon: {
-      type: String,
-      default: 'photo'
-    }
+    loadingIcon: (0, _utils.makeStringProp)('photo')
   },
   emits: ['load', 'error'],
 
@@ -45,8 +39,7 @@ var _default = (0, _vue.defineComponent)({
   }) {
     var error = (0, _vue.ref)(false);
     var loading = (0, _vue.ref)(true);
-    var imageRef = (0, _vue.ref)(); // TODO: types
-
+    var imageRef = (0, _vue.ref)();
     var {
       $Lazyload
     } = (0, _vue.getCurrentInstance)().proxy;
@@ -84,28 +77,15 @@ var _default = (0, _vue.defineComponent)({
       emit('error', event);
     };
 
-    var renderLoadingIcon = () => {
-      if (slots.loading) {
-        return slots.loading();
-      }
-
-      return (0, _vue.createVNode)(_icon.Icon, {
-        "size": props.iconSize,
-        "name": props.loadingIcon,
-        "class": bem('loading-icon'),
-        "classPrefix": props.iconPrefix
-      }, null);
-    };
-
-    var renderErrorIcon = () => {
-      if (slots.error) {
-        return slots.error();
+    var renderIcon = (name, className, slot) => {
+      if (slot) {
+        return slot();
       }
 
       return (0, _vue.createVNode)(_icon.Icon, {
+        "name": name,
         "size": props.iconSize,
-        "name": props.errorIcon,
-        "class": bem('error-icon'),
+        "class": className,
         "classPrefix": props.iconPrefix
       }, null);
     };
@@ -114,13 +94,13 @@ var _default = (0, _vue.defineComponent)({
       if (loading.value && props.showLoading) {
         return (0, _vue.createVNode)("div", {
           "class": bem('loading')
-        }, [renderLoadingIcon()]);
+        }, [renderIcon(props.loadingIcon, bem('loading-icon'), slots.loading)]);
       }
 
       if (error.value && props.showError) {
         return (0, _vue.createVNode)("div", {
           "class": bem('error')
-        }, [renderErrorIcon()]);
+        }, [renderIcon(props.errorIcon, bem('error-icon'), slots.error)]);
       }
     };
 

package/lib/image/index.css

@@ -1 +1 @@
-:root{--van-image-placeholder-text-color:var(--van-gray-6);--van-image-placeholder-font-size:var(--van-font-size-md);--van-image-placeholder-background-color:var(--van-background-color);--van-image-loading-icon-size:32px;--van-image-loading-icon-color:var(--van-gray-4);--van-image-error-icon-size:32px;--van-image-error-icon-color:var(--van-gray-4)}.van-image{position:relative;display:inline-block}.van-image--round{overflow:hidden;border-radius:var(--van-border-radius-max)}.van-image--round .van-image__img{border-radius:inherit}.van-image__error,.van-image__img,.van-image__loading{display:block;width:100%;height:100%}.van-image__error,.van-image__loading{position:absolute;top:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-image-placeholder-text-color);font-size:var(--van-image-placeholder-font-size);background-color:var(--van-image-placeholder-background-color)}.van-image__loading-icon{color:var(--van-image-loading-icon-color);font-size:var(--van-image-loading-icon-size)}.van-image__error-icon{color:var(--van-image-error-icon-color);font-size:var(--van-image-error-icon-size)}
+:root{--van-image-placeholder-text-color:var(--van-gray-6);--van-image-placeholder-font-size:var(--van-font-size-md);--van-image-placeholder-background-color:var(--van-background-color);--van-image-loading-icon-size:32px;--van-image-loading-icon-color:var(--van-gray-4);--van-image-error-icon-size:32px;--van-image-error-icon-color:var(--van-gray-4)}.van-image{position:relative;display:inline-block}.van-image--round{overflow:hidden;border-radius:var(--van-border-radius-max)}.van-image--round .van-image__img{border-radius:inherit}.van-image__error,.van-image__img,.van-image__loading{display:block;width:100%;height:100%}.van-image__error,.van-image__loading{position:absolute;top:0;left:0;display:flex;flex-direction:column;align-items:center;justify-content:center;color:var(--van-image-placeholder-text-color);font-size:var(--van-image-placeholder-font-size);background:var(--van-image-placeholder-background-color)}.van-image__loading-icon{color:var(--van-image-loading-icon-color);font-size:var(--van-image-loading-icon-size)}.van-image__error-icon{color:var(--van-image-error-icon-color);font-size:var(--van-image-error-icon-size)}

package/lib/image/index.d.ts

@@ -12,17 +12,17 @@ export declare const Image: import("../utils").WithInstall<import("vue").DefineC
         type: BooleanConstructor;
         default: true;
     };
+    errorIcon: {
+        type: import("vue").PropType<string>;
+        default: string;
+    };
     iconPrefix: StringConstructor;
     showLoading: {
         type: BooleanConstructor;
         default: true;
     };
-    errorIcon: {
-        type: StringConstructor;
-        default: string;
-    };
     loadingIcon: {
-        type: StringConstructor;
+        type: import("vue").PropType<string>;
         default: string;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("error" | "load")[], "error" | "load", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
@@ -36,26 +36,26 @@ export declare const Image: import("../utils").WithInstall<import("vue").DefineC
     lazyLoad?: unknown;
     iconSize?: unknown;
     showError?: unknown;
+    errorIcon?: unknown;
     iconPrefix?: unknown;
     showLoading?: unknown;
-    errorIcon?: unknown;
     loadingIcon?: unknown;
 } & {
     round: boolean;
     showError: boolean;
     lazyLoad: boolean;
-    showLoading: boolean;
     errorIcon: string;
+    showLoading: boolean;
     loadingIcon: string;
 } & {
-    iconPrefix?: string | undefined;
-    iconSize?: string | number | undefined;
     width?: string | number | undefined;
-    src?: string | undefined;
-    alt?: string | undefined;
-    fit?: import("./Image").ImageFit | undefined;
     height?: string | number | undefined;
+    iconPrefix?: string | undefined;
+    alt?: string | undefined;
+    src?: string | undefined;
+    iconSize?: string | number | undefined;
     radius?: string | number | undefined;
+    fit?: import("./Image").ImageFit | undefined;
 }> & {
     onLoad?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -63,8 +63,8 @@ export declare const Image: import("../utils").WithInstall<import("vue").DefineC
     round: boolean;
     showError: boolean;
     lazyLoad: boolean;
-    showLoading: boolean;
     errorIcon: string;
+    showLoading: boolean;
     loadingIcon: string;
 }>>;
 export default Image;

package/lib/image/index.less

@@ -42,7 +42,7 @@
     justify-content: center;
     color: var(--van-image-placeholder-text-color);
     font-size: var(--van-image-placeholder-font-size);
-    background-color: var(--van-image-placeholder-background-color);
+    background: var(--van-image-placeholder-background-color);
   }
 
   &__loading-icon {

package/lib/image-preview/ImagePreview.d.ts

@@ -7,6 +7,18 @@ declare const props: {
         type: BooleanConstructor;
         default: true;
     };
+    images: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    minZoom: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    maxZoom: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     overlay: {
         type: BooleanConstructor;
         default: true;
@@ -17,26 +29,13 @@ declare const props: {
         default: true;
     };
     className: PropType<unknown>;
+    closeIcon: {
+        type: PropType<string>;
+        default: string;
+    };
     transition: StringConstructor;
     beforeClose: PropType<Interceptor>;
     overlayStyle: PropType<CSSProperties>;
-    showIndicators: BooleanConstructor;
-    closeOnPopstate: {
-        type: BooleanConstructor;
-        default: true;
-    };
-    images: {
-        type: PropType<string[]>;
-        default: () => never[];
-    };
-    minZoom: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    maxZoom: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
     swipeDuration: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
@@ -45,13 +44,14 @@ declare const props: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    closeIcon: {
-        type: StringConstructor;
-        default: string;
+    showIndicators: BooleanConstructor;
+    closeOnPopstate: {
+        type: BooleanConstructor;
+        default: true;
     };
     closeIconPosition: {
         type: PropType<PopupCloseIconPosition>;
-        default: string;
+        default: PopupCloseIconPosition;
     };
 };
 export declare type ImagePreviewProps = ExtractPropTypes<typeof props>;
@@ -61,6 +61,18 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    images: {
+        type: PropType<string[]>;
+        default: () => never[];
+    };
+    minZoom: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    maxZoom: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     overlay: {
         type: BooleanConstructor;
         default: true;
@@ -71,26 +83,13 @@ declare const _default: import("vue").DefineComponent<{
         default: true;
     };
     className: PropType<unknown>;
+    closeIcon: {
+        type: PropType<string>;
+        default: string;
+    };
     transition: StringConstructor;
     beforeClose: PropType<Interceptor>;
     overlayStyle: PropType<CSSProperties>;
-    showIndicators: BooleanConstructor;
-    closeOnPopstate: {
-        type: BooleanConstructor;
-        default: true;
-    };
-    images: {
-        type: PropType<string[]>;
-        default: () => never[];
-    };
-    minZoom: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    maxZoom: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
     swipeDuration: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
@@ -99,48 +98,49 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    closeIcon: {
-        type: StringConstructor;
-        default: string;
+    showIndicators: BooleanConstructor;
+    closeOnPopstate: {
+        type: BooleanConstructor;
+        default: true;
     };
     closeIconPosition: {
         type: PropType<PopupCloseIconPosition>;
-        default: string;
+        default: PopupCloseIconPosition;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "close" | "closed" | "update:show" | "scale")[], "change" | "close" | "closed" | "update:show" | "scale", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
     loop?: unknown;
+    images?: unknown;
+    minZoom?: unknown;
+    maxZoom?: unknown;
     overlay?: unknown;
     closeable?: unknown;
     showIndex?: unknown;
     className?: unknown;
+    closeIcon?: unknown;
     transition?: unknown;
     beforeClose?: unknown;
     overlayStyle?: unknown;
-    showIndicators?: unknown;
-    closeOnPopstate?: unknown;
-    images?: unknown;
-    minZoom?: unknown;
-    maxZoom?: unknown;
     swipeDuration?: unknown;
     startPosition?: unknown;
-    closeIcon?: unknown;
+    showIndicators?: unknown;
+    closeOnPopstate?: unknown;
     closeIconPosition?: unknown;
 } & {
+    loop: boolean;
     overlay: boolean;
     show: boolean;
+    closeIcon: string;
     closeable: boolean;
     closeOnPopstate: boolean;
-    closeIcon: string;
     closeIconPosition: PopupCloseIconPosition;
     swipeDuration: string | number;
-    loop: boolean;
     showIndicators: boolean;
     startPosition: string | number;
     minZoom: string | number;
     maxZoom: string | number;
-    showIndex: boolean;
     images: string[];
+    showIndex: boolean;
 } & {
     beforeClose?: Interceptor | undefined;
     overlayStyle?: CSSProperties | undefined;
@@ -153,19 +153,19 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     onScale?: ((...args: any[]) => any) | undefined;
 }, {
+    loop: boolean;
     overlay: boolean;
     show: boolean;
+    closeIcon: string;
     closeable: boolean;
     closeOnPopstate: boolean;
-    closeIcon: string;
     closeIconPosition: PopupCloseIconPosition;
     swipeDuration: string | number;
-    loop: boolean;
     showIndicators: boolean;
     startPosition: string | number;
     minZoom: string | number;
     maxZoom: string | number;
-    showIndex: boolean;
     images: string[];
+    showIndex: boolean;
 }>;
 export default _default;

package/lib/image-preview/ImagePreview.js

@@ -25,46 +25,26 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Composables
 // Components
 var [name, bem] = (0, _utils.createNamespace)('image-preview');
+var popupProps = ['show', 'transition', 'overlayStyle', 'closeOnPopstate'];
 var props = {
   show: Boolean,
   loop: _utils.truthProp,
+  images: (0, _utils.makeArrayProp)(),
+  minZoom: (0, _utils.makeNumericProp)(1 / 3),
+  maxZoom: (0, _utils.makeNumericProp)(3),
   overlay: _utils.truthProp,
   closeable: Boolean,
   showIndex: _utils.truthProp,
   className: _utils.unknownProp,
+  closeIcon: (0, _utils.makeStringProp)('clear'),
   transition: String,
   beforeClose: Function,
   overlayStyle: Object,
+  swipeDuration: (0, _utils.makeNumericProp)(300),
+  startPosition: (0, _utils.makeNumericProp)(0),
   showIndicators: Boolean,
   closeOnPopstate: _utils.truthProp,
-  images: {
-    type: Array,
-    default: () => []
-  },
-  minZoom: {
-    type: [Number, String],
-    default: 1 / 3
-  },
-  maxZoom: {
-    type: [Number, String],
-    default: 3
-  },
-  swipeDuration: {
-    type: [Number, String],
-    default: 300
-  },
-  startPosition: {
-    type: [Number, String],
-    default: 0
-  },
-  closeIcon: {
-    type: String,
-    default: 'clear'
-  },
-  closeIconPosition: {
-    type: String,
-    default: 'top-right'
-  }
+  closeIconPosition: (0, _utils.makeStringProp)('top-right')
 };
 
 var _default = (0, _vue.defineComponent)({
@@ -86,7 +66,7 @@ var _default = (0, _vue.defineComponent)({
 
     var resize = () => {
       if (swipeRef.value) {
-        var rect = swipeRef.value.$el.getBoundingClientRect();
+        var rect = (0, _use.useRect)(swipeRef.value.$el);
         state.rootWidth = rect.width;
         state.rootHeight = rect.height;
         swipeRef.value.resize();
@@ -98,8 +78,7 @@ var _default = (0, _vue.defineComponent)({
     var updateShow = show => emit('update:show', show);
 
     var emitClose = () => {
-      (0, _utils.callInterceptor)({
-        interceptor: props.beforeClose,
+      (0, _utils.callInterceptor)(props.beforeClose, {
         args: [state.active],
         done: () => updateShow(false)
       });
@@ -203,10 +182,9 @@ var _default = (0, _vue.defineComponent)({
     return () => (0, _vue.createVNode)(_popup.Popup, (0, _vue.mergeProps)({
       "class": [bem(), props.className],
       "overlayClass": bem('overlay'),
-      "onClosed": onClosed
-    }, (0, _utils.pick)(props, ['show', 'transition', 'overlayStyle', 'closeOnPopstate']), {
-      'onUpdate:show': updateShow
-    }), {
+      "onClosed": onClosed,
+      "onUpdate:show": updateShow
+    }, (0, _utils.pick)(props, popupProps)), {
       default: () => [renderClose(), renderImages(), renderIndex(), renderCover()]
     });
   }

package/lib/image-preview/ImagePreviewItem.d.ts

@@ -33,8 +33,8 @@ declare const _default: import("vue").DefineComponent<{
     rootWidth: number;
     rootHeight: number;
 } & {
-    active?: number | undefined;
     src?: string | undefined;
+    active?: number | undefined;
 }> & {
     onClose?: ((...args: any[]) => any) | undefined;
     onScale?: ((...args: any[]) => any) | undefined;

package/lib/image-preview/ImagePreviewItem.js

@@ -18,9 +18,7 @@ var _swipeItem = require("../swipe-item");
 // Utils
 // Composables
 // Components
-function getDistance(touches) {
-  return Math.sqrt(Math.pow(touches[0].clientX - touches[1].clientX, 2) + Math.pow(touches[0].clientY - touches[1].clientY, 2));
-}
+var getDistance = touches => Math.sqrt(Math.pow(touches[0].clientX - touches[1].clientX, 2) + Math.pow(touches[0].clientY - touches[1].clientY, 2));
 
 var bem = (0, _utils.createNamespace)('image-preview')[1];
 
@@ -29,22 +27,10 @@ var _default = (0, _vue.defineComponent)({
     src: String,
     show: Boolean,
     active: Number,
-    minZoom: {
-      type: [Number, String],
-      required: true
-    },
-    maxZoom: {
-      type: [Number, String],
-      required: true
-    },
-    rootWidth: {
-      type: Number,
-      required: true
-    },
-    rootHeight: {
-      type: Number,
-      required: true
-    }
+    minZoom: (0, _utils.makeRequiredProp)(_utils.numericProp),
+    maxZoom: (0, _utils.makeRequiredProp)(_utils.numericProp),
+    rootWidth: (0, _utils.makeRequiredProp)(Number),
+    rootHeight: (0, _utils.makeRequiredProp)(Number)
   },
   emits: ['scale', 'close'],