vant 2.12.37 → 2.12.38

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.37';
+var version = '2.12.38';
 
 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/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/lib/index.js

@@ -361,7 +361,7 @@ exports.TreeSelect = _treeSelect.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.12.37';
+var version = '2.12.38';
 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/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
         });

package/lib/vant.js

@@ -1194,14 +1194,13 @@ function getVisibleTop(el) {
 }
 // CONCATENATED MODULE: ./es/mixins/touch.js
 
-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';
   }
 
@@ -1221,13 +1220,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 = '';
@@ -12816,16 +12820,10 @@ var swipe_createNamespace = Object(create["a" /* createNamespace */])('swipe'),
     },
     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
         });
@@ -21109,6 +21107,7 @@ var isSameValue = function isSameValue(newValue, oldValue) {
     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) {
@@ -21126,6 +21125,27 @@ var isSameValue = function isSameValue(newValue, oldValue) {
         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": slider_bem('button'),
+          "style": _this.buttonStyle
+        });
+      };
+
       return h("div", {
         "ref": getRefName(),
         "attrs": {
@@ -21148,10 +21168,7 @@ var isSameValue = function isSameValue(newValue, oldValue) {
             return e.stopPropagation();
           }
         }
-      }, [_this.slots('button') || h("div", {
-        "class": slider_bem('button'),
-        "style": _this.buttonStyle
-      })]);
+      }, [renderButtonContent()]);
     };
 
     return h("div", {
@@ -22173,7 +22190,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.37';
+var version = '2.12.38';
 
 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, es_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];