vant 4.8.2 → 4.8.3

package/lib/index.d.ts

@@ -106,4 +106,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.8.2";
+export const version: "4.8.3";

package/lib/index.js

@@ -226,7 +226,7 @@ __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
 __reExport(stdin_exports, require("./watermark"), module.exports);
-const version = "4.8.2";
+const version = "4.8.3";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/notify/Notify.js

@@ -27,6 +27,7 @@ var import_utils = require("../utils");
 var import_popup = require("../popup");
 var import_shared = require("../popup/shared");
 const [name, bem] = (0, import_utils.createNamespace)("notify");
+const popupInheritProps = ["lockScroll", "position", "show", "teleport", "zIndex"];
 const notifyProps = (0, import_utils.extend)({}, import_shared.popupSharedProps, {
   type: (0, import_utils.makeStringProp)("danger"),
   color: String,
@@ -45,20 +46,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
     slots
   }) {
     const updateShow = (show) => emit("update:show", show);
-    return () => (0, import_vue.createVNode)(import_popup.Popup, {
-      "show": props.show,
+    return () => (0, import_vue.createVNode)(import_popup.Popup, (0, import_vue.mergeProps)({
       "class": [bem([props.type]), props.className],
       "style": {
         color: props.color,
         background: props.background
       },
       "overlay": false,
-      "zIndex": props.zIndex,
-      "position": props.position,
       "duration": 0.2,
-      "lockScroll": props.lockScroll,
       "onUpdate:show": updateShow
-    }, {
+    }, (0, import_utils.pick)(props, popupInheritProps)), {
       default: () => [slots.default ? slots.default() : props.message]
     });
   }

package/lib/sticky/Sticky.js

@@ -104,7 +104,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         if (container) {
           const containerRect = (0, import_use.useRect)(container);
           const difference = containerRect.bottom - offset.value - state.height;
-          state.fixed = offset.value > rootRect.top && containerRect.bottom > 0;
+          state.fixed = offset.value >= rootRect.top && containerRect.bottom > 0;
           state.transform = difference < 0 ? difference : 0;
         } else {
           state.fixed = offset.value > rootRect.top;

package/lib/tab/TabTitle.d.ts

@@ -38,7 +38,7 @@ export declare const TabTitle: import("vue").DefineComponent<{
     dot: boolean;
     disabled: boolean;
     shrink: boolean;
-    isActive: boolean;
     scrollable: boolean;
+    isActive: boolean;
     showZeroBadge: boolean;
 }, {}>;

package/lib/tabs/index.css

@@ -1 +1 @@
-:root,:host{--van-tab-text-color: var(--van-gray-7);--van-tab-active-text-color: var(--van-text-color);--van-tab-disabled-text-color: var(--van-text-color-3);--van-tab-font-size: var(--van-font-size-md);--van-tab-line-height: var(--van-line-height-md);--van-tabs-default-color: var(--van-primary-color);--van-tabs-line-height: 44px;--van-tabs-card-height: 30px;--van-tabs-nav-background: var(--van-background-2);--van-tabs-bottom-bar-width: 40px;--van-tabs-bottom-bar-height: 3px;--van-tabs-bottom-bar-color: var(--van-primary-color)}.van-tab{position:relative;display:flex;flex:1;align-items:center;justify-content:center;box-sizing:border-box;padding:0 var(--van-padding-base);color:var(--van-tab-text-color);font-size:var(--van-tab-font-size);line-height:var(--van-tab-line-height);cursor:pointer}.van-tab--active{color:var(--van-tab-active-text-color);font-weight:var(--van-font-bold)}.van-tab--disabled{color:var(--van-tab-disabled-text-color);cursor:not-allowed}.van-tab--grow{flex:1 0 auto;padding:0 var(--van-padding-sm)}.van-tab--shrink{flex:none;padding:0 var(--van-padding-xs)}.van-tab--card{color:var(--van-tabs-default-color);border-right:var(--van-border-width) solid var(--van-tabs-default-color)}.van-tab--card:last-child{border-right:none}.van-tab--card.van-tab--active{color:var(--van-white);background-color:var(--van-tabs-default-color)}.van-tab--card--disabled{color:var(--van-tab-disabled-text-color)}.van-tab__text--ellipsis{display:-webkit-box;overflow:hidden;-webkit-line-clamp:1;-webkit-box-orient:vertical}.van-tabs{position:relative}.van-tabs__wrap{overflow:hidden}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__nav{position:relative;display:flex;background:var(--van-tabs-nav-background);-webkit-user-select:none;user-select:none}.van-tabs__nav--complete{overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-tabs__nav--complete::-webkit-scrollbar{display:none}.van-tabs__nav--line{box-sizing:content-box;height:100%;padding-bottom:15px}.van-tabs__nav--line.van-tabs__nav--shrink,.van-tabs__nav--line.van-tabs__nav--complete{padding-right:var(--van-padding-xs);padding-left:var(--van-padding-xs)}.van-tabs__nav--card{box-sizing:border-box;height:var(--van-tabs-card-height);margin:0 var(--van-padding-md);border:var(--van-border-width) solid var(--van-tabs-default-color);border-radius:var(--van-border-radius-sm)}.van-tabs__nav--card.van-tabs__nav--shrink{display:inline-flex}.van-tabs__line{position:absolute;bottom:15px;left:0;z-index:1;width:var(--van-tabs-bottom-bar-width);height:var(--van-tabs-bottom-bar-height);background:var(--van-tabs-bottom-bar-color);border-radius:var(--van-tabs-bottom-bar-height)}.van-tabs__track{position:relative;display:flex;width:100%;height:100%;will-change:left}.van-tabs__content--animated{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:var(--van-tabs-line-height)}.van-tabs--card>.van-tabs__wrap{height:var(--van-tabs-card-height)}
+:root,:host{--van-tab-text-color: var(--van-gray-7);--van-tab-active-text-color: var(--van-text-color);--van-tab-disabled-text-color: var(--van-text-color-3);--van-tab-font-size: var(--van-font-size-md);--van-tab-line-height: var(--van-line-height-md);--van-tabs-default-color: var(--van-primary-color);--van-tabs-line-height: 44px;--van-tabs-card-height: 30px;--van-tabs-nav-background: var(--van-background-2);--van-tabs-bottom-bar-width: 40px;--van-tabs-bottom-bar-height: 3px;--van-tabs-bottom-bar-color: var(--van-primary-color)}.van-tab{position:relative;display:flex;flex:1;align-items:center;justify-content:center;box-sizing:border-box;padding:0 var(--van-padding-base);color:var(--van-tab-text-color);font-size:var(--van-tab-font-size);line-height:var(--van-tab-line-height);cursor:pointer}.van-tab--active{color:var(--van-tab-active-text-color);font-weight:var(--van-font-bold)}.van-tab--disabled{color:var(--van-tab-disabled-text-color);cursor:not-allowed}.van-tab--grow{flex:1 0 auto;padding:0 var(--van-padding-sm)}.van-tab--shrink{flex:none;padding:0 var(--van-padding-xs)}.van-tab--card{color:var(--van-tabs-default-color);border-right:var(--van-border-width) solid var(--van-tabs-default-color)}.van-tab--card:last-child{border-right:none}.van-tab--card.van-tab--active{color:var(--van-white);background-color:var(--van-tabs-default-color)}.van-tab--card--disabled{color:var(--van-tab-disabled-text-color)}.van-tab__text--ellipsis{display:-webkit-box;overflow:hidden;-webkit-line-clamp:1;-webkit-box-orient:vertical}.van-tabs{position:relative}.van-tabs__wrap{overflow:hidden}.van-tabs__wrap--page-top{position:fixed}.van-tabs__wrap--content-bottom{top:auto;bottom:0}.van-tabs__nav{position:relative;display:flex;background:var(--van-tabs-nav-background);-webkit-user-select:none;user-select:none}.van-tabs__nav--complete{overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-tabs__nav--complete::-webkit-scrollbar{display:none}.van-tabs__nav--line{box-sizing:content-box;height:100%;padding-bottom:15px}.van-tabs__nav--line.van-tabs__nav--shrink,.van-tabs__nav--line.van-tabs__nav--complete{padding-right:var(--van-padding-xs);padding-left:var(--van-padding-xs)}.van-tabs__nav--card{box-sizing:border-box;height:var(--van-tabs-card-height);margin:0 var(--van-padding-md);border:var(--van-border-width) solid var(--van-tabs-default-color);border-radius:var(--van-radius-sm)}.van-tabs__nav--card.van-tabs__nav--shrink{display:inline-flex}.van-tabs__line{position:absolute;bottom:15px;left:0;z-index:1;width:var(--van-tabs-bottom-bar-width);height:var(--van-tabs-bottom-bar-height);background:var(--van-tabs-bottom-bar-color);border-radius:var(--van-tabs-bottom-bar-height)}.van-tabs__track{position:relative;display:flex;width:100%;height:100%;will-change:left}.van-tabs__content--animated{overflow:hidden}.van-tabs--line .van-tabs__wrap{height:var(--van-tabs-line-height)}.van-tabs--card>.van-tabs__wrap{height:var(--van-tabs-card-height)}

package/lib/text-ellipsis/TextEllipsis.js

@@ -39,7 +39,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
   props: textEllipsisProps,
   emits: ["clickAction"],
   setup(props, {
-    emit
+    emit,
+    slots
   }) {
     const text = (0, import_vue2.ref)("");
     const expanded = (0, import_vue2.ref)(false);
@@ -147,10 +148,15 @@ var stdin_default = (0, import_vue2.defineComponent)({
       toggle();
       emit("clickAction", event);
     };
-    const renderAction = () => (0, import_vue.createVNode)("span", {
-      "class": bem("action"),
-      "onClick": onClickAction
-    }, [actionText.value]);
+    const renderAction = () => {
+      const action = slots.action ? slots.action({
+        expanded: expanded.value
+      }) : actionText.value;
+      return (0, import_vue.createVNode)("span", {
+        "class": bem("action"),
+        "onClick": onClickAction
+      }, [action]);
+    };
     (0, import_vue2.onMounted)(calcEllipsised);
     (0, import_vue2.watch)([import_utils.windowWidth, () => [props.content, props.rows, props.position]], calcEllipsised);
     (0, import_use_expose.useExpose)({

package/lib/toast/Toast.d.ts

@@ -33,6 +33,7 @@ export declare const toastProps: {
     overlayStyle: PropType<CSSProperties>;
     closeOnClick: BooleanConstructor;
     closeOnClickOverlay: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
 };
 export type ToastProps = ExtractPropTypes<typeof toastProps>;
 declare const _default: import("vue").DefineComponent<{
@@ -67,6 +68,7 @@ declare const _default: import("vue").DefineComponent<{
     overlayStyle: PropType<CSSProperties>;
     closeOnClick: BooleanConstructor;
     closeOnClickOverlay: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
 }, () => import("vue/jsx-runtime").JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:show"[], "update:show", import("vue").PublicProps, Readonly<ExtractPropTypes<{
     icon: StringConstructor;
     show: BooleanConstructor;
@@ -99,6 +101,7 @@ declare const _default: import("vue").DefineComponent<{
     overlayStyle: PropType<CSSProperties>;
     closeOnClick: BooleanConstructor;
     closeOnClickOverlay: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
 }>> & {
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }, {

package/lib/toast/Toast.js

@@ -29,7 +29,7 @@ var import_icon = require("../icon");
 var import_popup = require("../popup");
 var import_loading = require("../loading");
 const [name, bem] = (0, import_utils.createNamespace)("toast");
-const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay", "zIndex"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -49,7 +49,8 @@ const toastProps = {
   overlayClass: import_utils.unknownProp,
   overlayStyle: Object,
   closeOnClick: Boolean,
-  closeOnClickOverlay: Boolean
+  closeOnClickOverlay: Boolean,
+  zIndex: import_utils.numericProp
 };
 var stdin_default = (0, import_vue2.defineComponent)({
   name,

package/lib/toast/index.d.ts

@@ -30,6 +30,7 @@ export declare const Toast: import("../utils").WithInstall<import("vue").DefineC
     overlayStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeOnClick: BooleanConstructor;
     closeOnClickOverlay: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
 }, () => import("vue/jsx-runtime").JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:show"[], "update:show", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     icon: StringConstructor;
     show: BooleanConstructor;
@@ -62,6 +63,7 @@ export declare const Toast: import("../utils").WithInstall<import("vue").DefineC
     overlayStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeOnClick: BooleanConstructor;
     closeOnClickOverlay: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
 }>> & {
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
 }, {

package/lib/toast/types.d.ts

@@ -9,8 +9,6 @@ export type ToastOptions = {
     type?: ToastType;
     mask?: boolean;
     message?: Numeric;
-    onClose?: () => void;
-    onOpened?: () => void;
     overlay?: boolean;
     duration?: number;
     teleport?: TeleportProps['to'];
@@ -26,6 +24,9 @@ export type ToastOptions = {
     overlayClass?: unknown;
     overlayStyle?: Record<string, any>;
     closeOnClickOverlay?: boolean;
+    zIndex?: Numeric;
+    onClose?: () => void;
+    onOpened?: () => void;
 };
 export type ToastWrapperInstance = ComponentPublicInstance<{
     message: Numeric;

package/lib/uploader/Uploader.d.ts

@@ -1,7 +1,6 @@
 import { type PropType, type ExtractPropTypes } from 'vue';
 import { Interceptor, type Numeric } from '../utils';
 import { type ImagePreviewOptions } from '../image-preview';
-import type { ImageFit } from '../image';
 import type { UploaderMaxSize, UploaderAfterRead, UploaderBeforeRead, UploaderResultType, UploaderFileListItem } from './types';
 export declare const uploaderProps: {
     name: {
@@ -22,8 +21,8 @@ export declare const uploaderProps: {
         default: number;
     };
     imageFit: {
-        type: PropType<ImageFit>;
-        default: ImageFit;
+        type: PropType<import("csstype").Property.ObjectFit | undefined>;
+        default: import("csstype").Property.ObjectFit | undefined;
     };
     resultType: {
         type: PropType<UploaderResultType>;
@@ -85,8 +84,8 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageFit: {
-        type: PropType<ImageFit>;
-        default: ImageFit;
+        type: PropType<import("csstype").Property.ObjectFit | undefined>;
+        default: import("csstype").Property.ObjectFit | undefined;
     };
     resultType: {
         type: PropType<UploaderResultType>;
@@ -146,8 +145,8 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     imageFit: {
-        type: PropType<ImageFit>;
-        default: ImageFit;
+        type: PropType<import("csstype").Property.ObjectFit | undefined>;
+        default: import("csstype").Property.ObjectFit | undefined;
     };
     resultType: {
         type: PropType<UploaderResultType>;
@@ -205,7 +204,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly: boolean;
     lazyLoad: boolean;
     maxCount: string | number;
-    imageFit: ImageFit;
+    imageFit: import("csstype").Property.ObjectFit | undefined;
     resultType: UploaderResultType;
     uploadIcon: string;
     deletable: boolean;

package/lib/uploader/UploaderPreviewItem.d.ts

@@ -1,6 +1,5 @@
 import { type PropType } from 'vue';
 import { type Numeric, type Interceptor } from '../utils';
-import { ImageFit } from '../image';
 import type { UploaderFileListItem } from './types';
 declare const _default: import("vue").DefineComponent<{
     name: (NumberConstructor | StringConstructor)[];
@@ -9,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     index: NumberConstructor;
-    imageFit: PropType<ImageFit>;
+    imageFit: PropType<import("csstype").Property.ObjectFit | undefined>;
     lazyLoad: BooleanConstructor;
     deletable: BooleanConstructor;
     reupload: BooleanConstructor;
@@ -22,7 +21,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     index: NumberConstructor;
-    imageFit: PropType<ImageFit>;
+    imageFit: PropType<import("csstype").Property.ObjectFit | undefined>;
     lazyLoad: BooleanConstructor;
     deletable: BooleanConstructor;
     reupload: BooleanConstructor;

package/lib/uploader/index.d.ts

@@ -18,8 +18,8 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         default: number;
     };
     imageFit: {
-        type: import("vue").PropType<import("..").ImageFit>;
-        default: import("..").ImageFit;
+        type: import("vue").PropType<import("csstype").Property.ObjectFit | undefined>;
+        default: import("csstype").Property.ObjectFit | undefined;
     };
     resultType: {
         type: import("vue").PropType<import("./types").UploaderResultType>;
@@ -79,8 +79,8 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
         default: number;
     };
     imageFit: {
-        type: import("vue").PropType<import("..").ImageFit>;
-        default: import("..").ImageFit;
+        type: import("vue").PropType<import("csstype").Property.ObjectFit | undefined>;
+        default: import("csstype").Property.ObjectFit | undefined;
     };
     resultType: {
         type: import("vue").PropType<import("./types").UploaderResultType>;
@@ -138,7 +138,7 @@ export declare const Uploader: import("../utils").WithInstall<import("vue").Defi
     readonly: boolean;
     lazyLoad: boolean;
     maxCount: string | number;
-    imageFit: import("..").ImageFit;
+    imageFit: import("csstype").Property.ObjectFit | undefined;
     resultType: import("./types").UploaderResultType;
     uploadIcon: string;
     deletable: boolean;

package/lib/utils/constant.d.ts

@@ -1,13 +1,13 @@
 import type { InjectionKey } from 'vue';
 import type { FormProvide } from '../form/types';
 export declare const BORDER = "van-hairline";
-export declare const BORDER_TOP: string;
-export declare const BORDER_LEFT: string;
-export declare const BORDER_RIGHT: string;
-export declare const BORDER_BOTTOM: string;
-export declare const BORDER_SURROUND: string;
-export declare const BORDER_TOP_BOTTOM: string;
-export declare const BORDER_UNSET_TOP_BOTTOM: string;
+export declare const BORDER_TOP = "van-hairline--top";
+export declare const BORDER_LEFT = "van-hairline--left";
+export declare const BORDER_RIGHT = "van-hairline--right";
+export declare const BORDER_BOTTOM = "van-hairline--bottom";
+export declare const BORDER_SURROUND = "van-hairline--surround";
+export declare const BORDER_TOP_BOTTOM = "van-hairline--top-bottom";
+export declare const BORDER_UNSET_TOP_BOTTOM = "van-hairline-unset--top-bottom";
 export declare const HAPTICS_FEEDBACK = "van-haptics-feedback";
 export declare const FORM_KEY: InjectionKey<FormProvide>;
 export declare const LONG_PRESS_START_TIME = 500;

package/lib/vant.cjs.js

@@ -2131,7 +2131,7 @@ var stdin_default$1G = vue.defineComponent({
         if (container) {
           const containerRect = use.useRect(container);
           const difference = containerRect.bottom - offset.value - state.height;
-          state.fixed = offset.value > rootRect.top && containerRect.bottom > 0;
+          state.fixed = offset.value >= rootRect.top && containerRect.bottom > 0;
           state.transform = difference < 0 ? difference : 0;
         } else {
           state.fixed = offset.value > rootRect.top;
@@ -4564,7 +4564,7 @@ function lockClick(lock) {
   }
 }
 const [name$1k, bem$1g] = createNamespace("toast");
-const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps$1 = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay", "zIndex"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -4584,7 +4584,8 @@ const toastProps = {
   overlayClass: unknownProp,
   overlayStyle: Object,
   closeOnClick: Boolean,
-  closeOnClickOverlay: Boolean
+  closeOnClickOverlay: Boolean,
+  zIndex: numericProp
 };
 var stdin_default$1u = vue.defineComponent({
   name: name$1k,
@@ -4674,7 +4675,7 @@ var stdin_default$1u = vue.defineComponent({
       "onClick": onClick,
       "onClosed": clearTimer,
       "onUpdate:show": updateShow
-    }, pick(props2, popupInheritProps)), {
+    }, pick(props2, popupInheritProps$1)), {
       default: () => [renderIcon(), renderMessage()]
     });
   }
@@ -10472,6 +10473,7 @@ const imagePreviewItemProps = {
   rootHeight: makeRequiredProp(Number),
   disableZoom: Boolean,
   doubleScale: Boolean,
+  closeOnClickImage: Boolean,
   closeOnClickOverlay: Boolean
 };
 var stdin_default$N = vue.defineComponent({
@@ -10636,7 +10638,12 @@ var stdin_default$N = vue.defineComponent({
     };
     const checkClose = (event) => {
       var _a;
-      const isClickOverlay = event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el);
+      const swipeItemEl = (_a = swipeItem.value) == null ? void 0 : _a.$el;
+      const imageEl = swipeItemEl.firstElementChild;
+      const isClickOverlay = event.target === swipeItemEl;
+      const isClickImage = imageEl == null ? void 0 : imageEl.contains(event.target);
+      if (!props2.closeOnClickImage && isClickImage)
+        return;
       if (!props2.closeOnClickOverlay && isClickOverlay)
         return;
       emit("close");
@@ -10796,6 +10803,7 @@ const imagePreviewProps = {
   startPosition: makeNumericProp(0),
   showIndicators: Boolean,
   closeOnPopstate: truthProp,
+  closeOnClickImage: truthProp,
   closeOnClickOverlay: truthProp,
   closeIconPosition: makeStringProp("top-right"),
   teleport: [String, Object]
@@ -10888,6 +10896,7 @@ var stdin_default$M = vue.defineComponent({
         "rootHeight": state.rootHeight,
         "disableZoom": state.disableZoom,
         "doubleScale": props2.doubleScale,
+        "closeOnClickImage": props2.closeOnClickImage,
         "closeOnClickOverlay": props2.closeOnClickOverlay,
         "onScale": emitScale,
         "onClose": emitClose,
@@ -11697,6 +11706,7 @@ var stdin_default$H = vue.defineComponent({
 });
 const NoticeBar = withInstall(stdin_default$H);
 const [name$y, bem$x] = createNamespace("notify");
+const popupInheritProps = ["lockScroll", "position", "show", "teleport", "zIndex"];
 const notifyProps = extend({}, popupSharedProps, {
   type: makeStringProp("danger"),
   color: String,
@@ -11715,20 +11725,16 @@ var stdin_default$G = vue.defineComponent({
     slots
   }) {
     const updateShow = (show) => emit("update:show", show);
-    return () => vue.createVNode(Popup, {
-      "show": props2.show,
+    return () => vue.createVNode(Popup, vue.mergeProps({
       "class": [bem$x([props2.type]), props2.className],
       "style": {
         color: props2.color,
         background: props2.background
       },
       "overlay": false,
-      "zIndex": props2.zIndex,
-      "position": props2.position,
       "duration": 0.2,
-      "lockScroll": props2.lockScroll,
       "onUpdate:show": updateShow
-    }, {
+    }, pick(props2, popupInheritProps)), {
       default: () => [slots.default ? slots.default() : props2.message]
     });
   }
@@ -14973,7 +14979,8 @@ var stdin_default$9 = vue.defineComponent({
   props: textEllipsisProps,
   emits: ["clickAction"],
   setup(props2, {
-    emit
+    emit,
+    slots
   }) {
     const text = vue.ref("");
     const expanded = vue.ref(false);
@@ -15081,10 +15088,15 @@ var stdin_default$9 = vue.defineComponent({
       toggle();
       emit("clickAction", event);
     };
-    const renderAction = () => vue.createVNode("span", {
-      "class": bem$3("action"),
-      "onClick": onClickAction
-    }, [actionText.value]);
+    const renderAction = () => {
+      const action = slots.action ? slots.action({
+        expanded: expanded.value
+      }) : actionText.value;
+      return vue.createVNode("span", {
+        "class": bem$3("action"),
+        "onClick": onClickAction
+      }, [action]);
+    };
     vue.onMounted(calcEllipsised);
     vue.watch([windowWidth, () => [props2.content, props2.rows, props2.position]], calcEllipsised);
     useExpose({
@@ -16756,7 +16768,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.8.2";
+const version = "4.8.3";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.js

@@ -2129,7 +2129,7 @@ var stdin_default$1G = defineComponent({
         if (container) {
           const containerRect = useRect(container);
           const difference = containerRect.bottom - offset.value - state.height;
-          state.fixed = offset.value > rootRect.top && containerRect.bottom > 0;
+          state.fixed = offset.value >= rootRect.top && containerRect.bottom > 0;
           state.transform = difference < 0 ? difference : 0;
         } else {
           state.fixed = offset.value > rootRect.top;
@@ -4562,7 +4562,7 @@ function lockClick(lock) {
   }
 }
 const [name$1k, bem$1g] = createNamespace("toast");
-const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps$1 = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay", "zIndex"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -4582,7 +4582,8 @@ const toastProps = {
   overlayClass: unknownProp,
   overlayStyle: Object,
   closeOnClick: Boolean,
-  closeOnClickOverlay: Boolean
+  closeOnClickOverlay: Boolean,
+  zIndex: numericProp
 };
 var stdin_default$1u = defineComponent({
   name: name$1k,
@@ -4672,7 +4673,7 @@ var stdin_default$1u = defineComponent({
       "onClick": onClick,
       "onClosed": clearTimer,
       "onUpdate:show": updateShow
-    }, pick(props2, popupInheritProps)), {
+    }, pick(props2, popupInheritProps$1)), {
       default: () => [renderIcon(), renderMessage()]
     });
   }
@@ -10470,6 +10471,7 @@ const imagePreviewItemProps = {
   rootHeight: makeRequiredProp(Number),
   disableZoom: Boolean,
   doubleScale: Boolean,
+  closeOnClickImage: Boolean,
   closeOnClickOverlay: Boolean
 };
 var stdin_default$N = defineComponent({
@@ -10634,7 +10636,12 @@ var stdin_default$N = defineComponent({
     };
     const checkClose = (event) => {
       var _a;
-      const isClickOverlay = event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el);
+      const swipeItemEl = (_a = swipeItem.value) == null ? void 0 : _a.$el;
+      const imageEl = swipeItemEl.firstElementChild;
+      const isClickOverlay = event.target === swipeItemEl;
+      const isClickImage = imageEl == null ? void 0 : imageEl.contains(event.target);
+      if (!props2.closeOnClickImage && isClickImage)
+        return;
       if (!props2.closeOnClickOverlay && isClickOverlay)
         return;
       emit("close");
@@ -10794,6 +10801,7 @@ const imagePreviewProps = {
   startPosition: makeNumericProp(0),
   showIndicators: Boolean,
   closeOnPopstate: truthProp,
+  closeOnClickImage: truthProp,
   closeOnClickOverlay: truthProp,
   closeIconPosition: makeStringProp("top-right"),
   teleport: [String, Object]
@@ -10886,6 +10894,7 @@ var stdin_default$M = defineComponent({
         "rootHeight": state.rootHeight,
         "disableZoom": state.disableZoom,
         "doubleScale": props2.doubleScale,
+        "closeOnClickImage": props2.closeOnClickImage,
         "closeOnClickOverlay": props2.closeOnClickOverlay,
         "onScale": emitScale,
         "onClose": emitClose,
@@ -11695,6 +11704,7 @@ var stdin_default$H = defineComponent({
 });
 const NoticeBar = withInstall(stdin_default$H);
 const [name$y, bem$x] = createNamespace("notify");
+const popupInheritProps = ["lockScroll", "position", "show", "teleport", "zIndex"];
 const notifyProps = extend({}, popupSharedProps, {
   type: makeStringProp("danger"),
   color: String,
@@ -11713,20 +11723,16 @@ var stdin_default$G = defineComponent({
     slots
   }) {
     const updateShow = (show) => emit("update:show", show);
-    return () => createVNode(Popup, {
-      "show": props2.show,
+    return () => createVNode(Popup, mergeProps({
       "class": [bem$x([props2.type]), props2.className],
       "style": {
         color: props2.color,
         background: props2.background
       },
       "overlay": false,
-      "zIndex": props2.zIndex,
-      "position": props2.position,
       "duration": 0.2,
-      "lockScroll": props2.lockScroll,
       "onUpdate:show": updateShow
-    }, {
+    }, pick(props2, popupInheritProps)), {
       default: () => [slots.default ? slots.default() : props2.message]
     });
   }
@@ -14971,7 +14977,8 @@ var stdin_default$9 = defineComponent({
   props: textEllipsisProps,
   emits: ["clickAction"],
   setup(props2, {
-    emit
+    emit,
+    slots
   }) {
     const text = ref("");
     const expanded = ref(false);
@@ -15079,10 +15086,15 @@ var stdin_default$9 = defineComponent({
       toggle();
       emit("clickAction", event);
     };
-    const renderAction = () => createVNode("span", {
-      "class": bem$3("action"),
-      "onClick": onClickAction
-    }, [actionText.value]);
+    const renderAction = () => {
+      const action = slots.action ? slots.action({
+        expanded: expanded.value
+      }) : actionText.value;
+      return createVNode("span", {
+        "class": bem$3("action"),
+        "onClick": onClickAction
+      }, [action]);
+    };
     onMounted(calcEllipsised);
     watch([windowWidth, () => [props2.content, props2.rows, props2.position]], calcEllipsised);
     useExpose({
@@ -16754,7 +16766,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.8.2";
+const version = "4.8.3";
 function install(app) {
   const components = [
     ActionBar,