vant 3.3.1 → 3.3.2

package/lib/vant.js

@@ -4743,13 +4743,6 @@
       var totalDay = vue.computed(() => getMonthEndDay(props.date.getFullYear(), props.date.getMonth() + 1));
       var shouldRender = vue.computed(() => visible.value || !props.lazyRender);
       var getTitle = () => title.value;
-      var scrollIntoView = (body) => {
-        var el = props.showSubtitle ? daysRef.value : monthRef.value;
-        if (el) {
-          var scrollTop = useRect(el).top - useRect(body).top + body.scrollTop;
-          setScrollTop(body, scrollTop);
-        }
-      };
       var getMultipleDayType = (day) => {
         var isSelected = (date) => props.currentDate.some((item) => compareDay(item, date) === 0);
         if (isSelected(day)) {
@@ -4870,6 +4863,15 @@
         return days2;
       });
       var disabledDays = vue.computed(() => days.value.filter((day) => day.type === "disabled"));
+      var scrollToDate = (body, targetDate) => {
+        if (daysRef.value) {
+          var daysRect = useRect(daysRef.value);
+          var totalRows = placeholders.value.length;
+          var currentRow = Math.ceil((targetDate.getDate() + offset2.value) / 7);
+          var rowOffset = (currentRow - 1) * daysRect.height / totalRows;
+          setScrollTop(body, daysRect.top + rowOffset + body.scrollTop - useRect(body).top);
+        }
+      };
       var renderDay = (item, index2) => vue.createVNode(CalendarDay, {
         "item": item,
         "index": index2,
@@ -4887,7 +4889,7 @@
         getTitle,
         getHeight: () => height2.value,
         setVisible,
-        scrollIntoView,
+        scrollToDate,
         disabledDays
       });
       return () => vue.createVNode("div", {
@@ -5120,7 +5122,7 @@
           months.value.some((month, index2) => {
             if (compareMonth(month, targetDate) === 0) {
               if (bodyRef.value) {
-                monthRefs.value[index2].scrollIntoView(bodyRef.value);
+                monthRefs.value[index2].scrollToDate(bodyRef.value, targetDate);
               }
               return true;
             }
@@ -5129,7 +5131,7 @@
           onScroll();
         });
       };
-      var scrollIntoView = () => {
+      var scrollToCurrentDate = () => {
         if (props.poppable && !props.show) {
           return;
         }
@@ -5146,7 +5148,7 @@
         }
         raf(() => {
           bodyHeight = Math.floor(useRect(bodyRef).height);
-          scrollIntoView();
+          scrollToCurrentDate();
         });
       };
       var reset = function(date) {
@@ -5154,7 +5156,7 @@
           date = getInitialDate();
         }
         currentDate.value = date;
-        scrollIntoView();
+        scrollToCurrentDate();
       };
       var checkRange = (date) => {
         var {
@@ -5183,11 +5185,7 @@
         if (complete && props.type === "range") {
           var valid = checkRange(date);
           if (!valid) {
-            if (props.showConfirm) {
-              setCurrentDate([date[0], getDayByOffset(date[0], +props.maxRange - 1)]);
-            } else {
-              setCurrentDate(date);
-            }
+            setCurrentDate([date[0], getDayByOffset(date[0], +props.maxRange - 1)]);
             return;
           }
         }
@@ -5320,7 +5318,7 @@
           value = null;
         }
         currentDate.value = value;
-        scrollIntoView();
+        scrollToCurrentDate();
       });
       useExpose({
         reset,
@@ -6056,8 +6054,11 @@
       var onTouchMove = (event) => {
         if (props.touchable && state.swiping) {
           touch.move(event);
-          if (isCorrectDirection.value) {
+          var shouldPrevent = isCorrectDirection.value || touch.offsetY.value > touch.offsetX.value === props.vertical;
+          if (shouldPrevent) {
             preventDefault(event, props.stopPropagation);
+          }
+          if (isCorrectDirection.value) {
             move({
               offset: delta.value
             });
@@ -6711,7 +6712,7 @@
           return vue.createVNode(SwipeItem, {
             "id": id,
             "role": "tabpanel",
-            "class": bem$T("pane-wrapper", {
+            "class": bem$T("panel-wrapper", {
               inactive: !active.value
             }),
             "tabindex": active.value ? 0 : -1,
@@ -14813,9 +14814,11 @@
           var config = isObject(to) ? to : {
             path: to
           };
-          var pathMatched = "path" in config && config.path === $route.path;
-          var nameMatched = "name" in config && config.name === $route.name;
-          return pathMatched || nameMatched;
+          return !!$route.matched.find((val) => {
+            var pathMatched = "path" in config && config.path === val.path;
+            var nameMatched = "name" in config && config.name === val.name;
+            return pathMatched || nameMatched;
+          });
         }
         return ((_props$name = props.name) != null ? _props$name : index2.value) === modelValue;
       });
@@ -15379,7 +15382,7 @@
     }
   });
   var Uploader = withInstall(_Uploader);
-  var version = "3.3.1";
+  var version = "3.3.2";
   function install(app) {
     var components = [ActionBar, ActionBarButton, ActionBarIcon, ActionSheet, AddressEdit, AddressList, Area, Badge, Button, Calendar, Card, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Circle, Col, Collapse, CollapseItem, ConfigProvider, ContactCard, ContactEdit, ContactList, CountDown, Coupon, CouponCell, CouponList, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, Form, Grid, GridItem, Icon, Image$1, ImagePreview, IndexAnchor, IndexBar, List, Loading, Locale, NavBar, NoticeBar, Notify, NumberKeyboard, Overlay, Pagination, PasswordInput, Picker, Popover, Popup, Progress, PullRefresh, Radio, RadioGroup, Rate, Row, Search, ShareSheet, Sidebar, SidebarItem, Skeleton, Slider, Step, Stepper, Steps, Sticky, SubmitBar, Swipe, SwipeCell, SwipeItem, Switch, Tab, Tabbar, TabbarItem, Tabs, Tag, Toast, TreeSelect, Uploader];
     components.forEach((item) => {