vant 2.12.32 → 2.12.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -272,6 +272,9 @@ export default createComponent({
272
272
  this.updateInnerValue();
273
273
  this.$nextTick(function () {
274
274
  _this4.$nextTick(function () {
275
+ // https://github.com/youzan/vant/issues/9775
276
+ _this4.updateInnerValue();
277
+
275
278
  _this4.$emit('change', picker);
276
279
  });
277
280
  });
@@ -114,6 +114,9 @@ export default createComponent({
114
114
  this.updateInnerValue();
115
115
  this.$nextTick(function () {
116
116
  _this2.$nextTick(function () {
117
+ // https://github.com/youzan/vant/issues/9775
118
+ _this2.updateInnerValue();
119
+
117
120
  _this2.$emit('change', picker);
118
121
  });
119
122
  });
package/es/index.js CHANGED
@@ -87,7 +87,7 @@ import Tag from './tag';
87
87
  import Toast from './toast';
88
88
  import TreeSelect from './tree-select';
89
89
  import Uploader from './uploader';
90
- var version = '2.12.32';
90
+ var version = '2.12.35';
91
91
 
92
92
  function install(Vue) {
93
93
  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];
@@ -1,7 +1,7 @@
1
1
  import _mergeJSXProps2 from "@vue/babel-helper-vue-jsx-merge-props";
2
2
  import _mergeJSXProps from "@vue/babel-helper-vue-jsx-merge-props";
3
3
  import { deepClone } from '../utils/deep-clone';
4
- import { createNamespace, isObject } from '../utils';
4
+ import { createNamespace, inBrowser, isObject } from '../utils';
5
5
  import { range } from '../utils/format/number';
6
6
  import { preventDefault, on, off } from '../utils/dom/event';
7
7
  import { TouchMixin } from '../mixins/touch';
@@ -29,7 +29,7 @@ function isOptionDisabled(option) {
29
29
  // https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
30
30
 
31
31
 
32
- var supportMousewheel = ('onwheel' in window);
32
+ var supportMousewheel = inBrowser && 'onwheel' in window;
33
33
  var mousewheelTimer = null;
34
34
  export default createComponent({
35
35
  mixins: [TouchMixin],
@@ -1 +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}
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 CHANGED
@@ -181,10 +181,16 @@ export default createComponent({
181
181
  },
182
182
  onTouchMove: function onTouchMove(event) {
183
183
  if (!this.touchable || !this.swiping) return;
184
- this.touchMove(event);
184
+ this.touchMove(event); // if user starting to touchmove, prevent the event bubbling to
185
+ // avoid affecting the parent components
185
186
 
186
- if (this.isCorrectDirection) {
187
+ var shouldPrevent = this.isCorrectDirection || this.offsetY > this.offsetX === this.vertical;
188
+
189
+ if (shouldPrevent) {
187
190
  preventDefault(event, this.stopPropagation);
191
+ }
192
+
193
+ if (this.isCorrectDirection) {
188
194
  this.move({
189
195
  offset: this.delta
190
196
  });
@@ -3,6 +3,8 @@
3
3
  .van-swipe {
4
4
  position: relative;
5
5
  overflow: hidden;
6
+ // https://github.com/youzan/vant/issues/9931
7
+ transform: translateZ(0);
6
8
  cursor: grab;
7
9
  user-select: none;
8
10
 
@@ -37,9 +37,11 @@ export default createComponent({
37
37
  var config = isObject(to) ? to : {
38
38
  path: to
39
39
  };
40
- var pathMatched = config.path === $route.path;
41
- var nameMatched = isDef(config.name) && config.name === $route.name;
42
- return pathMatched || nameMatched;
40
+ return !!$route.matched.find(function (r) {
41
+ var pathMatched = config.path === r.path;
42
+ var nameMatched = isDef(config.name) && config.name === r.name;
43
+ return pathMatched || nameMatched;
44
+ });
43
45
  }
44
46
  },
45
47
  active: function active() {
@@ -286,6 +286,9 @@ var _default2 = createComponent({
286
286
  this.updateInnerValue();
287
287
  this.$nextTick(function () {
288
288
  _this4.$nextTick(function () {
289
+ // https://github.com/youzan/vant/issues/9775
290
+ _this4.updateInnerValue();
291
+
289
292
  _this4.$emit('change', picker);
290
293
  });
291
294
  });
@@ -125,6 +125,9 @@ var _default = createComponent({
125
125
  this.updateInnerValue();
126
126
  this.$nextTick(function () {
127
127
  _this2.$nextTick(function () {
128
+ // https://github.com/youzan/vant/issues/9775
129
+ _this2.updateInnerValue();
130
+
128
131
  _this2.$emit('change', picker);
129
132
  });
130
133
  });