vant 3.2.1 → 3.2.5

package/lib/utils/dom.js

@@ -0,0 +1,98 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getElementTop = getElementTop;
+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;
+exports.trigger = trigger;
+
+var _use = require("@vant/use");
+
+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
+
+  return Math.max(top, 0);
+}
+
+function setScrollTop(el, value) {
+  if ('scrollTop' in el) {
+    el.scrollTop = value;
+  } else {
+    el.scrollTo(el.scrollX, value);
+  }
+}
+
+function getRootScrollTop() {
+  return window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
+}
+
+function setRootScrollTop(value) {
+  setScrollTop(window, value);
+  setScrollTop(document.body, value);
+} // get distance from element top to page top or scroller top
+
+
+function getElementTop(el, scroller) {
+  if (el === window) {
+    return 0;
+  }
+
+  var scrollTop = scroller ? getScrollTop(scroller) : getRootScrollTop();
+  return (0, _use.useRect)(el).top + scrollTop;
+}
+
+var isIOS = (0, _validate.isIOS)(); // hack for iOS12 page scroll
+// see: https://developers.weixin.qq.com/community/develop/doc/00044ae90742f8c82fb78fcae56800
+
+function resetScroll() {
+  if (isIOS) {
+    setRootScrollTop(getRootScrollTop());
+  }
+}
+
+var stopPropagation = event => event.stopPropagation();
+
+exports.stopPropagation = stopPropagation;
+
+function preventDefault(event, isStopPropagation) {
+  /* istanbul ignore else */
+  if (typeof event.cancelable !== 'boolean' || event.cancelable) {
+    event.preventDefault();
+  }
+
+  if (isStopPropagation) {
+    stopPropagation(event);
+  }
+}
+
+function trigger(target, type) {
+  var inputEvent = document.createEvent('HTMLEvents');
+  inputEvent.initEvent(type, true, true);
+  target.dispatchEvent(inputEvent);
+}
+
+function isHidden(elementRef) {
+  var el = (0, _vue.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/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,157 @@
+"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 = 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 = true, 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';

package/lib/utils/index.js

@@ -2,60 +2,60 @@
 
 exports.__esModule = true;
 
-var _base = require("./base");
+var _basic = require("./basic");
 
-Object.keys(_base).forEach(function (key) {
+Object.keys(_basic).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _base[key]) return;
-  exports[key] = _base[key];
+  if (key in exports && exports[key] === _basic[key]) return;
+  exports[key] = _basic[key];
 });
 
-var _create = require("./create");
+var _props = require("./props");
 
-Object.keys(_create).forEach(function (key) {
+Object.keys(_props).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _create[key]) return;
-  exports[key] = _create[key];
+  if (key in exports && exports[key] === _props[key]) return;
+  exports[key] = _props[key];
 });
 
-var _constant = require("./constant");
+var _dom = require("./dom");
 
-Object.keys(_constant).forEach(function (key) {
+Object.keys(_dom).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _constant[key]) return;
-  exports[key] = _constant[key];
+  if (key in exports && exports[key] === _dom[key]) return;
+  exports[key] = _dom[key];
 });
 
-var _validate = require("./validate");
+var _create = require("./create");
 
-Object.keys(_validate).forEach(function (key) {
+Object.keys(_create).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _validate[key]) return;
-  exports[key] = _validate[key];
+  if (key in exports && exports[key] === _create[key]) return;
+  exports[key] = _create[key];
 });
 
-var _style = require("./dom/style");
+var _format = require("./format");
 
-Object.keys(_style).forEach(function (key) {
+Object.keys(_format).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _style[key]) return;
-  exports[key] = _style[key];
+  if (key in exports && exports[key] === _format[key]) return;
+  exports[key] = _format[key];
 });
 
-var _event = require("./dom/event");
+var _constant = require("./constant");
 
-Object.keys(_event).forEach(function (key) {
+Object.keys(_constant).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _event[key]) return;
-  exports[key] = _event[key];
+  if (key in exports && exports[key] === _constant[key]) return;
+  exports[key] = _constant[key];
 });
 
-var _scroll = require("./dom/scroll");
+var _validate = require("./validate");
 
-Object.keys(_scroll).forEach(function (key) {
+Object.keys(_validate).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _scroll[key]) return;
-  exports[key] = _scroll[key];
+  if (key in exports && exports[key] === _validate[key]) return;
+  exports[key] = _validate[key];
 });
 
 var _interceptor = require("./interceptor");
@@ -72,28 +72,4 @@ Object.keys(_withInstall).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _withInstall[key]) return;
   exports[key] = _withInstall[key];
-});
-
-var _unit = require("./format/unit");
-
-Object.keys(_unit).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _unit[key]) return;
-  exports[key] = _unit[key];
-});
-
-var _number = require("./format/number");
-
-Object.keys(_number).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _number[key]) return;
-  exports[key] = _number[key];
-});
-
-var _string = require("./format/string");
-
-Object.keys(_string).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _string[key]) return;
-  exports[key] = _string[key];
 });

package/lib/utils/interceptor.js

@@ -3,7 +3,9 @@
 exports.__esModule = true;
 exports.callInterceptor = callInterceptor;
 
-var _ = require(".");
+var _basic = require("./basic");
+
+var _validate = require("./validate");
 
 function callInterceptor(options) {
   var {
@@ -17,14 +19,14 @@ function callInterceptor(options) {
     // eslint-disable-next-line prefer-spread
     var returnVal = interceptor.apply(null, args || []);
 
-    if ((0, _.isPromise)(returnVal)) {
+    if ((0, _validate.isPromise)(returnVal)) {
       returnVal.then(value => {
         if (value) {
           done();
         } else if (canceled) {
           canceled();
         }
-      }).catch(_.noop);
+      }).catch(_basic.noop);
     } else if (returnVal) {
       done();
     } else if (canceled) {

package/lib/utils/mount-component.js

@@ -1,8 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.usePopupState = usePopupState;
 exports.mountComponent = mountComponent;
+exports.usePopupState = usePopupState;
 
 var _vue = require("vue");
 
@@ -20,8 +20,10 @@ function usePopupState() {
   };
 
   var open = props => {
-    (0, _utils.extend)(state, props);
-    (0, _vue.nextTick)(() => toggle(true));
+    (0, _utils.extend)(state, props, {
+      transitionAppear: true
+    });
+    toggle(true);
   };
 
   var close = () => toggle(false);

package/lib/utils/props.d.ts

@@ -0,0 +1,31 @@
+/**
+ * prop type helpers
+ * help us to write less code and reduce bundle size
+ */
+import type { PropType } from 'vue';
+export declare const unknownProp: PropType<unknown>;
+export declare const numericProp: (NumberConstructor | StringConstructor)[];
+export declare const truthProp: {
+    type: BooleanConstructor;
+    default: true;
+};
+export declare const makeRequiredProp: <T>(type: T) => {
+    type: T;
+    required: true;
+};
+export declare const makeArrayProp: <T>() => {
+    type: PropType<T[]>;
+    default: () => never[];
+};
+export declare const makeNumberProp: <T>(defaultVal: T) => {
+    type: NumberConstructor;
+    default: T;
+};
+export declare const makeNumericProp: <T>(defaultVal: T) => {
+    type: (NumberConstructor | StringConstructor)[];
+    default: T;
+};
+export declare const makeStringProp: <T>(defaultVal: T) => {
+    type: PropType<T>;
+    default: T;
+};

package/lib/utils/props.js

@@ -0,0 +1,53 @@
+"use strict";
+
+exports.__esModule = true;
+exports.unknownProp = exports.truthProp = exports.numericProp = exports.makeStringProp = exports.makeRequiredProp = exports.makeNumericProp = exports.makeNumberProp = exports.makeArrayProp = void 0;
+
+/**
+ * prop type helpers
+ * help us to write less code and reduce bundle size
+ */
+var unknownProp = null;
+exports.unknownProp = unknownProp;
+var numericProp = [Number, String];
+exports.numericProp = numericProp;
+var truthProp = {
+  type: Boolean,
+  default: true
+};
+exports.truthProp = truthProp;
+
+var makeRequiredProp = type => ({
+  type,
+  required: true
+});
+
+exports.makeRequiredProp = makeRequiredProp;
+
+var makeArrayProp = () => ({
+  type: Array,
+  default: () => []
+});
+
+exports.makeArrayProp = makeArrayProp;
+
+var makeNumberProp = defaultVal => ({
+  type: Number,
+  default: defaultVal
+});
+
+exports.makeNumberProp = makeNumberProp;
+
+var makeNumericProp = defaultVal => ({
+  type: numericProp,
+  default: defaultVal
+});
+
+exports.makeNumericProp = makeNumericProp;
+
+var makeStringProp = defaultVal => ({
+  type: String,
+  default: defaultVal
+});
+
+exports.makeStringProp = makeStringProp;

package/lib/utils/validate.d.ts

@@ -1,9 +1,8 @@
-export declare function isDef<T>(val: T): val is NonNullable<T>;
-export declare function isFunction(val: unknown): val is Function;
-export declare function isObject(val: unknown): val is Record<any, any>;
-export declare function isPromise<T = any>(val: unknown): val is Promise<T>;
-export declare function isDate(val: unknown): val is Date;
+export declare const isDef: <T>(val: T) => val is NonNullable<T>;
+export declare const isFunction: (val: unknown) => val is Function;
+export declare const isObject: (val: unknown) => val is Record<any, any>;
+export declare const isPromise: <T = any>(val: unknown) => val is Promise<T>;
+export declare const isDate: (val: unknown) => val is Date;
 export declare function isMobile(value: string): boolean;
-export declare function isNumeric(val: string | number): val is string;
-export declare function isAndroid(): boolean;
-export declare function isIOS(): boolean;
+export declare const isNumeric: (val: string | number) => val is string;
+export declare const isIOS: () => boolean;

package/lib/utils/validate.js

@@ -1,52 +1,42 @@
 "use strict";
 
 exports.__esModule = true;
-exports.isDef = isDef;
-exports.isFunction = isFunction;
-exports.isObject = isObject;
-exports.isPromise = isPromise;
-exports.isDate = isDate;
+exports.isIOS = exports.isFunction = exports.isDef = exports.isDate = void 0;
 exports.isMobile = isMobile;
-exports.isNumeric = isNumeric;
-exports.isAndroid = isAndroid;
-exports.isIOS = isIOS;
+exports.isPromise = exports.isObject = exports.isNumeric = void 0;
 
-var _base = require("./base");
+var _basic = require("./basic");
 
-function isDef(val) {
-  return val !== undefined && val !== null;
-} // eslint-disable-next-line @typescript-eslint/ban-types
+var isDef = val => val !== undefined && val !== null; // eslint-disable-next-line @typescript-eslint/ban-types
 
 
-function isFunction(val) {
-  return typeof val === 'function';
-}
+exports.isDef = isDef;
 
-function isObject(val) {
-  return val !== null && typeof val === 'object';
-}
+var isFunction = val => typeof val === 'function';
 
-function isPromise(val) {
-  return isObject(val) && isFunction(val.then) && isFunction(val.catch);
-}
+exports.isFunction = isFunction;
 
-function isDate(val) {
-  return Object.prototype.toString.call(val) === '[object Date]' && !Number.isNaN(val.getTime());
-}
+var isObject = val => val !== null && typeof val === 'object';
+
+exports.isObject = isObject;
+
+var isPromise = val => isObject(val) && isFunction(val.then) && isFunction(val.catch);
+
+exports.isPromise = isPromise;
+
+var isDate = val => Object.prototype.toString.call(val) === '[object Date]' && !Number.isNaN(val.getTime());
+
+exports.isDate = isDate;
 
 function isMobile(value) {
   value = value.replace(/[^-|\d]/g, '');
   return /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9-]{10,13}$/.test(value);
 }
 
-function isNumeric(val) {
-  return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
-}
+var isNumeric = val => typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
 
-function isAndroid() {
-  return _base.inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false;
-}
+exports.isNumeric = isNumeric;
+
+var isIOS = () => _basic.inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
 
-function isIOS() {
-  return _base.inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
-}
+exports.isIOS = isIOS;

package/lib/utils/with-install.d.ts

@@ -9,5 +9,5 @@ declare type EventShim = {
 export declare type WithInstall<T> = T & {
     install(app: App): void;
 } & EventShim;
-export declare function withInstall<T>(options: any): WithInstall<T>;
+export declare function withInstall<T>(options: T): WithInstall<T>;
 export {};

package/lib/utils/with-install.js

@@ -3,16 +3,15 @@
 exports.__esModule = true;
 exports.withInstall = withInstall;
 
-var _string = require("./format/string");
+var _format = require("./format");
 
-// using any here because tsc will generate some weird results when using generics
 function withInstall(options) {
   options.install = app => {
     var {
       name
     } = options;
     app.component(name, options);
-    app.component((0, _string.camelize)("-" + name), options);
+    app.component((0, _format.camelize)("-" + name), options);
   };
 
   return options;