vant 3.2.3 → 3.2.7

package/lib/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/lib/uploader/utils.js

@@ -1,13 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.toArray = toArray;
-exports.readFileContent = readFileContent;
-exports.isOversize = isOversize;
+exports.bem = void 0;
 exports.filterFiles = filterFiles;
-exports.isImageUrl = isImageUrl;
 exports.isImageFile = isImageFile;
-exports.bem = exports.name = void 0;
+exports.isImageUrl = void 0;
+exports.isOversize = isOversize;
+exports.name = void 0;
+exports.readFileContent = readFileContent;
+exports.toArray = void 0;
 
 var _utils = require("../utils");
 
@@ -15,13 +16,9 @@ var [name, bem] = (0, _utils.createNamespace)('uploader');
 exports.bem = bem;
 exports.name = name;
 
-function toArray(item) {
-  if (Array.isArray(item)) {
-    return item;
-  }
+var toArray = item => Array.isArray(item) ? item : [item];
 
-  return [item];
-}
+exports.toArray = toArray;
 
 function readFileContent(file, resultType) {
   return new Promise(resolve => {
@@ -76,9 +73,9 @@ function filterFiles(items, maxSize) {
 
 var IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i;
 
-function isImageUrl(url) {
-  return IMAGE_REGEXP.test(url);
-}
+var isImageUrl = url => IMAGE_REGEXP.test(url);
+
+exports.isImageUrl = isImageUrl;
 
 function isImageFile(item) {
   // some special urls cannot be recognized

package/lib/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/{es/utils/base.d.ts → lib/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/lib/utils/{base.js → basic.js}

@@ -1,26 +1,19 @@
 "use strict";
 
 exports.__esModule = true;
-exports.noop = noop;
+exports.extend = void 0;
 exports.get = get;
+exports.inBrowser = void 0;
+exports.noop = noop;
 exports.pick = pick;
-exports.truthProp = exports.unknownProp = exports.inBrowser = exports.extend = void 0;
 
 function noop() {}
 
 var extend = Object.assign;
 exports.extend = extend;
-var inBrowser = typeof window !== 'undefined'; // PropTypes
+var inBrowser = typeof window !== 'undefined'; // eslint-disable-next-line
 
 exports.inBrowser = inBrowser;
-var unknownProp = null;
-exports.unknownProp = unknownProp;
-var truthProp = {
-  type: Boolean,
-  default: true
-}; // eslint-disable-next-line
-
-exports.truthProp = truthProp;
 
 function get(object, path) {
   var keys = path.split('.');

package/lib/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/lib/utils/constant.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.FORM_KEY = exports.BORDER_UNSET_TOP_BOTTOM = exports.BORDER_TOP_BOTTOM = exports.BORDER_SURROUND = exports.BORDER_BOTTOM = exports.BORDER_LEFT = exports.BORDER_TOP = exports.BORDER = void 0;
+exports.HAPTICS_FEEDBACK = exports.FORM_KEY = exports.BORDER_UNSET_TOP_BOTTOM = exports.BORDER_TOP_BOTTOM = exports.BORDER_TOP = exports.BORDER_SURROUND = exports.BORDER_LEFT = exports.BORDER_BOTTOM = exports.BORDER = void 0;
 var BORDER = 'van-hairline';
 exports.BORDER = BORDER;
 var BORDER_TOP = BORDER + "--top";
@@ -16,5 +16,7 @@ var BORDER_TOP_BOTTOM = BORDER + "--top-bottom";
 exports.BORDER_TOP_BOTTOM = BORDER_TOP_BOTTOM;
 var BORDER_UNSET_TOP_BOTTOM = BORDER + "-unset--top-bottom";
 exports.BORDER_UNSET_TOP_BOTTOM = BORDER_UNSET_TOP_BOTTOM;
+var HAPTICS_FEEDBACK = 'van-haptics-feedback';
+exports.HAPTICS_FEEDBACK = HAPTICS_FEEDBACK;
 var FORM_KEY = Symbol('van-form');
 exports.FORM_KEY = FORM_KEY;

package/{es/utils/create/bem.d.ts → lib/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/lib/utils/create.js

@@ -0,0 +1,73 @@
+"use strict";
+
+exports.__esModule = true;
+exports.createBEM = createBEM;
+exports.createNamespace = createNamespace;
+exports.createTranslate = createTranslate;
+
+var _basic = require("./basic");
+
+var _format = require("./format");
+
+var _validate = require("./validate");
+
+var _locale = _interopRequireDefault(require("../locale"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function createTranslate(name) {
+  var prefix = (0, _format.camelize)(name) + '.';
+  return function (path) {
+    var messages = _locale.default.messages();
+
+    var message = (0, _basic.get)(messages, prefix + path) || (0, _basic.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 (0, _validate.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'
+ */
+
+
+function createBEM(name) {
+  return (el, mods) => {
+    if (el && typeof el !== 'string') {
+      mods = el;
+      el = '';
+    }
+
+    el = el ? name + "__" + el : name;
+    return "" + el + genBem(el, mods);
+  };
+}
+
+function createNamespace(name) {
+  var prefixedName = "van-" + name;
+  return [prefixedName, createBEM(prefixedName), createTranslate(prefixedName)];
+}

package/lib/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/lib/utils/deep-assign.js

@@ -20,7 +20,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/lib/utils/deep-clone.js

@@ -14,7 +14,7 @@ function deepClone(obj) {
     return obj.map(item => deepClone(item));
   }
 
-  if (typeof obj === 'object') {
+  if ((0, _validate.isObject)(obj)) {
     var to = {};
     Object.keys(obj).forEach(key => {
       to[key] = deepClone(obj[key]);

package/{es/utils/dom/scroll.d.ts → lib/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/lib/utils/{dom/scroll.js → dom.js}

@@ -1,20 +1,21 @@
 "use strict";
 
 exports.__esModule = true;
-exports.getScrollTop = getScrollTop;
-exports.setScrollTop = setScrollTop;
-exports.getRootScrollTop = getRootScrollTop;
-exports.setRootScrollTop = setRootScrollTop;
 exports.getElementTop = getElementTop;
-exports.getVisibleHeight = getVisibleHeight;
-exports.getVisibleTop = getVisibleTop;
+exports.getRootScrollTop = getRootScrollTop;
+exports.getScrollTop = getScrollTop;
+exports.isHidden = isHidden;
+exports.preventDefault = preventDefault;
 exports.resetScroll = resetScroll;
+exports.setRootScrollTop = setRootScrollTop;
+exports.setScrollTop = setScrollTop;
+exports.stopPropagation = void 0;
 
-var _validate = require("../validate");
+var _use = require("@vant/use");
 
-function isWindow(val) {
-  return val === window;
-}
+var _vue = require("vue");
+
+var _validate = require("./validate");
 
 function getScrollTop(el) {
   var top = 'scrollTop' in el ? el.scrollTop : el.pageYOffset; // iOS scroll bounce cause minus scrollTop
@@ -41,35 +42,50 @@ function setRootScrollTop(value) {
 
 
 function getElementTop(el, scroller) {
-  if (isWindow(el)) {
+  if (el === window) {
     return 0;
   }
 
   var scrollTop = scroller ? getScrollTop(scroller) : getRootScrollTop();
-  return el.getBoundingClientRect().top + scrollTop;
+  return (0, _use.useRect)(el).top + scrollTop;
 }
 
-function getVisibleHeight(el) {
-  if (isWindow(el)) {
-    return el.innerHeight;
-  }
+var isIOS = (0, _validate.isIOS)(); // hack for iOS12 page scroll
+// see: https://developers.weixin.qq.com/community/develop/doc/00044ae90742f8c82fb78fcae56800
 
-  return el.getBoundingClientRect().height;
+function resetScroll() {
+  if (isIOS) {
+    setRootScrollTop(getRootScrollTop());
+  }
 }
 
-function getVisibleTop(el) {
-  if (isWindow(el)) {
-    return 0;
+var stopPropagation = event => event.stopPropagation();
+
+exports.stopPropagation = stopPropagation;
+
+function preventDefault(event, isStopPropagation) {
+  /* istanbul ignore else */
+  if (typeof event.cancelable !== 'boolean' || event.cancelable) {
+    event.preventDefault();
   }
 
-  return el.getBoundingClientRect().top;
+  if (isStopPropagation) {
+    stopPropagation(event);
+  }
 }
 
-var isIOS = (0, _validate.isIOS)(); // hack for iOS12 page scroll
-// see: https://developers.weixin.qq.com/community/develop/doc/00044ae90742f8c82fb78fcae56800
+function isHidden(elementRef) {
+  var el = (0, _vue.unref)(elementRef);
 
-function resetScroll() {
-  if (isIOS) {
-    setRootScrollTop(getRootScrollTop());
+  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/lib/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/lib/utils/format.js

@@ -0,0 +1,169 @@
+"use strict";
+
+exports.__esModule = true;
+exports.addNumber = addNumber;
+exports.addUnit = addUnit;
+exports.clamp = exports.camelize = void 0;
+exports.formatNumber = formatNumber;
+exports.getSizeStyle = getSizeStyle;
+exports.getZIndexStyle = getZIndexStyle;
+exports.kebabCase = void 0;
+exports.padZero = padZero;
+exports.unitToPx = unitToPx;
+
+var _basic = require("./basic");
+
+var _validate = require("./validate");
+
+function addUnit(value) {
+  if (!(0, _validate.isDef)(value)) {
+    return undefined;
+  }
+
+  return (0, _validate.isNumeric)(value) ? value + "px" : String(value);
+}
+
+function getSizeStyle(originSize) {
+  if ((0, _validate.isDef)(originSize)) {
+    var size = addUnit(originSize);
+    return {
+      width: size,
+      height: size
+    };
+  }
+}
+
+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;
+}
+
+function unitToPx(value) {
+  if (typeof value === 'number') {
+    return value;
+  }
+
+  if (_basic.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;
+
+var camelize = str => str.replace(camelizeRE, (_, c) => c.toUpperCase());
+
+exports.camelize = camelize;
+
+var kebabCase = str => str.replace(/([A-Z])/g, '-$1').toLowerCase().replace(/^-/, '');
+
+exports.kebabCase = kebabCase;
+
+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 */
+
+
+var clamp = (num, min, max) => Math.min(Math.max(num, min), max);
+
+exports.clamp = clamp;
+
+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, '');
+}
+
+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
+
+
+function addNumber(num1, num2) {
+  var cardinal = Math.pow(10, 10);
+  return Math.round((num1 + num2) * cardinal) / cardinal;
+}

package/lib/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';