vant 2.12.31 → 2.12.34

package/lib/vant.js

@@ -2221,8 +2221,12 @@ function getElementTranslateY(element) {
 
 function isOptionDisabled(option) {
   return Object(utils["f" /* isObject */])(option) && option.disabled;
-}
+} // use standard WheelEvent:
+// https://developer.mozilla.org/en-US/docs/Web/API/WheelEvent
+
 
+var supportMousewheel = utils["b" /* inBrowser */] && 'onwheel' in window;
+var mousewheelTimer = null;
 /* harmony default export */ var PickerColumn = (PickerColumn_createComponent({
   mixins: [TouchMixin],
   props: {
@@ -2258,6 +2262,10 @@ function isOptionDisabled(option) {
   },
   mounted: function mounted() {
     this.bindTouchEvent(this.$el);
+
+    if (supportMousewheel) {
+      event_on(this.$el, 'wheel', this.onMouseWheel, false);
+    }
   },
   destroyed: function destroyed() {
     var children = this.$parent.children;
@@ -2265,6 +2273,10 @@ function isOptionDisabled(option) {
     if (children) {
       children.splice(children.indexOf(this), 1);
     }
+
+    if (supportMousewheel) {
+      off(this.$el, 'wheel');
+    }
   },
   watch: {
     initialOptions: 'setOptions',
@@ -2352,6 +2364,43 @@ function isOptionDisabled(option) {
         _this.moving = false;
       }, 0);
     },
+    onMouseWheel: function onMouseWheel(event) {
+      var _this2 = this;
+
+      if (this.readonly) {
+        return;
+      }
+
+      preventDefault(event, true); // simply combine touchstart and touchmove
+
+      var translateY = getElementTranslateY(this.$refs.wrapper);
+      this.startOffset = Math.min(0, translateY - this.baseOffset);
+      this.momentumOffset = this.startOffset;
+      this.transitionEndTrigger = null; // directly use deltaY, see https://caniuse.com/?search=deltaY
+      // use deltaY to detect direction for not special setting device
+      // https://developer.mozilla.org/en-US/docs/Web/API/Element/wheel_event
+
+      var deltaY = event.deltaY;
+
+      if (this.startOffset === 0 && deltaY < 0) {
+        return;
+      } // get offset
+      // if necessary, can adjust distance value to make scrolling smoother
+
+
+      var distance = -deltaY;
+      this.offset = range(this.startOffset + distance, -(this.count * this.itemHeight), this.itemHeight);
+
+      if (mousewheelTimer) {
+        clearTimeout(mousewheelTimer);
+      }
+
+      mousewheelTimer = setTimeout(function () {
+        _this2.onTouchEnd();
+
+        _this2.touchStartTime = 0;
+      }, MOMENTUM_LIMIT_TIME);
+    },
     onTransitionEnd: function onTransitionEnd() {
       this.stopMomentum();
     },
@@ -2383,17 +2432,17 @@ function isOptionDisabled(option) {
       return option;
     },
     setIndex: function setIndex(index, emitChange) {
-      var _this2 = this;
+      var _this3 = this;
 
       index = this.adjustIndex(index) || 0;
       var offset = -index * this.itemHeight;
 
       var trigger = function trigger() {
-        if (index !== _this2.currentIndex) {
-          _this2.currentIndex = index;
+        if (index !== _this3.currentIndex) {
+          _this3.currentIndex = index;
 
           if (emitChange) {
-            _this2.$emit('change', index);
+            _this3.$emit('change', index);
           }
         }
       }; // trigger the change event after transitionend when moving
@@ -2439,7 +2488,7 @@ function isOptionDisabled(option) {
       }
     },
     genOptions: function genOptions() {
-      var _this3 = this;
+      var _this4 = this;
 
       var h = this.$createElement;
       var optionStyle = {
@@ -2448,7 +2497,7 @@ function isOptionDisabled(option) {
       return this.options.map(function (option, index) {
         var _domProps;
 
-        var text = _this3.getOptionText(option);
+        var text = _this4.getOptionText(option);
 
         var disabled = isOptionDisabled(option);
         var data = {
@@ -2459,19 +2508,19 @@ function isOptionDisabled(option) {
           },
           class: [PickerColumn_bem('item', {
             disabled: disabled,
-            selected: index === _this3.currentIndex
+            selected: index === _this4.currentIndex
           })],
           on: {
             click: function click() {
-              _this3.onClickItem(index);
+              _this4.onClickItem(index);
             }
           }
         };
         var childData = {
           class: 'van-ellipsis',
-          domProps: (_domProps = {}, _domProps[_this3.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
+          domProps: (_domProps = {}, _domProps[_this4.allowHtml ? 'innerHTML' : 'textContent'] = text, _domProps)
         };
-        return h("li", helper_default()([{}, data]), [_this3.slots('option', option) || h("div", helper_default()([{}, childData]))]);
+        return h("li", helper_default()([{}, data]), [_this4.slots('option', option) || h("div", helper_default()([{}, childData]))]);
       });
     }
   },
@@ -3751,13 +3800,15 @@ var field_createNamespace = Object(create["a" /* createNamespace */])('field'),
 
       /* istanbul ignore if */
 
-      var readonly = this.getProp('readonly');
-
-      if (readonly) {
+      if (this.getProp('readonly')) {
         this.blur();
       }
     },
     onBlur: function onBlur(event) {
+      if (this.getProp('readonly')) {
+        return;
+      }
+
       this.focused = false;
       this.updateValue(this.value, 'onBlur');
       this.$emit('blur', event);
@@ -10976,6 +11027,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);
         });
       });
@@ -12730,10 +12784,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
         });
@@ -14259,7 +14319,7 @@ var notice_bar_createNamespace = Object(create["a" /* createNamespace */])('noti
   mixins: [BindEventMixin(function (bind) {
     // fix cache issues with forwards and back history in safari
     // see: https://guwii.com/cache-issues-with-forwards-and-back-history-in-safari/
-    bind(window, 'pageshow', this.start);
+    bind(window, 'pageshow', this.reset);
   })],
   inject: {
     vanPopup: {
@@ -14296,24 +14356,20 @@ var notice_bar_createNamespace = Object(create["a" /* createNamespace */])('noti
     };
   },
   watch: {
-    scrollable: 'start',
+    scrollable: 'reset',
     text: {
-      handler: 'start',
+      handler: 'reset',
       immediate: true
     }
   },
   created: function created() {
-    var _this = this; // https://github.com/youzan/vant/issues/8634
-
-
+    // https://github.com/youzan/vant/issues/8634
     if (this.vanPopup) {
-      this.vanPopup.onReopen(function () {
-        _this.start();
-      });
+      this.vanPopup.onReopen(this.reset);
     }
   },
   activated: function activated() {
-    this.start();
+    this.reset();
   },
   methods: {
     onClickIcon: function onClickIcon(event) {
@@ -14323,7 +14379,7 @@ var notice_bar_createNamespace = Object(create["a" /* createNamespace */])('noti
       }
     },
     onTransitionEnd: function onTransitionEnd() {
-      var _this2 = this;
+      var _this = this;
 
       this.offset = this.wrapWidth;
       this.duration = 0; // wait for Vue to render offset
@@ -14332,50 +14388,52 @@ var notice_bar_createNamespace = Object(create["a" /* createNamespace */])('noti
       Object(raf["c" /* raf */])(function () {
         // use double raf to ensure animation can start
         Object(raf["b" /* doubleRaf */])(function () {
-          _this2.offset = -_this2.contentWidth;
-          _this2.duration = (_this2.contentWidth + _this2.wrapWidth) / _this2.speed;
+          _this.offset = -_this.contentWidth;
+          _this.duration = (_this.contentWidth + _this.wrapWidth) / _this.speed;
 
-          _this2.$emit('replay');
+          _this.$emit('replay');
         });
       });
     },
+    // not an exposed-api, but may used by some users
+    start: function start() {
+      this.reset();
+    },
+    // @exposed-api
     reset: function reset() {
+      var _this2 = this;
+
+      var delay = Object(utils["c" /* isDef */])(this.delay) ? this.delay * 1000 : 0;
       this.offset = 0;
       this.duration = 0;
       this.wrapWidth = 0;
       this.contentWidth = 0;
-    },
-    start: function start() {
-      var _this3 = this;
-
-      var delay = Object(utils["c" /* isDef */])(this.delay) ? this.delay * 1000 : 0;
-      this.reset();
       clearTimeout(this.startTimer);
       this.startTimer = setTimeout(function () {
-        var _this3$$refs = _this3.$refs,
-            wrap = _this3$$refs.wrap,
-            content = _this3$$refs.content;
+        var _this2$$refs = _this2.$refs,
+            wrap = _this2$$refs.wrap,
+            content = _this2$$refs.content;
 
-        if (!wrap || !content || _this3.scrollable === false) {
+        if (!wrap || !content || _this2.scrollable === false) {
           return;
         }
 
         var wrapWidth = wrap.getBoundingClientRect().width;
         var contentWidth = content.getBoundingClientRect().width;
 
-        if (_this3.scrollable || contentWidth > wrapWidth) {
+        if (_this2.scrollable || contentWidth > wrapWidth) {
           Object(raf["b" /* doubleRaf */])(function () {
-            _this3.offset = -contentWidth;
-            _this3.duration = contentWidth / _this3.speed;
-            _this3.wrapWidth = wrapWidth;
-            _this3.contentWidth = contentWidth;
+            _this2.offset = -contentWidth;
+            _this2.duration = contentWidth / _this2.speed;
+            _this2.wrapWidth = wrapWidth;
+            _this2.contentWidth = contentWidth;
           });
         }
       }, delay);
     }
   },
   render: function render() {
-    var _this4 = this;
+    var _this3 = this;
 
     var h = arguments[0];
     var slots = this.slots,
@@ -14450,7 +14508,7 @@ var notice_bar_createNamespace = Object(create["a" /* createNamespace */])('noti
       "style": barStyle,
       "on": {
         "click": function click(event) {
-          _this4.$emit('click', event);
+          _this3.$emit('click', event);
         }
       }
     }, [LeftIcon(), h("div", {
@@ -15616,10 +15674,10 @@ var right = 'right';
 var esm_left = 'left';
 var auto = 'auto';
 var basePlacements = [esm_top, esm_bottom, right, esm_left];
-var esm_start = 'start';
+var start = 'start';
 var end = 'end';
 var placements = /*#__PURE__*/[].concat(basePlacements, [auto]).reduce(function (acc, placement) {
-  return acc.concat([placement, placement + "-" + esm_start, placement + "-" + end]);
+  return acc.concat([placement, placement + "-" + start, placement + "-" + end]);
 }, []); // modifiers that need to read the DOM
 
 var beforeRead = 'beforeRead';
@@ -15872,7 +15930,7 @@ function computeOffsets(_ref) {
     var len = mainAxis === 'y' ? 'height' : 'width';
 
     switch (variation) {
-      case esm_start:
+      case start:
         offsets[mainAxis] = offsets[mainAxis] - (reference[len] / 2 - element[len] / 2);
         break;
 
@@ -21671,23 +21729,23 @@ var tabbar_createNamespace = Object(create["a" /* createNamespace */])('tabbar')
       var _this = this;
 
       this.children.forEach(function (item, index) {
-        item.active = (item.name || index) === _this.value;
+        item.nameMatched = (item.name || index) === _this.value;
       });
     },
-    onChange: function onChange(active) {
+    triggerChange: function triggerChange(active, afterChange) {
       var _this2 = this;
 
-      if (active !== this.value) {
-        callInterceptor({
-          interceptor: this.beforeChange,
-          args: [active],
-          done: function done() {
-            _this2.$emit('input', active);
+      callInterceptor({
+        interceptor: this.beforeChange,
+        args: [active],
+        done: function done() {
+          _this2.$emit('input', active);
 
-            _this2.$emit('change', active);
-          }
-        });
-      }
+          _this2.$emit('change', active);
+
+          afterChange();
+        }
+      });
     },
     genTabbar: function genTabbar() {
       var _ref;
@@ -21748,11 +21806,11 @@ var tabbar_item_createNamespace = Object(create["a" /* createNamespace */])('tab
   }),
   data: function data() {
     return {
-      active: false
+      nameMatched: false
     };
   },
   computed: {
-    routeActive: function routeActive() {
+    routeMatched: function routeMatched() {
       var to = this.to,
           $route = this.$route;
 
@@ -21760,22 +21818,33 @@ 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() {
+      return this.parent.route ? this.routeMatched : this.nameMatched;
     }
   },
   methods: {
     onClick: function onClick(event) {
-      this.parent.onChange(this.name || this.index);
+      var _this = this;
+
+      if (!this.active) {
+        this.parent.triggerChange(this.name || this.index, function () {
+          route(_this.$router, _this);
+        });
+      }
+
       this.$emit('click', event);
-      route(this.$router, this);
     },
-    genIcon: function genIcon(active) {
+    genIcon: function genIcon() {
       var h = this.$createElement;
       var slot = this.slots('icon', {
-        active: active
+        active: this.active
       });
 
       if (slot) {
@@ -21796,7 +21865,7 @@ var tabbar_item_createNamespace = Object(create["a" /* createNamespace */])('tab
     var _this$badge;
 
     var h = arguments[0];
-    var active = this.parent.route ? this.routeActive : this.active;
+    var active = this.active;
     var color = this.parent[active ? 'activeColor' : 'inactiveColor'];
 
     if (false) {}
@@ -21813,7 +21882,7 @@ var tabbar_item_createNamespace = Object(create["a" /* createNamespace */])('tab
       }
     }, [h("div", {
       "class": tabbar_item_bem('icon')
-    }, [this.genIcon(active), h(es_info, {
+    }, [this.genIcon(), h(es_info, {
       "attrs": {
         "dot": this.dot,
         "info": (_this$badge = this.badge) != null ? _this$badge : this.info
@@ -22056,7 +22125,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.31';
+var version = '2.12.34';
 
 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];