vant 2.12.33 → 2.12.34-beta.0

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.34-beta.0';
 
 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.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/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/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.34-beta.0';
 exports.version = version;
 
 function install(Vue) {

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

@@ -12781,10 +12781,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
         });
@@ -21809,9 +21815,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 +22122,7 @@ TreeSelect.props = {
 
 
 
-var version = '2.12.33';
+var version = '2.12.34-beta.0';
 
 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];