vant 2.12.33 → 2.12.36

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/DatePicker.js

@@ -272,6 +272,9 @@ export default createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this4.updateInnerValue();
+
           _this4.$emit('change', picker);
         });
       });

package/es/datetime-picker/TimePicker.js

@@ -114,6 +114,9 @@ export default createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this2.updateInnerValue();
+
           _this2.$emit('change', picker);
         });
       });

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.33';
+var version = '2.12.36';
 
 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/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/es/swipe/index.js

@@ -181,10 +181,16 @@ export 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) {
         preventDefault(event, this.stopPropagation);
+      }
+
+      if (this.isCorrectDirection) {
         this.move({
           offset: this.delta
         });

package/es/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/es/tabbar-item/index.js

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

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/DatePicker.js

@@ -286,6 +286,9 @@ var _default2 = createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this4.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this4.updateInnerValue();
+
           _this4.$emit('change', picker);
         });
       });

package/lib/datetime-picker/TimePicker.js

@@ -125,6 +125,9 @@ var _default = createComponent({
       this.updateInnerValue();
       this.$nextTick(function () {
         _this2.$nextTick(function () {
+          // https://github.com/youzan/vant/issues/9775
+          _this2.updateInnerValue();
+
           _this2.$emit('change', picker);
         });
       });