vant 4.8.10 → 4.9.0

package/lib/dropdown-item/DropdownItem.js

@@ -104,8 +104,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const {
         activeColor
       } = parent.props;
+      const {
+        disabled
+      } = option;
       const active = option.value === props.modelValue;
       const onClick = () => {
+        if (disabled) {
+          return;
+        }
         state.showPopup = false;
         if (option.value !== props.modelValue) {
           emit("update:modelValue", option.value);
@@ -116,7 +122,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         if (active) {
           return (0, import_vue.createVNode)(import_icon.Icon, {
             "class": bem("icon"),
-            "color": activeColor,
+            "color": disabled ? void 0 : activeColor,
             "name": "success"
           }, null);
         }
@@ -127,13 +133,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "icon": option.icon,
         "title": option.text,
         "class": bem("option", {
-          active
+          active,
+          disabled
         }),
         "style": {
           color: active ? activeColor : ""
         },
         "tabindex": active ? 0 : -1,
-        "clickable": true,
+        "clickable": !disabled,
         "onClick": onClick
       }, {
         value: renderIcon

package/lib/dropdown-item/index.css

@@ -1 +1 @@
-:root,:host{--van-dropdown-item-z-index: 10}.van-dropdown-item{position:fixed;right:0;left:0;z-index:var(--van-dropdown-item-z-index);overflow:hidden}.van-dropdown-item__icon{display:block;line-height:inherit}.van-dropdown-item__option{text-align:left}.van-dropdown-item__option--active,.van-dropdown-item__option--active .van-dropdown-item__icon{color:var(--van-dropdown-menu-option-active-color)}.van-dropdown-item--up{top:0}.van-dropdown-item--down{bottom:0}.van-dropdown-item__content{position:absolute;max-height:var(--van-dropdown-menu-content-max-height)}
+:root,:host{--van-dropdown-item-z-index: 10}.van-dropdown-item{position:fixed;right:0;left:0;z-index:var(--van-dropdown-item-z-index);overflow:hidden}.van-dropdown-item__icon{display:block;line-height:inherit}.van-dropdown-item__option{text-align:left}.van-dropdown-item__option--active,.van-dropdown-item__option--active .van-dropdown-item__icon{color:var(--van-dropdown-menu-option-active-color)}.van-dropdown-item__option--disabled,.van-dropdown-item__option--disabled .van-dropdown-item__icon{color:var(--van-dropdown-menu-option-disabled-color)}.van-dropdown-item--up{top:0}.van-dropdown-item--down{bottom:0}.van-dropdown-item__content{position:absolute;max-height:var(--van-dropdown-menu-content-max-height)}

package/lib/dropdown-item/types.d.ts

@@ -3,6 +3,7 @@ import type { VNode, ComponentPublicInstance } from 'vue';
 import type { Numeric } from '../utils';
 export type DropdownItemOptionValue = Numeric | boolean;
 export type DropdownItemOption = {
+    disabled?: boolean;
     text: string;
     icon?: string;
     value: DropdownItemOptionValue;

package/lib/dropdown-menu/index.css

@@ -1 +1 @@
-:root,:host{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__bar--scrollable{padding-left:var(--van-padding-base);padding-right:var(--van-padding-xs);overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-dropdown-menu__bar--scrollable::-webkit-scrollbar{display:none}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__item--grow{flex:1 0 auto;padding-left:var(--van-padding-base);padding-right:var(--van-padding-sm)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}
+:root,:host{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-option-disabled-color: var(--van-text-color-3);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__bar--scrollable{padding-left:var(--van-padding-base);padding-right:var(--van-padding-xs);overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-dropdown-menu__bar--scrollable::-webkit-scrollbar{display:none}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__item--grow{flex:1 0 auto;padding-left:var(--van-padding-base);padding-right:var(--van-padding-sm)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}

package/lib/dropdown-menu/types.d.ts

@@ -22,5 +22,6 @@ export type DropdownMenuThemeVars = {
     dropdownMenuTitlePadding?: string;
     dropdownMenuTitleLineHeight?: number | string;
     dropdownMenuOptionActiveColor?: string;
+    dropdownMenuOptionDisabledColor?: string;
     dropdownMenuContentMaxHeight?: string;
 };

package/lib/highlight/Highlight.js

@@ -89,6 +89,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return chunks2;
       }, []);
       const lastChunk = chunks[chunks.length - 1];
+      if (!lastChunk) {
+        chunks.push({
+          start: 0,
+          end: sourceString.length,
+          highlight: false
+        });
+      }
       if (lastChunk && lastChunk.end < sourceString.length) {
         chunks.push({
           start: lastChunk.end,

package/lib/image-preview/ImagePreviewItem.js

@@ -213,6 +213,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const checkClose = (event) => {
       var _a;
       const swipeItemEl = (_a = swipeItem.value) == null ? void 0 : _a.$el;
+      if (!swipeItemEl)
+        return;
       const imageEl = swipeItemEl.firstElementChild;
       const isClickOverlay = event.target === swipeItemEl;
       const isClickImage = imageEl == null ? void 0 : imageEl.contains(event.target);

package/lib/index-bar/IndexBar.js

@@ -108,7 +108,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
         const match = getMatchAnchor(selectActiveIndex);
         if (match) {
           const rect = match.getRect(scrollParent.value, scrollParentRect);
-          active = getActiveAnchor(rect.top, rects);
+          if (props.sticky && props.stickyOffsetTop) {
+            active = getActiveAnchor(rect.top - props.stickyOffsetTop, rects);
+          } else {
+            active = getActiveAnchor(rect.top, rects);
+          }
         }
       } else {
         active = getActiveAnchor(scrollTop, rects);
@@ -181,7 +185,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
           return;
         }
         if (props.sticky && props.stickyOffsetTop) {
-          (0, import_utils.setRootScrollTop)((0, import_utils.getRootScrollTop)() - props.stickyOffsetTop);
+          if ((0, import_utils.getRootScrollTop)() === offsetHeight - scrollParentRect.height) {
+            (0, import_utils.setRootScrollTop)((0, import_utils.getRootScrollTop)());
+          } else {
+            (0, import_utils.setRootScrollTop)((0, import_utils.getRootScrollTop)() - props.stickyOffsetTop);
+          }
         }
         emit("select", match.index);
       }