vant 3.2.4 → 3.2.8

package/es/uploader/index.d.ts

@@ -1,10 +1,34 @@
 import { UploaderProps } from './Uploader';
 export declare const Uploader: import("../utils").WithInstall<import("vue").DefineComponent<{
+    name: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: string;
+    };
+    accept: {
+        type: import("vue").PropType<string>;
+        default: string;
+    };
     capture: StringConstructor;
     multiple: BooleanConstructor;
     disabled: BooleanConstructor;
     readonly: BooleanConstructor;
     lazyLoad: BooleanConstructor;
+    maxCount: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    imageFit: {
+        type: import("vue").PropType<import("..").ImageFit>;
+        default: import("..").ImageFit;
+    };
+    resultType: {
+        type: import("vue").PropType<import("./types").UploaderResultType>;
+        default: import("./types").UploaderResultType;
+    };
+    uploadIcon: {
+        type: import("vue").PropType<string>;
+        default: string;
+    };
     uploadText: StringConstructor;
     deletable: {
         type: BooleanConstructor;
@@ -15,6 +39,10 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
+    modelValue: {
+        type: import("vue").PropType<import("./types").UploaderFileListItem[]>;
+        default: () => never[];
+    };
     beforeRead: import("vue").PropType<import("./types").UploaderBeforeRead>;
     beforeDelete: import("vue").PropType<import("../utils").Interceptor>;
     previewSize: (NumberConstructor | StringConstructor)[];
@@ -27,79 +55,51 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
-    name: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: string;
-    };
-    accept: {
-        type: StringConstructor;
-        default: string;
-    };
-    modelValue: {
-        type: import("vue").PropType<import("./types").UploaderFileListItem[]>;
-        default: () => never[];
-    };
     maxSize: {
         type: import("vue").PropType<import("./types").UploaderMaxSize>;
         default: number;
     };
-    maxCount: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    imageFit: {
-        type: import("vue").PropType<import("..").ImageFit>;
-        default: string;
-    };
-    resultType: {
-        type: import("vue").PropType<import("./types").UploaderResultType>;
-        default: string;
-    };
-    uploadIcon: {
-        type: StringConstructor;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "delete" | "oversize" | "click-upload" | "close-preview" | "click-preview")[], "update:modelValue" | "delete" | "oversize" | "click-upload" | "close-preview" | "click-preview", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    name?: unknown;
+    accept?: unknown;
     capture?: unknown;
     multiple?: unknown;
     disabled?: unknown;
     readonly?: unknown;
     lazyLoad?: unknown;
+    maxCount?: unknown;
+    imageFit?: unknown;
+    resultType?: unknown;
+    uploadIcon?: unknown;
     uploadText?: unknown;
     deletable?: unknown;
     afterRead?: unknown;
     showUpload?: unknown;
+    modelValue?: unknown;
     beforeRead?: unknown;
     beforeDelete?: unknown;
     previewSize?: unknown;
     previewImage?: unknown;
     previewOptions?: unknown;
     previewFullImage?: unknown;
-    name?: unknown;
-    accept?: unknown;
-    modelValue?: unknown;
     maxSize?: unknown;
-    maxCount?: unknown;
-    imageFit?: unknown;
-    resultType?: unknown;
-    uploadIcon?: unknown;
 } & {
     name: string | number;
     accept: string;
     disabled: boolean;
-    readonly: boolean;
     modelValue: import("./types").UploaderFileListItem[];
+    readonly: boolean;
     multiple: boolean;
     lazyLoad: boolean;
+    maxCount: string | number;
+    imageFit: import("..").ImageFit;
+    resultType: import("./types").UploaderResultType;
+    uploadIcon: string;
     deletable: boolean;
     showUpload: boolean;
     previewImage: boolean;
     previewFullImage: boolean;
     maxSize: import("./types").UploaderMaxSize;
-    maxCount: string | number;
-    imageFit: import("..").ImageFit;
-    resultType: import("./types").UploaderResultType;
-    uploadIcon: string;
 } & {
     capture?: string | undefined;
     beforeRead?: import("./types").UploaderBeforeRead | undefined;
@@ -119,19 +119,19 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
     name: string | number;
     accept: string;
     disabled: boolean;
-    readonly: boolean;
     modelValue: import("./types").UploaderFileListItem[];
+    readonly: boolean;
     multiple: boolean;
     lazyLoad: boolean;
+    maxCount: string | number;
+    imageFit: import("..").ImageFit;
+    resultType: import("./types").UploaderResultType;
+    uploadIcon: string;
     deletable: boolean;
     showUpload: boolean;
     previewImage: boolean;
     previewFullImage: boolean;
     maxSize: import("./types").UploaderMaxSize;
-    maxCount: string | number;
-    imageFit: import("..").ImageFit;
-    resultType: import("./types").UploaderResultType;
-    uploadIcon: string;
 }>>;
 export default Uploader;
 export type { UploaderProps };

package/es/uploader/index.less

@@ -70,7 +70,7 @@
     width: var(--van-uploader-size);
     height: var(--van-uploader-size);
     margin: 0 var(--van-padding-xs) var(--van-padding-xs) 0;
-    background-color: var(--van-uploader-upload-background-color);
+    background: var(--van-uploader-upload-background-color);
 
     &:active {
       background-color: var(--van-uploader-upload-active-color);
@@ -110,7 +110,7 @@
       right: 0;
       width: var(--van-uploader-delete-icon-size);
       height: var(--van-uploader-delete-icon-size);
-      background-color: var(--van-uploader-delete-background-color);
+      background: var(--van-uploader-delete-background-color);
       border-radius: 0 0 0 12px;
 
       &-icon {
@@ -143,7 +143,7 @@
     align-items: center;
     justify-content: center;
     color: var(--van-uploader-mask-text-color);
-    background-color: var(--van-uploader-mask-background-color);
+    background: var(--van-uploader-mask-background-color);
 
     &-icon {
       font-size: var(--van-uploader-mask-icon-size);
@@ -170,7 +170,7 @@
     justify-content: center;
     width: var(--van-uploader-size);
     height: var(--van-uploader-size);
-    background-color: var(--van-uploader-file-background-color);
+    background: var(--van-uploader-file-background-color);
 
     &-icon {
       color: var(--van-uploader-file-icon-color);

package/es/uploader/utils.d.ts

@@ -1,12 +1,12 @@
 import type { UploaderMaxSize, UploaderResultType, UploaderFileListItem } from './types';
-declare const name: string, bem: (el?: import("../utils/create/bem").Mods | undefined, mods?: import("../utils/create/bem").Mods | undefined) => import("../utils/create/bem").Mods;
+declare const name: string, bem: (el?: import("../utils").Mods | undefined, mods?: import("../utils").Mods | undefined) => import("../utils").Mods;
 export { name, bem };
-export declare function toArray<T>(item: T | T[]): T[];
+export declare const toArray: <T>(item: T | T[]) => T[];
 export declare function readFileContent(file: File, resultType: UploaderResultType): Promise<string | void>;
 export declare function isOversize(items: UploaderFileListItem | UploaderFileListItem[], maxSize: UploaderMaxSize): boolean;
 export declare function filterFiles(items: UploaderFileListItem[], maxSize: UploaderMaxSize): {
     valid: UploaderFileListItem[];
     invalid: UploaderFileListItem[];
 };
-export declare function isImageUrl(url: string): boolean;
+export declare const isImageUrl: (url: string) => boolean;
 export declare function isImageFile(item: UploaderFileListItem): boolean;

package/es/uploader/utils.js

@@ -1,13 +1,7 @@
 import { createNamespace, isFunction } from '../utils';
 var [name, bem] = createNamespace('uploader');
 export { name, bem };
-export function toArray(item) {
-  if (Array.isArray(item)) {
-    return item;
-  }
-
-  return [item];
-}
+export var toArray = item => Array.isArray(item) ? item : [item];
 export function readFileContent(file, resultType) {
   return new Promise(resolve => {
     if (resultType === 'file') {
@@ -57,9 +51,7 @@ export function filterFiles(items, maxSize) {
   };
 }
 var IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i;
-export function isImageUrl(url) {
-  return IMAGE_REGEXP.test(url);
-}
+export var isImageUrl = url => IMAGE_REGEXP.test(url);
 export function isImageFile(item) {
   // some special urls cannot be recognized
   // user can add `isImage` flag to mark it as an image url

package/es/uploader/var.less

@@ -3,7 +3,7 @@
 @uploader-size: 80px;
 @uploader-icon-size: 24px;
 @uploader-icon-color: var(--van-gray-4);
-@uploader-text-color: var(--van-gray-6);
+@uploader-text-color: var(--van-text-color-2);
 @uploader-text-font-size: var(--van-font-size-sm);
 @uploader-upload-background-color: var(--van-gray-1);
 @uploader-upload-active-color: var(--van-active-color);

package/{lib/utils/base.d.ts → es/utils/basic.d.ts}

@@ -1,4 +1,4 @@
-import { PropType, ComponentPublicInstance } from 'vue';
+import type { ComponentPublicInstance } from 'vue';
 export declare function noop(): void;
 export declare const extend: {
     <T, U>(target: T, source: U): T & U;
@@ -7,11 +7,6 @@ export declare const extend: {
     (target: object, ...sources: any[]): any;
 };
 export declare const inBrowser: boolean;
-export declare const unknownProp: PropType<unknown>;
-export declare const truthProp: {
-    type: BooleanConstructor;
-    default: true;
-};
 export declare type ComponentInstance = ComponentPublicInstance<{}, any>;
 export declare function get(object: any, path: string): any;
 export declare type Writeable<T> = {

package/es/utils/{base.js → basic.js}

@@ -1,12 +1,6 @@
 export function noop() {}
 export var extend = Object.assign;
-export var inBrowser = typeof window !== 'undefined'; // PropTypes
-
-export var unknownProp = null;
-export var truthProp = {
-  type: Boolean,
-  default: true
-}; // eslint-disable-next-line
+export var inBrowser = typeof window !== 'undefined'; // eslint-disable-next-line
 
 export function get(object, path) {
   var keys = path.split('.');

package/es/utils/constant.d.ts

@@ -7,4 +7,5 @@ export declare const BORDER_BOTTOM: string;
 export declare const BORDER_SURROUND: string;
 export declare const BORDER_TOP_BOTTOM: string;
 export declare const BORDER_UNSET_TOP_BOTTOM: string;
+export declare const HAPTICS_FEEDBACK = "van-haptics-feedback";
 export declare const FORM_KEY: InjectionKey<FormProvide>;

package/es/utils/constant.js

@@ -5,4 +5,5 @@ export var BORDER_BOTTOM = BORDER + "--bottom";
 export var BORDER_SURROUND = BORDER + "--surround";
 export var BORDER_TOP_BOTTOM = BORDER + "--top-bottom";
 export var BORDER_UNSET_TOP_BOTTOM = BORDER + "-unset--top-bottom";
+export var HAPTICS_FEEDBACK = 'van-haptics-feedback';
 export var FORM_KEY = Symbol('van-form');

package/{lib/utils/create/bem.d.ts → es/utils/create.d.ts}

@@ -1,3 +1,9 @@
+export declare function createTranslate(name: string): (path: string, ...args: unknown[]) => any;
+export declare type Translate = ReturnType<typeof createTranslate>;
+export declare type Mod = string | {
+    [key: string]: any;
+};
+export declare type Mods = Mod | Mod[];
 /**
  * bem helper
  * b() // 'button'
@@ -6,9 +12,6 @@
  * b('text', { disabled }) // 'button__text button__text--disabled'
  * b(['disabled', 'primary']) // 'button button--disabled button--primary'
  */
-export declare type Mod = string | {
-    [key: string]: any;
-};
-export declare type Mods = Mod | Mod[];
 export declare function createBEM(name: string): (el?: Mods | undefined, mods?: Mods | undefined) => Mods;
 export declare type BEM = ReturnType<typeof createBEM>;
+export declare function createNamespace(name: string): readonly [string, (el?: Mods | undefined, mods?: Mods | undefined) => Mods, (path: string, ...args: unknown[]) => any];

package/es/utils/create.js

@@ -0,0 +1,58 @@
+import { get } from './basic';
+import { camelize } from './format';
+import { isFunction } from './validate';
+import locale from '../locale';
+export function createTranslate(name) {
+  var prefix = camelize(name) + '.';
+  return function (path) {
+    var messages = locale.messages();
+    var message = get(messages, prefix + path) || get(messages, path);
+
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    return isFunction(message) ? message(...args) : message;
+  };
+}
+
+function genBem(name, mods) {
+  if (!mods) {
+    return '';
+  }
+
+  if (typeof mods === 'string') {
+    return " " + name + "--" + mods;
+  }
+
+  if (Array.isArray(mods)) {
+    return mods.reduce((ret, item) => ret + genBem(name, item), '');
+  }
+
+  return Object.keys(mods).reduce((ret, key) => ret + (mods[key] ? genBem(name, key) : ''), '');
+}
+/**
+ * bem helper
+ * b() // 'button'
+ * b('text') // 'button__text'
+ * b({ disabled }) // 'button button--disabled'
+ * b('text', { disabled }) // 'button__text button__text--disabled'
+ * b(['disabled', 'primary']) // 'button button--disabled button--primary'
+ */
+
+
+export function createBEM(name) {
+  return (el, mods) => {
+    if (el && typeof el !== 'string') {
+      mods = el;
+      el = '';
+    }
+
+    el = el ? name + "__" + el : name;
+    return "" + el + genBem(el, mods);
+  };
+}
+export function createNamespace(name) {
+  var prefixedName = "van-" + name;
+  return [prefixedName, createBEM(prefixedName), createTranslate(prefixedName)];
+}

package/es/utils/deep-assign.d.ts

@@ -1,3 +1,3 @@
-declare type ObjectIndex = Record<string, any>;
+declare type ObjectIndex = Record<string, unknown>;
 export declare function deepAssign(to: ObjectIndex, from: ObjectIndex): ObjectIndex;
 export {};

package/es/utils/deep-assign.js

@@ -14,7 +14,7 @@ function assignKey(to, from, key) {
     to[key] = val;
   } else {
     // eslint-disable-next-line no-use-before-define
-    to[key] = deepAssign(Object(to[key]), from[key]);
+    to[key] = deepAssign(Object(to[key]), val);
   }
 }
 

package/es/utils/deep-clone.js

@@ -1,4 +1,4 @@
-import { isDef } from './validate';
+import { isDef, isObject } from './validate';
 export function deepClone(obj) {
   if (!isDef(obj)) {
     return obj;
@@ -8,7 +8,7 @@ export function deepClone(obj) {
     return obj.map(item => deepClone(item));
   }
 
-  if (typeof obj === 'object') {
+  if (isObject(obj)) {
     var to = {};
     Object.keys(obj).forEach(key => {
       to[key] = deepClone(obj[key]);

package/{lib/utils/dom/scroll.d.ts → es/utils/dom.d.ts}

@@ -1,9 +1,11 @@
+import { Ref } from 'vue';
 export declare type ScrollElement = Element | Window;
 export declare function getScrollTop(el: ScrollElement): number;
 export declare function setScrollTop(el: ScrollElement, value: number): void;
 export declare function getRootScrollTop(): number;
 export declare function setRootScrollTop(value: number): void;
 export declare function getElementTop(el: ScrollElement, scroller?: ScrollElement): number;
-export declare function getVisibleHeight(el: ScrollElement): number;
-export declare function getVisibleTop(el: ScrollElement): number;
 export declare function resetScroll(): void;
+export declare const stopPropagation: (event: Event) => void;
+export declare function preventDefault(event: Event, isStopPropagation?: boolean): void;
+export declare function isHidden(elementRef: HTMLElement | Ref<HTMLElement | undefined>): boolean;

package/es/utils/{dom/scroll.js → dom.js}

@@ -1,9 +1,6 @@
-import { isIOS as checkIsIOS } from '../validate';
-
-function isWindow(val) {
-  return val === window;
-}
-
+import { useRect } from '@vant/use';
+import { unref } from 'vue';
+import { isIOS as checkIsIOS } from './validate';
 export function getScrollTop(el) {
   var top = 'scrollTop' in el ? el.scrollTop : el.pageYOffset; // iOS scroll bounce cause minus scrollTop
 
@@ -25,26 +22,12 @@ export function setRootScrollTop(value) {
 } // get distance from element top to page top or scroller top
 
 export function getElementTop(el, scroller) {
-  if (isWindow(el)) {
+  if (el === window) {
     return 0;
   }
 
   var scrollTop = scroller ? getScrollTop(scroller) : getRootScrollTop();
-  return el.getBoundingClientRect().top + scrollTop;
-}
-export function getVisibleHeight(el) {
-  if (isWindow(el)) {
-    return el.innerHeight;
-  }
-
-  return el.getBoundingClientRect().height;
-}
-export function getVisibleTop(el) {
-  if (isWindow(el)) {
-    return 0;
-  }
-
-  return el.getBoundingClientRect().top;
+  return useRect(el).top + scrollTop;
 }
 var isIOS = checkIsIOS(); // hack for iOS12 page scroll
 // see: https://developers.weixin.qq.com/community/develop/doc/00044ae90742f8c82fb78fcae56800
@@ -53,4 +36,30 @@ export function resetScroll() {
   if (isIOS) {
     setRootScrollTop(getRootScrollTop());
   }
+}
+export var stopPropagation = event => event.stopPropagation();
+export function preventDefault(event, isStopPropagation) {
+  /* istanbul ignore else */
+  if (typeof event.cancelable !== 'boolean' || event.cancelable) {
+    event.preventDefault();
+  }
+
+  if (isStopPropagation) {
+    stopPropagation(event);
+  }
+}
+export function isHidden(elementRef) {
+  var el = unref(elementRef);
+
+  if (!el) {
+    return false;
+  }
+
+  var style = window.getComputedStyle(el);
+  var hidden = style.display === 'none'; // offsetParent returns null in the following situations:
+  // 1. The element or its parent element has the display property set to none.
+  // 2. The element has the position property set to fixed
+
+  var parentHidden = el.offsetParent === null && style.position !== 'fixed';
+  return hidden || parentHidden;
 }

package/es/utils/format.d.ts

@@ -0,0 +1,12 @@
+import { CSSProperties } from 'vue';
+export declare function addUnit(value?: string | number): string | undefined;
+export declare function getSizeStyle(originSize?: string | number): CSSProperties | undefined;
+export declare function getZIndexStyle(zIndex?: string | number): CSSProperties;
+export declare function unitToPx(value: string | number): number;
+export declare const camelize: (str: string) => string;
+export declare const kebabCase: (str: string) => string;
+export declare function padZero(num: number | string, targetLength?: number): string;
+/** clamps number within the inclusive lower and upper bounds */
+export declare const clamp: (num: number, min: number, max: number) => number;
+export declare function formatNumber(value: string, allowDot?: boolean, allowMinus?: boolean): string;
+export declare function addNumber(num1: number, num2: number): number;

package/es/utils/format.js

@@ -0,0 +1,139 @@
+import { inBrowser } from './basic';
+import { isDef, isNumeric } from './validate';
+export function addUnit(value) {
+  if (!isDef(value)) {
+    return undefined;
+  }
+
+  return isNumeric(value) ? value + "px" : String(value);
+}
+export function getSizeStyle(originSize) {
+  if (isDef(originSize)) {
+    var size = addUnit(originSize);
+    return {
+      width: size,
+      height: size
+    };
+  }
+}
+export function getZIndexStyle(zIndex) {
+  var style = {};
+
+  if (zIndex !== undefined) {
+    style.zIndex = +zIndex;
+  }
+
+  return style;
+} // cache
+
+var rootFontSize;
+
+function getRootFontSize() {
+  if (!rootFontSize) {
+    var doc = document.documentElement;
+    var fontSize = doc.style.fontSize || window.getComputedStyle(doc).fontSize;
+    rootFontSize = parseFloat(fontSize);
+  }
+
+  return rootFontSize;
+}
+
+function convertRem(value) {
+  value = value.replace(/rem/g, '');
+  return +value * getRootFontSize();
+}
+
+function convertVw(value) {
+  value = value.replace(/vw/g, '');
+  return +value * window.innerWidth / 100;
+}
+
+function convertVh(value) {
+  value = value.replace(/vh/g, '');
+  return +value * window.innerHeight / 100;
+}
+
+export function unitToPx(value) {
+  if (typeof value === 'number') {
+    return value;
+  }
+
+  if (inBrowser) {
+    if (value.includes('rem')) {
+      return convertRem(value);
+    }
+
+    if (value.includes('vw')) {
+      return convertVw(value);
+    }
+
+    if (value.includes('vh')) {
+      return convertVh(value);
+    }
+  }
+
+  return parseFloat(value);
+}
+var camelizeRE = /-(\w)/g;
+export var camelize = str => str.replace(camelizeRE, (_, c) => c.toUpperCase());
+export var kebabCase = str => str.replace(/([A-Z])/g, '-$1').toLowerCase().replace(/^-/, '');
+export function padZero(num, targetLength) {
+  if (targetLength === void 0) {
+    targetLength = 2;
+  }
+
+  var str = num + '';
+
+  while (str.length < targetLength) {
+    str = '0' + str;
+  }
+
+  return str;
+}
+/** clamps number within the inclusive lower and upper bounds */
+
+export var clamp = (num, min, max) => Math.min(Math.max(num, min), max);
+
+function trimExtraChar(value, char, regExp) {
+  var index = value.indexOf(char);
+
+  if (index === -1) {
+    return value;
+  }
+
+  if (char === '-' && index !== 0) {
+    return value.slice(0, index);
+  }
+
+  return value.slice(0, index + 1) + value.slice(index).replace(regExp, '');
+}
+
+export function formatNumber(value, allowDot, allowMinus) {
+  if (allowDot === void 0) {
+    allowDot = true;
+  }
+
+  if (allowMinus === void 0) {
+    allowMinus = true;
+  }
+
+  if (allowDot) {
+    value = trimExtraChar(value, '.', /\./g);
+  } else {
+    value = value.split('.')[0];
+  }
+
+  if (allowMinus) {
+    value = trimExtraChar(value, '-', /-/g);
+  } else {
+    value = value.replace(/-/, '');
+  }
+
+  var regExp = allowDot ? /[^-0-9.]/g : /[^-0-9]/g;
+  return value.replace(regExp, '');
+} // add num and avoid float number
+
+export function addNumber(num1, num2) {
+  var cardinal = Math.pow(10, 10);
+  return Math.round((num1 + num2) * cardinal) / cardinal;
+}

package/es/utils/index.d.ts

@@ -1,12 +1,9 @@
-export * from './base';
+export * from './basic';
+export * from './props';
+export * from './dom';
 export * from './create';
+export * from './format';
 export * from './constant';
 export * from './validate';
-export * from './dom/style';
-export * from './dom/event';
-export * from './dom/scroll';
 export * from './interceptor';
 export * from './with-install';
-export * from './format/unit';
-export * from './format/number';
-export * from './format/string';