vant 2.12.35 → 2.12.39

package/es/calendar/components/Month.js

@@ -90,11 +90,9 @@ export default createComponent({
   },
   methods: {
     getHeight: function getHeight() {
-      if (!this.height) {
-        this.height = this.$el.getBoundingClientRect().height;
-      }
+      var _this$$el;
 
-      return this.height;
+      return ((_this$$el = this.$el) == null ? void 0 : _this$$el.getBoundingClientRect().height) || 0;
     },
     scrollIntoView: function scrollIntoView(body) {
       var _this$$refs = this.$refs,

package/es/calendar/index.js

@@ -98,6 +98,11 @@ export default createComponent({
       }
     }
   },
+  inject: {
+    vanPopup: {
+      default: null
+    }
+  },
   data: function data() {
     return {
       subtitle: '',
@@ -148,7 +153,11 @@ export default createComponent({
     }
   },
   mounted: function mounted() {
-    this.init();
+    var _this$vanPopup;
+
+    this.init(); // https://github.com/youzan/vant/issues/9845
+
+    (_this$vanPopup = this.vanPopup) == null ? void 0 : _this$vanPopup.$on('opened', this.onScroll);
   },
 
   /* istanbul ignore next */

package/es/datetime-picker/index.js

@@ -12,7 +12,7 @@ export default createComponent({
   methods: {
     // @exposed-api
     getPicker: function getPicker() {
-      return this.$refs.root.getPicker();
+      return this.$refs.root.getProxiedPicker();
     }
   },
   render: function render() {

package/es/datetime-picker/shared.js

@@ -77,10 +77,32 @@ export var TimePickerMixin = {
     });
   },
   methods: {
-    // @exposed-api
     getPicker: function getPicker() {
       return this.$refs.picker;
     },
+    // https://github.com/youzan/vant/issues/10013
+    getProxiedPicker: function getProxiedPicker() {
+      var _this4 = this;
+
+      var picker = this.$refs.picker;
+
+      if (picker) {
+        var proxy = function proxy(fn) {
+          return function () {
+            picker[fn].apply(picker, arguments);
+
+            _this4.updateInnerValue();
+          };
+        };
+
+        return _extends({}, picker, {
+          setValues: proxy('setValues'),
+          setIndexes: proxy('setIndexes'),
+          setColumnIndex: proxy('setColumnIndex'),
+          setColumnValue: proxy('setColumnValue')
+        });
+      }
+    },
     onConfirm: function onConfirm() {
       this.$emit('input', this.innerValue);
       this.$emit('confirm', this.innerValue);
@@ -90,12 +112,12 @@ export var TimePickerMixin = {
     }
   },
   render: function render() {
-    var _this4 = this;
+    var _this5 = this;
 
     var h = arguments[0];
     var props = {};
     Object.keys(pickerProps).forEach(function (key) {
-      props[key] = _this4[key];
+      props[key] = _this5[key];
     });
     return h(Picker, {
       "ref": "picker",

package/es/datetime-picker/utils.js

@@ -1,5 +1,9 @@
 import { isNaN } from '../utils/validate/number';
 export function times(n, iteratee) {
+  if (n < 0) {
+    return [];
+  }
+
   var index = -1;
   var result = Array(n);
 

package/es/image-preview/ImagePreview.js

@@ -19,6 +19,7 @@ export default createComponent({
     className: null,
     closeable: Boolean,
     asyncClose: Boolean,
+    overlayStyle: Object,
     showIndicators: Boolean,
     images: {
       type: Array,

package/es/image-preview/ImagePreviewItem.js

@@ -114,10 +114,11 @@ export default {
           offsetX = _this$offsetX === void 0 ? 0 : _this$offsetX;
       this.touchStart(event);
       this.touchStartTime = new Date();
+      this.fingerNum = touches.length;
       this.startMoveX = this.moveX;
       this.startMoveY = this.moveY;
-      this.moving = touches.length === 1 && this.scale !== 1;
-      this.zooming = touches.length === 2 && !offsetX;
+      this.moving = this.fingerNum === 1 && this.scale !== 1;
+      this.zooming = this.fingerNum === 2 && !offsetX;
 
       if (this.zooming) {
         this.startScale = this.scale;
@@ -182,13 +183,17 @@ export default {
     checkTap: function checkTap() {
       var _this = this;
 
+      if (this.fingerNum > 1) {
+        return;
+      }
+
       var _this$offsetX2 = this.offsetX,
           offsetX = _this$offsetX2 === void 0 ? 0 : _this$offsetX2,
           _this$offsetY = this.offsetY,
           offsetY = _this$offsetY === void 0 ? 0 : _this$offsetY;
       var deltaTime = new Date() - this.touchStartTime;
       var TAP_TIME = 250;
-      var TAP_OFFSET = 10;
+      var TAP_OFFSET = 5;
 
       if (offsetX < TAP_OFFSET && offsetY < TAP_OFFSET && deltaTime < TAP_TIME) {
         if (this.doubleTapTimer) {

package/es/image-preview/index.js

@@ -18,6 +18,7 @@ var defaultConfig = {
   asyncClose: false,
   transition: 'van-fade',
   getContainer: 'body',
+  overlayStyle: null,
   startPosition: 0,
   swipeDuration: 300,
   showIndicators: false,

package/es/index.js

@@ -87,7 +87,7 @@ import Tag from './tag';
 import Toast from './toast';
 import TreeSelect from './tree-select';
 import Uploader from './uploader';
-var version = '2.12.35';
+var version = '2.12.39';
 
 function install(Vue) {
   var components = [ActionSheet, AddressEdit, AddressList, Area, Badge, Button, Calendar, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, ContactCard, ContactEdit, ContactList, CountDown, Coupon, CouponCell, CouponList, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, Form, GoodsAction, GoodsActionButton, GoodsActionIcon, Grid, GridItem, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, List, Loading, Locale, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, Panel, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rate, Row, Search, ShareSheet, Sidebar, SidebarItem, Skeleton, Sku, Slider, Step, Stepper, Steps, Sticky, SubmitBar, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Tabs, Tag, Toast, TreeSelect, Uploader];

package/es/mixins/touch.js

@@ -1,12 +1,11 @@
 import { on } from '../utils/dom/event';
-var MIN_DISTANCE = 10;
 
 function getDirection(x, y) {
-  if (x > y && x > MIN_DISTANCE) {
+  if (x > y) {
     return 'horizontal';
   }
 
-  if (y > x && y > MIN_DISTANCE) {
+  if (y > x) {
     return 'vertical';
   }
 
@@ -26,13 +25,18 @@ export var TouchMixin = {
       this.startY = event.touches[0].clientY;
     },
     touchMove: function touchMove(event) {
-      var touch = event.touches[0]; // Fix: Safari back will set clientX to negative number
+      var touch = event.touches[0]; // safari back will set clientX to negative number
 
       this.deltaX = touch.clientX < 0 ? 0 : touch.clientX - this.startX;
       this.deltaY = touch.clientY - this.startY;
       this.offsetX = Math.abs(this.deltaX);
-      this.offsetY = Math.abs(this.deltaY);
-      this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+      this.offsetY = Math.abs(this.deltaY); // lock direction when distance is greater than a certain value
+
+      var LOCK_DIRECTION_DISTANCE = 10;
+
+      if (!this.direction || this.offsetX < LOCK_DIRECTION_DISTANCE && this.offsetY < LOCK_DIRECTION_DISTANCE) {
+        this.direction = getDirection(this.offsetX, this.offsetY);
+      }
     },
     resetTouchStatus: function resetTouchStatus() {
       this.direction = '';

package/es/nav-bar/index.js

@@ -29,8 +29,16 @@ export default createComponent({
     };
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.navBar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.navBar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {

package/es/slider/index.js

@@ -233,6 +233,7 @@ export default createComponent({
     var renderButton = function renderButton(i) {
       var map = ['left', 'right'];
       var isNumber = typeof i === 'number';
+      var current = isNumber ? _this.value[i] : _this.value;
 
       var getClassName = function getClassName() {
         if (isNumber) {
@@ -250,6 +251,27 @@ export default createComponent({
         return "wrapper";
       };
 
+      var renderButtonContent = function renderButtonContent() {
+        if (isNumber) {
+          var slot = _this.slots(i === 0 ? 'left-button' : 'right-button', {
+            value: current
+          });
+
+          if (slot) {
+            return slot;
+          }
+        }
+
+        if (_this.slots('button')) {
+          return _this.slots('button');
+        }
+
+        return h("div", {
+          "class": bem('button'),
+          "style": _this.buttonStyle
+        });
+      };
+
       return h("div", {
         "ref": getRefName(),
         "attrs": {
@@ -272,10 +294,7 @@ export default createComponent({
             return e.stopPropagation();
           }
         }
-      }, [_this.slots('button') || h("div", {
-        "class": bem('button'),
-        "style": _this.buttonStyle
-      })]);
+      }, [renderButtonContent()]);
     };
 
     return h("div", {

package/es/swipe/index.js

@@ -181,16 +181,10 @@ export default createComponent({
     },
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
-      this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
-      // avoid affecting the parent components
-
-      var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
-
-      if (shouldPrevent) {
-        preventDefault(event, this.stopPropagation);
-      }
+      this.touchMove(event);
 
       if (this.isCorrectDirection) {
+        preventDefault(event, this.stopPropagation);
         this.move({
           offset: this.delta
         });

package/es/tabbar/index.js

@@ -53,28 +53,36 @@ export default createComponent({
     children: 'setActiveItem'
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.tabbar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.tabbar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {
     setActiveItem: function setActiveItem() {
-      var _this = this;
+      var _this2 = this;
 
       this.children.forEach(function (item, index) {
-        item.nameMatched = (item.name || index) === _this.value;
+        item.nameMatched = (item.name || index) === _this2.value;
       });
     },
     triggerChange: function triggerChange(active, afterChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       callInterceptor({
         interceptor: this.beforeChange,
         args: [active],
         done: function done() {
-          _this2.$emit('input', active);
+          _this3.$emit('input', active);
 
-          _this2.$emit('change', active);
+          _this3.$emit('change', active);
 
           afterChange();
         }

package/es/uploader/index.js

@@ -90,6 +90,14 @@ export default createComponent({
       return this.fileList;
     }
   },
+  created: function created() {
+    this.urls = [];
+  },
+  beforeDestroy: function beforeDestroy() {
+    this.urls.forEach(function (url) {
+      return URL.revokeObjectURL(url);
+    });
+  },
   methods: {
     getDetail: function getDetail(index) {
       if (index === void 0) {
@@ -268,7 +276,13 @@ export default createComponent({
         return isImageFile(item);
       });
       var imageContents = imageFiles.map(function (item) {
-        return item.content || item.url;
+        if (item.file && !item.url) {
+          item.url = URL.createObjectURL(item.file);
+
+          _this5.urls.push(item.url);
+        }
+
+        return item.url;
       });
       this.imagePreview = ImagePreview(_extends({
         images: imageContents,

package/lib/calendar/components/Month.js

@@ -98,11 +98,9 @@ var _default = createComponent({
   },
   methods: {
     getHeight: function getHeight() {
-      if (!this.height) {
-        this.height = this.$el.getBoundingClientRect().height;
-      }
+      var _this$$el;
 
-      return this.height;
+      return ((_this$$el = this.$el) == null ? void 0 : _this$$el.getBoundingClientRect().height) || 0;
     },
     scrollIntoView: function scrollIntoView(body) {
       var _this$$refs = this.$refs,

package/lib/calendar/index.js

@@ -114,6 +114,11 @@ var _default2 = (0, _utils.createComponent)({
       }
     }
   },
+  inject: {
+    vanPopup: {
+      default: null
+    }
+  },
   data: function data() {
     return {
       subtitle: '',
@@ -164,7 +169,11 @@ var _default2 = (0, _utils.createComponent)({
     }
   },
   mounted: function mounted() {
-    this.init();
+    var _this$vanPopup;
+
+    this.init(); // https://github.com/youzan/vant/issues/9845
+
+    (_this$vanPopup = this.vanPopup) == null ? void 0 : _this$vanPopup.$on('opened', this.onScroll);
   },
 
   /* istanbul ignore next */

package/lib/datetime-picker/index.js

@@ -22,7 +22,7 @@ var _default = createComponent({
   methods: {
     // @exposed-api
     getPicker: function getPicker() {
-      return this.$refs.root.getPicker();
+      return this.$refs.root.getProxiedPicker();
     }
   },
   render: function render() {

package/lib/datetime-picker/shared.js

@@ -90,10 +90,32 @@ var TimePickerMixin = {
     });
   },
   methods: {
-    // @exposed-api
     getPicker: function getPicker() {
       return this.$refs.picker;
     },
+    // https://github.com/youzan/vant/issues/10013
+    getProxiedPicker: function getProxiedPicker() {
+      var _this4 = this;
+
+      var picker = this.$refs.picker;
+
+      if (picker) {
+        var proxy = function proxy(fn) {
+          return function () {
+            picker[fn].apply(picker, arguments);
+
+            _this4.updateInnerValue();
+          };
+        };
+
+        return (0, _extends2.default)({}, picker, {
+          setValues: proxy('setValues'),
+          setIndexes: proxy('setIndexes'),
+          setColumnIndex: proxy('setColumnIndex'),
+          setColumnValue: proxy('setColumnValue')
+        });
+      }
+    },
     onConfirm: function onConfirm() {
       this.$emit('input', this.innerValue);
       this.$emit('confirm', this.innerValue);
@@ -103,12 +125,12 @@ var TimePickerMixin = {
     }
   },
   render: function render() {
-    var _this4 = this;
+    var _this5 = this;
 
     var h = arguments[0];
     var props = {};
     Object.keys(_shared.pickerProps).forEach(function (key) {
-      props[key] = _this4[key];
+      props[key] = _this5[key];
     });
     return h(_picker.default, {
       "ref": "picker",

package/lib/datetime-picker/utils.js

@@ -8,6 +8,10 @@ exports.getMonthEndDay = getMonthEndDay;
 var _number = require("../utils/validate/number");
 
 function times(n, iteratee) {
+  if (n < 0) {
+    return [];
+  }
+
   var index = -1;
   var result = Array(n);
 

package/lib/image-preview/ImagePreview.js

@@ -33,6 +33,7 @@ var _default2 = (0, _shared.createComponent)({
     className: null,
     closeable: Boolean,
     asyncClose: Boolean,
+    overlayStyle: Object,
     showIndicators: Boolean,
     images: {
       type: Array,

package/lib/image-preview/ImagePreviewItem.js

@@ -127,10 +127,11 @@ var _default = {
           offsetX = _this$offsetX === void 0 ? 0 : _this$offsetX;
       this.touchStart(event);
       this.touchStartTime = new Date();
+      this.fingerNum = touches.length;
       this.startMoveX = this.moveX;
       this.startMoveY = this.moveY;
-      this.moving = touches.length === 1 && this.scale !== 1;
-      this.zooming = touches.length === 2 && !offsetX;
+      this.moving = this.fingerNum === 1 && this.scale !== 1;
+      this.zooming = this.fingerNum === 2 && !offsetX;
 
       if (this.zooming) {
         this.startScale = this.scale;
@@ -195,13 +196,17 @@ var _default = {
     checkTap: function checkTap() {
       var _this = this;
 
+      if (this.fingerNum > 1) {
+        return;
+      }
+
       var _this$offsetX2 = this.offsetX,
           offsetX = _this$offsetX2 === void 0 ? 0 : _this$offsetX2,
           _this$offsetY = this.offsetY,
           offsetY = _this$offsetY === void 0 ? 0 : _this$offsetY;
       var deltaTime = new Date() - this.touchStartTime;
       var TAP_TIME = 250;
-      var TAP_OFFSET = 10;
+      var TAP_OFFSET = 5;
 
       if (offsetX < TAP_OFFSET && offsetY < TAP_OFFSET && deltaTime < TAP_TIME) {
         if (this.doubleTapTimer) {

package/lib/image-preview/index.js

@@ -29,6 +29,7 @@ var defaultConfig = {
   asyncClose: false,
   transition: 'van-fade',
   getContainer: 'body',
+  overlayStyle: null,
   startPosition: 0,
   swipeDuration: 300,
   showIndicators: false,

package/lib/index.js

@@ -361,7 +361,7 @@ exports.TreeSelect = _treeSelect.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.12.35';
+var version = '2.12.39';
 exports.version = version;
 
 function install(Vue) {

package/lib/mixins/touch.js

@@ -5,14 +5,12 @@ exports.TouchMixin = void 0;
 
 var _event = require("../utils/dom/event");
 
-var MIN_DISTANCE = 10;
-
 function getDirection(x, y) {
-  if (x > y && x > MIN_DISTANCE) {
+  if (x > y) {
     return 'horizontal';
   }
 
-  if (y > x && y > MIN_DISTANCE) {
+  if (y > x) {
     return 'vertical';
   }
 
@@ -32,13 +30,18 @@ var TouchMixin = {
       this.startY = event.touches[0].clientY;
     },
     touchMove: function touchMove(event) {
-      var touch = event.touches[0]; // Fix: Safari back will set clientX to negative number
+      var touch = event.touches[0]; // safari back will set clientX to negative number
 
       this.deltaX = touch.clientX < 0 ? 0 : touch.clientX - this.startX;
       this.deltaY = touch.clientY - this.startY;
       this.offsetX = Math.abs(this.deltaX);
-      this.offsetY = Math.abs(this.deltaY);
-      this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+      this.offsetY = Math.abs(this.deltaY); // lock direction when distance is greater than a certain value
+
+      var LOCK_DIRECTION_DISTANCE = 10;
+
+      if (!this.direction || this.offsetX < LOCK_DIRECTION_DISTANCE && this.offsetY < LOCK_DIRECTION_DISTANCE) {
+        this.direction = getDirection(this.offsetX, this.offsetY);
+      }
     },
     resetTouchStatus: function resetTouchStatus() {
       this.direction = '';

package/lib/nav-bar/index.js

@@ -38,8 +38,16 @@ var _default = createComponent({
     };
   },
   mounted: function mounted() {
+    var _this = this;
+
     if (this.placeholder && this.fixed) {
-      this.height = this.$refs.navBar.getBoundingClientRect().height;
+      var setHeight = function setHeight() {
+        _this.height = _this.$refs.navBar.getBoundingClientRect().height;
+      };
+
+      setHeight(); // https://github.com/youzan/vant/issues/10131
+
+      setTimeout(setHeight, 100);
     }
   },
   methods: {

package/lib/slider/index.js

@@ -243,6 +243,7 @@ var _default = createComponent({
     var renderButton = function renderButton(i) {
       var map = ['left', 'right'];
       var isNumber = typeof i === 'number';
+      var current = isNumber ? _this.value[i] : _this.value;
 
       var getClassName = function getClassName() {
         if (isNumber) {
@@ -260,6 +261,27 @@ var _default = createComponent({
         return "wrapper";
       };
 
+      var renderButtonContent = function renderButtonContent() {
+        if (isNumber) {
+          var slot = _this.slots(i === 0 ? 'left-button' : 'right-button', {
+            value: current
+          });
+
+          if (slot) {
+            return slot;
+          }
+        }
+
+        if (_this.slots('button')) {
+          return _this.slots('button');
+        }
+
+        return h("div", {
+          "class": bem('button'),
+          "style": _this.buttonStyle
+        });
+      };
+
       return h("div", {
         "ref": getRefName(),
         "attrs": {
@@ -282,10 +304,7 @@ var _default = createComponent({
             return e.stopPropagation();
           }
         }
-      }, [_this.slots('button') || h("div", {
-        "class": bem('button'),
-        "style": _this.buttonStyle
-      })]);
+      }, [renderButtonContent()]);
     };
 
     return h("div", {

package/lib/swipe/index.js

@@ -193,16 +193,10 @@ var _default = createComponent({
     },
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
-      this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
-      // avoid affecting the parent components
-
-      var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
-
-      if (shouldPrevent) {
-        (0, _event.preventDefault)(event, this.stopPropagation);
-      }
+      this.touchMove(event);
 
       if (this.isCorrectDirection) {
+        (0, _event.preventDefault)(event, this.stopPropagation);
         this.move({
           offset: this.delta
         });