vant 3.2.4 → 3.2.8

package/es/icon/Icon.js

@@ -1,32 +1,29 @@
 import { createVNode as _createVNode } from "vue";
 import { defineComponent, inject, computed } from 'vue';
-import { addUnit, createNamespace } from '../utils';
+import { addUnit, numericProp, makeStringProp, createNamespace } from '../utils';
 import { Badge } from '../badge';
 import { CONFIG_PROVIDER_KEY } from '../config-provider/ConfigProvider';
 var [name, bem] = createNamespace('icon');
 
-function isImage(name) {
-  return name == null ? void 0 : name.includes('/');
-}
+var isImage = name => name == null ? void 0 : name.includes('/');
 
+var iconProps = {
+  dot: Boolean,
+  tag: makeStringProp('i'),
+  name: String,
+  size: numericProp,
+  badge: numericProp,
+  color: String,
+  classPrefix: String
+};
 export default defineComponent({
   name,
-  props: {
-    dot: Boolean,
-    name: String,
-    size: [Number, String],
-    badge: [Number, String],
-    color: String,
-    classPrefix: String,
-    tag: {
-      type: String,
-      default: 'i'
-    }
-  },
+  props: iconProps,
 
-  setup(props, {
-    slots
-  }) {
+  setup(props, _ref) {
+    var {
+      slots
+    } = _ref;
     var config = inject(CONFIG_PROVIDER_KEY, null);
     var classPrefix = computed(() => props.classPrefix || (config == null ? void 0 : config.iconPrefix) || bem());
     return () => {

package/es/icon/index.d.ts

@@ -1,22 +1,22 @@
 export declare const Icon: import("../utils").WithInstall<import("vue").DefineComponent<{
     dot: BooleanConstructor;
+    tag: {
+        type: import("vue").PropType<keyof HTMLElementTagNameMap>;
+        default: keyof HTMLElementTagNameMap;
+    };
     name: StringConstructor;
     size: (NumberConstructor | StringConstructor)[];
     badge: (NumberConstructor | StringConstructor)[];
     color: StringConstructor;
     classPrefix: StringConstructor;
-    tag: {
-        type: import("vue").PropType<keyof HTMLElementTagNameMap>;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     dot?: unknown;
+    tag?: unknown;
     name?: unknown;
     size?: unknown;
     badge?: unknown;
     color?: unknown;
     classPrefix?: unknown;
-    tag?: unknown;
 } & {
     dot: boolean;
     tag: keyof HTMLElementTagNameMap;
@@ -31,3 +31,4 @@ export declare const Icon: import("../utils").WithInstall<import("vue").DefineCo
     tag: keyof HTMLElementTagNameMap;
 }>>;
 export default Icon;
+export type { IconProps } from './Icon';

package/es/image/Image.d.ts

@@ -1,6 +1,6 @@
-import { PropType } from 'vue';
+import { PropType, ExtractPropTypes } from 'vue';
 export declare type ImageFit = 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
-declare const _default: import("vue").DefineComponent<{
+declare const imageProps: {
     src: StringConstructor;
     alt: StringConstructor;
     fit: PropType<ImageFit>;
@@ -14,17 +14,46 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    errorIcon: {
+        type: PropType<string>;
+        default: string;
+    };
     iconPrefix: StringConstructor;
     showLoading: {
         type: BooleanConstructor;
         default: true;
     };
+    loadingIcon: {
+        type: PropType<string>;
+        default: string;
+    };
+};
+export declare type ImageProps = ExtractPropTypes<typeof imageProps>;
+declare const _default: import("vue").DefineComponent<{
+    src: StringConstructor;
+    alt: StringConstructor;
+    fit: PropType<ImageFit>;
+    round: BooleanConstructor;
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    radius: (NumberConstructor | StringConstructor)[];
+    lazyLoad: BooleanConstructor;
+    iconSize: (NumberConstructor | StringConstructor)[];
+    showError: {
+        type: BooleanConstructor;
+        default: true;
+    };
     errorIcon: {
-        type: StringConstructor;
+        type: PropType<string>;
         default: string;
     };
+    iconPrefix: StringConstructor;
+    showLoading: {
+        type: BooleanConstructor;
+        default: true;
+    };
     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 +67,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;
+    width?: string | number | undefined;
     height?: string | number | undefined;
+    iconPrefix?: string | undefined;
     alt?: string | undefined;
     src?: string | undefined;
-    width?: string | number | undefined;
     iconSize?: string | number | undefined;
-    radius?: string | number | undefined;
     fit?: ImageFit | undefined;
+    radius?: string | number | undefined;
 }> & {
     onLoad?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -65,8 +94,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/es/image/Image.js

@@ -1,40 +1,36 @@
 import { withDirectives as _withDirectives, mergeProps as _mergeProps, resolveDirective as _resolveDirective, createVNode as _createVNode } from "vue";
 import { ref, watch, computed, onBeforeUnmount, defineComponent, getCurrentInstance } from 'vue'; // Utils
 
-import { isDef, addUnit, inBrowser, truthProp, createNamespace } from '../utils'; // Components
+import { isDef, addUnit, inBrowser, truthProp, numericProp, makeStringProp, createNamespace } from '../utils'; // Components
 
 import { Icon } from '../icon';
 var [name, bem] = createNamespace('image');
+var imageProps = {
+  src: String,
+  alt: String,
+  fit: String,
+  round: Boolean,
+  width: numericProp,
+  height: numericProp,
+  radius: numericProp,
+  lazyLoad: Boolean,
+  iconSize: numericProp,
+  showError: truthProp,
+  errorIcon: makeStringProp('photo-fail'),
+  iconPrefix: String,
+  showLoading: truthProp,
+  loadingIcon: makeStringProp('photo')
+};
 export default defineComponent({
   name,
-  props: {
-    src: String,
-    alt: String,
-    fit: String,
-    round: Boolean,
-    width: [Number, String],
-    height: [Number, String],
-    radius: [Number, String],
-    lazyLoad: Boolean,
-    iconSize: [Number, String],
-    showError: truthProp,
-    iconPrefix: String,
-    showLoading: truthProp,
-    errorIcon: {
-      type: String,
-      default: 'photo-fail'
-    },
-    loadingIcon: {
-      type: String,
-      default: 'photo'
-    }
-  },
+  props: imageProps,
   emits: ['load', 'error'],
 
-  setup(props, {
-    emit,
-    slots
-  }) {
+  setup(props, _ref) {
+    var {
+      emit,
+      slots
+    } = _ref;
     var error = ref(false);
     var loading = ref(true);
     var imageRef = ref();
@@ -75,28 +71,15 @@ export default defineComponent({
       emit('error', event);
     };
 
-    var renderLoadingIcon = () => {
-      if (slots.loading) {
-        return slots.loading();
-      }
-
-      return _createVNode(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 _createVNode(Icon, {
+        "name": name,
         "size": props.iconSize,
-        "name": props.errorIcon,
-        "class": bem('error-icon'),
+        "class": className,
         "classPrefix": props.iconPrefix
       }, null);
     };
@@ -105,13 +88,13 @@ export default defineComponent({
       if (loading.value && props.showLoading) {
         return _createVNode("div", {
           "class": bem('loading')
-        }, [renderLoadingIcon()]);
+        }, [renderIcon(props.loadingIcon, bem('loading-icon'), slots.loading)]);
       }
 
       if (error.value && props.showError) {
         return _createVNode("div", {
           "class": bem('error')
-        }, [renderErrorIcon()]);
+        }, [renderIcon(props.errorIcon, bem('error-icon'), slots.error)]);
       }
     };
 
@@ -141,17 +124,21 @@ export default defineComponent({
       }, attrs), null);
     };
 
-    var onLazyLoaded = ({
-      el
-    }) => {
+    var onLazyLoaded = _ref2 => {
+      var {
+        el
+      } = _ref2;
+
       if (el === imageRef.value && loading.value) {
         onLoad();
       }
     };
 
-    var onLazyLoadError = ({
-      el
-    }) => {
+    var onLazyLoadError = _ref3 => {
+      var {
+        el
+      } = _ref3;
+
       if (el === imageRef.value && !error.value) {
         onError();
       }

package/es/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-text-color-2);--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/es/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;
+    width?: string | number | undefined;
     height?: string | number | undefined;
+    iconPrefix?: string | undefined;
     alt?: string | undefined;
     src?: string | undefined;
-    width?: string | number | undefined;
     iconSize?: string | number | undefined;
-    radius?: string | number | undefined;
     fit?: import("./Image").ImageFit | undefined;
+    radius?: string | number | undefined;
 }> & {
     onLoad?: ((...args: any[]) => any) | undefined;
     onError?: ((...args: any[]) => any) | undefined;
@@ -63,9 +63,9 @@ 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;
-export type { ImageFit } from './Image';
+export type { ImageFit, ImageProps } from './Image';

package/es/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/es/image/var.less

@@ -1,6 +1,6 @@
 @import '../style/var.less';
 
-@image-placeholder-text-color: var(--van-gray-6);
+@image-placeholder-text-color: var(--van-text-color-2);
 @image-placeholder-font-size: var(--van-font-size-md);
 @image-placeholder-background-color: var(--van-background-color);
 @image-loading-icon-size: 32px;

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

@@ -1,12 +1,24 @@
 import { PropType, CSSProperties, ExtractPropTypes } from 'vue';
 import { Interceptor } from '../utils';
 import { PopupCloseIconPosition } from '../popup';
-declare const props: {
+declare const imagePreviewProps: {
     show: BooleanConstructor;
     loop: {
         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,22 +44,35 @@ 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>;
+export declare type ImagePreviewProps = ExtractPropTypes<typeof imagePreviewProps>;
 declare const _default: import("vue").DefineComponent<{
     show: BooleanConstructor;
     loop: {
         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;
     showIndicators: boolean;
     startPosition: string | number;
     minZoom: string | number;
     maxZoom: string | number;
-    showIndex: boolean;
     images: string[];
+    showIndex: boolean;
 } & {
     beforeClose?: Interceptor | undefined;
     overlayStyle?: CSSProperties | undefined;
@@ -156,16 +156,16 @@ declare const _default: import("vue").DefineComponent<{
     loop: boolean;
     overlay: boolean;
     show: boolean;
+    closeIcon: string;
     closeable: boolean;
     closeOnPopstate: boolean;
-    closeIcon: string;
     closeIconPosition: PopupCloseIconPosition;
     swipeDuration: string | number;
     showIndicators: boolean;
     startPosition: string | number;
     minZoom: string | number;
     maxZoom: string | number;
-    showIndex: boolean;
     images: string[];
+    showIndex: boolean;
 }>;
 export default _default;