vant 2.12.33 → 2.12.36

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.33';
+var version = '2.12.36';
 exports.version = version;
 
 function install(Vue) {

package/lib/swipe/index.css

@@ -1 +1 @@
-.van-swipe{position:relative;overflow:hidden;cursor:grab;-webkit-user-select:none;user-select:none}.van-swipe__track{display:-webkit-box;display:-webkit-flex;display:flex;height:100%}.van-swipe__track--vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.van-swipe__indicators{position:absolute;bottom:12px;left:50%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.van-swipe__indicators--vertical{top:50%;bottom:auto;left:12px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.van-swipe__indicators--vertical .van-swipe__indicator:not(:last-child){margin-bottom:6px}.van-swipe__indicator{width:6px;height:6px;background-color:#ebedf0;border-radius:100%;opacity:.3;-webkit-transition:opacity .2s,background-color .2s;transition:opacity .2s,background-color .2s}.van-swipe__indicator:not(:last-child){margin-right:6px}.van-swipe__indicator--active{background-color:#1989fa;opacity:1}
+.van-swipe{position:relative;overflow:hidden;-webkit-transform:translateZ(0);transform:translateZ(0);cursor:grab;-webkit-user-select:none;user-select:none}.van-swipe__track{display:-webkit-box;display:-webkit-flex;display:flex;height:100%}.van-swipe__track--vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column}.van-swipe__indicators{position:absolute;bottom:12px;left:50%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-transform:translateX(-50%);transform:translateX(-50%)}.van-swipe__indicators--vertical{top:50%;bottom:auto;left:12px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.van-swipe__indicators--vertical .van-swipe__indicator:not(:last-child){margin-bottom:6px}.van-swipe__indicator{width:6px;height:6px;background-color:#ebedf0;border-radius:100%;opacity:.3;-webkit-transition:opacity .2s,background-color .2s;transition:opacity .2s,background-color .2s}.van-swipe__indicator:not(:last-child){margin-right:6px}.van-swipe__indicator--active{background-color:#1989fa;opacity:1}

package/lib/swipe/index.js

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

package/lib/swipe/index.less

@@ -3,6 +3,8 @@
 .van-swipe {
   position: relative;
   overflow: hidden;
+  // https://github.com/youzan/vant/issues/9931
+  transform: translateZ(0);
   cursor: grab;
   user-select: none;
 

package/lib/tabbar-item/index.js

@@ -49,9 +49,11 @@ var _default = createComponent({
         var config = (0, _utils.isObject)(to) ? to : {
           path: to
         };
-        var pathMatched = config.path === $route.path;
-        var nameMatched = (0, _utils.isDef)(config.name) && config.name === $route.name;
-        return pathMatched || nameMatched;
+        return !!$route.matched.find(function (r) {
+          var pathMatched = config.path === r.path;
+          var nameMatched = (0, _utils.isDef)(config.name) && config.name === r.name;
+          return pathMatched || nameMatched;
+        });
       }
     },
     active: function active() {

package/lib/uploader/index.js

@@ -104,6 +104,14 @@ var _default2 = 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) {
@@ -282,7 +290,13 @@ var _default2 = createComponent({
         return (0, _utils2.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 = (0, _imagePreview.default)((0, _extends2.default)({
         images: imageContents,

package/lib/vant.js

@@ -6677,11 +6677,9 @@ var Month_createNamespace = Object(create["a" /* createNamespace */])('calendar-
   },
   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,
@@ -7077,6 +7075,11 @@ var Header_createNamespace = Object(create["a" /* createNamespace */])('calendar
       }
     }
   },
+  inject: {
+    vanPopup: {
+      default: null
+    }
+  },
   data: function data() {
     return {
       subtitle: '',
@@ -7127,7 +7130,11 @@ var Header_createNamespace = Object(create["a" /* createNamespace */])('calendar
     }
   },
   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 */
@@ -11027,6 +11034,9 @@ var TimePicker_createNamespace = Object(create["a" /* createNamespace */])('time
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this2.updateInnerValue();
+
           _this2.$emit('change', picker);
         });
       });
@@ -11359,6 +11369,9 @@ var DatePicker_createNamespace = Object(create["a" /* createNamespace */])('date
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this4.updateInnerValue();
+
           _this4.$emit('change', picker);
         });
       });
@@ -12781,10 +12794,16 @@ var swipe_createNamespace = Object(create["a" /* createNamespace */])('swipe'),
     },
     onTouchMove: function onTouchMove(event) {
       if (!this.touchable || !this.swiping) return;
-      this.touchMove(event);
+      this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
+      // avoid affecting the parent components
 
-      if (this.isCorrectDirection) {
+      var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
+
+      if (shouldPrevent) {
         preventDefault(event, this.stopPropagation);
+      }
+
+      if (this.isCorrectDirection) {
         this.move({
           offset: this.delta
         });
@@ -19131,6 +19150,14 @@ var uploader_createNamespace = Object(create["a" /* createNamespace */])('upload
       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) {
@@ -19309,7 +19336,13 @@ var uploader_createNamespace = Object(create["a" /* createNamespace */])('upload
         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 = image_preview(_extends({
         images: imageContents,
@@ -21809,9 +21842,11 @@ var tabbar_item_createNamespace = Object(create["a" /* createNamespace */])('tab
         var config = Object(utils["f" /* isObject */])(to) ? to : {
           path: to
         };
-        var pathMatched = config.path === $route.path;
-        var nameMatched = Object(utils["c" /* isDef */])(config.name) && config.name === $route.name;
-        return pathMatched || nameMatched;
+        return !!$route.matched.find(function (r) {
+          var pathMatched = config.path === r.path;
+          var nameMatched = Object(utils["c" /* isDef */])(config.name) && config.name === r.name;
+          return pathMatched || nameMatched;
+        });
       }
     },
     active: function active() {
@@ -22114,7 +22149,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.33';
+var version = '2.12.36';
 
 function install(Vue) {
   var components = [action_sheet, address_edit, address_list, es_area, badge, es_button, calendar, card, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, col, collapse, collapse_item, contact_card, contact_edit, contact_list, count_down, es_coupon, coupon_cell, coupon_list, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, es_form, goods_action, goods_action_button, goods_action_icon, grid, grid_item, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, es_list, es_loading, locale["a" /* default */], nav_bar, notice_bar, notify, number_keyboard, es_overlay, pagination, panel, password_input, picker, popover, popup, es_progress, pull_refresh, es_radio, radio_group, es_rate, row, search, share_sheet, sidebar, sidebar_item, skeleton, es_sku, slider, es_step, stepper, steps, es_sticky, submit_bar, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, tabs, es_tag, es_toast, tree_select, uploader];