vant 3.2.2 → 3.2.6

package/es/popover/Popover.js

@@ -2,7 +2,7 @@ import { mergeProps as _mergeProps, Fragment as _Fragment, createVNode as _creat
 import { ref, watch, nextTick, onMounted, onBeforeUnmount, defineComponent } from 'vue';
 import { createPopper, offsetModifier } from '@vant/popperjs'; // Utils
 
-import { pick, extend, truthProp, unknownProp, BORDER_BOTTOM, createNamespace } from '../utils'; // Composables
+import { pick, extend, truthProp, numericProp, unknownProp, BORDER_BOTTOM, makeStringProp, createNamespace, makeArrayProp } from '../utils'; // Composables
 
 import { useClickAway } from '@vant/use'; // Components
 
@@ -14,8 +14,13 @@ export default defineComponent({
   name,
   props: {
     show: Boolean,
+    theme: makeStringProp('light'),
     overlay: Boolean,
-    duration: [Number, String],
+    actions: makeArrayProp(),
+    trigger: makeStringProp('click'),
+    duration: numericProp,
+    showArrow: truthProp,
+    placement: makeStringProp('bottom'),
     iconPrefix: String,
     overlayClass: unknownProp,
     overlayStyle: Object,
@@ -26,29 +31,9 @@ export default defineComponent({
       type: Array,
       default: () => [0, 8]
     },
-    theme: {
-      type: String,
-      default: 'light'
-    },
-    trigger: {
-      type: String,
-      default: 'click'
-    },
-    actions: {
-      type: Array,
-      default: () => []
-    },
-    placement: {
-      type: String,
-      default: 'bottom'
-    },
     teleport: {
       type: [String, Object],
       default: 'body'
-    },
-    showArrow: {
-      type: Boolean,
-      default: true
     }
   },
   emits: ['select', 'touchstart', 'update:show'],
@@ -178,10 +163,9 @@ export default defineComponent({
       "position": '',
       "transition": "van-popover-zoom",
       "lockScroll": false,
-      "onTouchstart": onTouchstart
-    }, attrs, pick(props, popupProps), {
-      'onUpdate:show': updateShow
-    }), {
+      "onTouchstart": onTouchstart,
+      "onUpdate:show": updateShow
+    }, attrs, pick(props, popupProps)), {
       default: () => [props.showArrow && _createVNode("div", {
         "class": bem('arrow')
       }, null), _createVNode("div", {

package/es/popover/index.css

@@ -1 +1 @@
-:root{--van-popover-arrow-size:6px;--van-popover-border-radius:var(--van-border-radius-lg);--van-popover-action-width:128px;--van-popover-action-height:44px;--van-popover-action-font-size:var(--van-font-size-md);--van-popover-action-line-height:var(--van-line-height-md);--van-popover-action-icon-size:20px;--van-popover-light-text-color:var(--van-text-color);--van-popover-light-background-color:var(--van-white);--van-popover-light-action-disabled-text-color:var(--van-gray-5);--van-popover-dark-text-color:var(--van-white);--van-popover-dark-background-color:#4a4a4a;--van-popover-dark-action-disabled-text-color:var(--van-gray-6)}.van-popover{position:absolute;overflow:visible;background-color:transparent;transition:opacity .15s,transform .15s}.van-popover__wrapper{display:inline-block}.van-popover__arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;border-width:var(--van-popover-arrow-size)}.van-popover__content{overflow:hidden;border-radius:var(--van-popover-border-radius)}.van-popover__action{position:relative;display:flex;align-items:center;box-sizing:border-box;width:var(--van-popover-action-width);height:var(--van-popover-action-height);padding:0 var(--van-padding-md);font-size:var(--van-popover-action-font-size);line-height:var(--van-line-height-md);cursor:pointer}.van-popover__action:last-child .van-popover__action-text::after{display:none}.van-popover__action-text{display:flex;flex:1;align-items:center;justify-content:center;height:100%}.van-popover__action-icon{margin-right:var(--van-padding-xs);font-size:var(--van-popover-action-icon-size)}.van-popover__action--with-icon .van-popover__action-text{justify-content:flex-start}.van-popover[data-popper-placement^=top] .van-popover__arrow{bottom:0;border-top-color:currentColor;border-bottom-width:0;transform:translate(-50%,100%)}.van-popover[data-popper-placement=top]{transform-origin:50% 100%}.van-popover[data-popper-placement=top] .van-popover__arrow{left:50%}.van-popover[data-popper-placement=top-start]{transform-origin:0 100%}.van-popover[data-popper-placement=top-start] .van-popover__arrow{left:var(--van-padding-md)}.van-popover[data-popper-placement=top-end]{transform-origin:100% 100%}.van-popover[data-popper-placement=top-end] .van-popover__arrow{right:var(--van-padding-md)}.van-popover[data-popper-placement^=left] .van-popover__arrow{right:0;border-right-width:0;border-left-color:currentColor;transform:translate(100%,-50%)}.van-popover[data-popper-placement=left]{transform-origin:100% 50%}.van-popover[data-popper-placement=left] .van-popover__arrow{top:50%}.van-popover[data-popper-placement=left-start]{transform-origin:100% 0}.van-popover[data-popper-placement=left-start] .van-popover__arrow{top:var(--van-padding-md)}.van-popover[data-popper-placement=left-end]{transform-origin:100% 100%}.van-popover[data-popper-placement=left-end] .van-popover__arrow{bottom:var(--van-padding-md)}.van-popover[data-popper-placement^=right] .van-popover__arrow{left:0;border-right-color:currentColor;border-left-width:0;transform:translate(-100%,-50%)}.van-popover[data-popper-placement=right]{transform-origin:0 50%}.van-popover[data-popper-placement=right] .van-popover__arrow{top:50%}.van-popover[data-popper-placement=right-start]{transform-origin:0 0}.van-popover[data-popper-placement=right-start] .van-popover__arrow{top:var(--van-padding-md)}.van-popover[data-popper-placement=right-end]{transform-origin:0 100%}.van-popover[data-popper-placement=right-end] .van-popover__arrow{bottom:var(--van-padding-md)}.van-popover[data-popper-placement^=bottom] .van-popover__arrow{top:0;border-top-width:0;border-bottom-color:currentColor;transform:translate(-50%,-100%)}.van-popover[data-popper-placement=bottom]{transform-origin:50% 0}.van-popover[data-popper-placement=bottom] .van-popover__arrow{left:50%}.van-popover[data-popper-placement=bottom-start]{transform-origin:0 0}.van-popover[data-popper-placement=bottom-start] .van-popover__arrow{left:var(--van-padding-md)}.van-popover[data-popper-placement=bottom-end]{transform-origin:100% 0}.van-popover[data-popper-placement=bottom-end] .van-popover__arrow{right:var(--van-padding-md)}.van-popover--light{color:var(--van-popover-light-text-color)}.van-popover--light .van-popover__content{background-color:var(--van-popover-light-background-color);box-shadow:0 2px 12px rgba(50,50,51,.12)}.van-popover--light .van-popover__arrow{color:var(--van-popover-light-background-color)}.van-popover--light .van-popover__action:active{background-color:var(--van-active-color)}.van-popover--light .van-popover__action--disabled{color:var(--van-popover-light-action-disabled-text-color);cursor:not-allowed}.van-popover--light .van-popover__action--disabled:active{background-color:transparent}.van-popover--dark{color:var(--van-popover-dark-text-color)}.van-popover--dark .van-popover__content{background-color:var(--van-popover-dark-background-color)}.van-popover--dark .van-popover__arrow{color:var(--van-popover-dark-background-color)}.van-popover--dark .van-popover__action:active{background-color:rgba(0,0,0,.2)}.van-popover--dark .van-popover__action--disabled{color:var(--van-popover-dark-action-disabled-text-color)}.van-popover--dark .van-popover__action--disabled:active{background-color:transparent}.van-popover--dark .van-popover__action-text::after{border-color:var(--van-gray-7)}.van-popover-zoom-enter-from,.van-popover-zoom-leave-active{transform:scale(.8);opacity:0}.van-popover-zoom-enter-active{transition-timing-function:var(--van-animation-timing-function-enter)}.van-popover-zoom-leave-active{transition-timing-function:var(--van-animation-timing-function-leave)}
+:root{--van-popover-arrow-size:6px;--van-popover-border-radius:var(--van-border-radius-lg);--van-popover-action-width:128px;--van-popover-action-height:44px;--van-popover-action-font-size:var(--van-font-size-md);--van-popover-action-line-height:var(--van-line-height-md);--van-popover-action-icon-size:20px;--van-popover-light-text-color:var(--van-text-color);--van-popover-light-background-color:var(--van-white);--van-popover-light-action-disabled-text-color:var(--van-gray-5);--van-popover-dark-text-color:var(--van-white);--van-popover-dark-background-color:#4a4a4a;--van-popover-dark-action-disabled-text-color:var(--van-gray-6)}.van-popover{position:absolute;overflow:visible;background-color:transparent;transition:opacity .15s,transform .15s}.van-popover__wrapper{display:inline-block}.van-popover__arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;border-width:var(--van-popover-arrow-size)}.van-popover__content{overflow:hidden;border-radius:var(--van-popover-border-radius)}.van-popover__action{position:relative;display:flex;align-items:center;box-sizing:border-box;width:var(--van-popover-action-width);height:var(--van-popover-action-height);padding:0 var(--van-padding-md);font-size:var(--van-popover-action-font-size);line-height:var(--van-line-height-md);cursor:pointer}.van-popover__action:last-child .van-popover__action-text::after{display:none}.van-popover__action-text{display:flex;flex:1;align-items:center;justify-content:center;height:100%}.van-popover__action-icon{margin-right:var(--van-padding-xs);font-size:var(--van-popover-action-icon-size)}.van-popover__action--with-icon .van-popover__action-text{justify-content:flex-start}.van-popover[data-popper-placement^=top] .van-popover__arrow{bottom:0;border-top-color:currentColor;border-bottom-width:0;transform:translate(-50%,100%)}.van-popover[data-popper-placement=top]{transform-origin:50% 100%}.van-popover[data-popper-placement=top] .van-popover__arrow{left:50%}.van-popover[data-popper-placement=top-start]{transform-origin:0 100%}.van-popover[data-popper-placement=top-start] .van-popover__arrow{left:var(--van-padding-md)}.van-popover[data-popper-placement=top-end]{transform-origin:100% 100%}.van-popover[data-popper-placement=top-end] .van-popover__arrow{right:var(--van-padding-md)}.van-popover[data-popper-placement^=left] .van-popover__arrow{right:0;border-right-width:0;border-left-color:currentColor;transform:translate(100%,-50%)}.van-popover[data-popper-placement=left]{transform-origin:100% 50%}.van-popover[data-popper-placement=left] .van-popover__arrow{top:50%}.van-popover[data-popper-placement=left-start]{transform-origin:100% 0}.van-popover[data-popper-placement=left-start] .van-popover__arrow{top:var(--van-padding-md)}.van-popover[data-popper-placement=left-end]{transform-origin:100% 100%}.van-popover[data-popper-placement=left-end] .van-popover__arrow{bottom:var(--van-padding-md)}.van-popover[data-popper-placement^=right] .van-popover__arrow{left:0;border-right-color:currentColor;border-left-width:0;transform:translate(-100%,-50%)}.van-popover[data-popper-placement=right]{transform-origin:0 50%}.van-popover[data-popper-placement=right] .van-popover__arrow{top:50%}.van-popover[data-popper-placement=right-start]{transform-origin:0 0}.van-popover[data-popper-placement=right-start] .van-popover__arrow{top:var(--van-padding-md)}.van-popover[data-popper-placement=right-end]{transform-origin:0 100%}.van-popover[data-popper-placement=right-end] .van-popover__arrow{bottom:var(--van-padding-md)}.van-popover[data-popper-placement^=bottom] .van-popover__arrow{top:0;border-top-width:0;border-bottom-color:currentColor;transform:translate(-50%,-100%)}.van-popover[data-popper-placement=bottom]{transform-origin:50% 0}.van-popover[data-popper-placement=bottom] .van-popover__arrow{left:50%}.van-popover[data-popper-placement=bottom-start]{transform-origin:0 0}.van-popover[data-popper-placement=bottom-start] .van-popover__arrow{left:var(--van-padding-md)}.van-popover[data-popper-placement=bottom-end]{transform-origin:100% 0}.van-popover[data-popper-placement=bottom-end] .van-popover__arrow{right:var(--van-padding-md)}.van-popover--light{color:var(--van-popover-light-text-color)}.van-popover--light .van-popover__content{background:var(--van-popover-light-background-color);box-shadow:0 2px 12px rgba(50,50,51,.12)}.van-popover--light .van-popover__arrow{color:var(--van-popover-light-background-color)}.van-popover--light .van-popover__action:active{background-color:var(--van-active-color)}.van-popover--light .van-popover__action--disabled{color:var(--van-popover-light-action-disabled-text-color);cursor:not-allowed}.van-popover--light .van-popover__action--disabled:active{background-color:transparent}.van-popover--dark{color:var(--van-popover-dark-text-color)}.van-popover--dark .van-popover__content{background:var(--van-popover-dark-background-color)}.van-popover--dark .van-popover__arrow{color:var(--van-popover-dark-background-color)}.van-popover--dark .van-popover__action:active{background-color:rgba(0,0,0,.2)}.van-popover--dark .van-popover__action--disabled{color:var(--van-popover-dark-action-disabled-text-color)}.van-popover--dark .van-popover__action--disabled:active{background-color:transparent}.van-popover--dark .van-popover__action-text::after{border-color:var(--van-gray-7)}.van-popover-zoom-enter-from,.van-popover-zoom-leave-active{transform:scale(.8);opacity:0}.van-popover-zoom-enter-active{transition-timing-function:var(--van-animation-timing-function-enter)}.van-popover-zoom-leave-active{transition-timing-function:var(--van-animation-timing-function-leave)}

package/es/popover/index.d.ts

@@ -1,7 +1,27 @@
 export declare const Popover: import("../utils").WithInstall<import("vue").DefineComponent<{
     show: BooleanConstructor;
+    theme: {
+        type: import("vue").PropType<import("./Popover").PopoverTheme>;
+        default: import("./Popover").PopoverTheme;
+    };
     overlay: BooleanConstructor;
+    actions: {
+        type: import("vue").PropType<import("./Popover").PopoverAction[]>;
+        default: () => never[];
+    };
+    trigger: {
+        type: import("vue").PropType<import("./Popover").PopoverTrigger>;
+        default: import("./Popover").PopoverTrigger;
+    };
     duration: (NumberConstructor | StringConstructor)[];
+    showArrow: {
+        type: BooleanConstructor;
+        default: true;
+    };
+    placement: {
+        type: import("vue").PropType<import("./Popover").PopoverPlacement>;
+        default: import("./Popover").PopoverPlacement;
+    };
     iconPrefix: StringConstructor;
     overlayClass: import("vue").PropType<unknown>;
     overlayStyle: import("vue").PropType<import("vue").CSSProperties>;
@@ -21,34 +41,19 @@ export declare const Popover: import("../utils").WithInstall<import("vue").Defin
         type: import("vue").PropType<[number, number]>;
         default: () => number[];
     };
-    theme: {
-        type: import("vue").PropType<import("./Popover").PopoverTheme>;
-        default: string;
-    };
-    trigger: {
-        type: import("vue").PropType<import("./Popover").PopoverTrigger>;
-        default: string;
-    };
-    actions: {
-        type: import("vue").PropType<import("./Popover").PopoverAction[]>;
-        default: () => never[];
-    };
-    placement: {
-        type: import("vue").PropType<import("./Popover").PopoverPlacement>;
-        default: string;
-    };
     teleport: {
         type: import("vue").PropType<string | import("vue").RendererElement | null | undefined>;
         default: string;
     };
-    showArrow: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "touchstart" | "update:show")[], "select" | "touchstart" | "update:show", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
+    theme?: unknown;
     overlay?: unknown;
+    actions?: unknown;
+    trigger?: unknown;
     duration?: unknown;
+    showArrow?: unknown;
+    placement?: unknown;
     iconPrefix?: unknown;
     overlayClass?: unknown;
     overlayStyle?: unknown;
@@ -56,12 +61,7 @@ export declare const Popover: import("../utils").WithInstall<import("vue").Defin
     closeOnClickOverlay?: unknown;
     closeOnClickOutside?: unknown;
     offset?: unknown;
-    theme?: unknown;
-    trigger?: unknown;
-    actions?: unknown;
-    placement?: unknown;
     teleport?: unknown;
-    showArrow?: unknown;
 } & {
     offset: [number, number];
     overlay: boolean;
@@ -73,8 +73,8 @@ export declare const Popover: import("../utils").WithInstall<import("vue").Defin
     theme: import("./Popover").PopoverTheme;
     closeOnClickOutside: boolean;
     trigger: import("./Popover").PopoverTrigger;
-    placement: import("./Popover").PopoverPlacement;
     showArrow: boolean;
+    placement: import("./Popover").PopoverPlacement;
 } & {
     iconPrefix?: string | undefined;
     duration?: string | number | undefined;
@@ -95,8 +95,8 @@ export declare const Popover: import("../utils").WithInstall<import("vue").Defin
     theme: import("./Popover").PopoverTheme;
     closeOnClickOutside: boolean;
     trigger: import("./Popover").PopoverTrigger;
-    placement: import("./Popover").PopoverPlacement;
     showArrow: boolean;
+    placement: import("./Popover").PopoverPlacement;
 }>>;
 export default Popover;
 export type { PopoverTheme, PopoverAction, PopoverTrigger, PopoverPlacement, } from './Popover';

package/es/popover/index.less

@@ -214,7 +214,7 @@
     color: var(--van-popover-light-text-color);
 
     .van-popover__content {
-      background-color: var(--van-popover-light-background-color);
+      background: var(--van-popover-light-background-color);
       box-shadow: 0 2px 12px rgba(50, 50, 51, 0.12);
     }
 
@@ -242,7 +242,7 @@
     color: var(--van-popover-dark-text-color);
 
     .van-popover__content {
-      background-color: var(--van-popover-dark-background-color);
+      background: var(--van-popover-dark-background-color);
     }
 
     .van-popover__arrow {

package/es/popup/Popup.d.ts

@@ -1,4 +1,4 @@
-import { PropType, CSSProperties } from 'vue';
+import { CSSProperties } from 'vue';
 export declare type PopupPosition = 'top' | 'left' | 'bottom' | 'right' | 'center' | '';
 export declare type PopupCloseIconPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 declare const _default: import("vue").DefineComponent<{
@@ -9,7 +9,7 @@ declare const _default: import("vue").DefineComponent<{
         default: true;
     };
     duration: (NumberConstructor | StringConstructor)[];
-    teleport: PropType<string | import("vue").RendererElement | null | undefined>;
+    teleport: import("vue").PropType<string | import("vue").RendererElement | null | undefined>;
     lockScroll: {
         type: BooleanConstructor;
         default: true;
@@ -18,9 +18,9 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    beforeClose: PropType<import("../utils").Interceptor>;
-    overlayStyle: PropType<CSSProperties>;
-    overlayClass: PropType<unknown>;
+    beforeClose: import("vue").PropType<import("../utils").Interceptor>;
+    overlayStyle: import("vue").PropType<CSSProperties>;
+    overlayClass: import("vue").PropType<unknown>;
     transitionAppear: BooleanConstructor;
     closeOnClickOverlay: {
         type: BooleanConstructor;
@@ -28,23 +28,23 @@ declare const _default: import("vue").DefineComponent<{
     };
 } & {
     round: BooleanConstructor;
-    closeable: BooleanConstructor;
-    transition: StringConstructor;
-    iconPrefix: StringConstructor;
-    closeOnPopstate: BooleanConstructor;
-    safeAreaInsetBottom: BooleanConstructor;
     position: {
-        type: PropType<PopupPosition>;
-        default: string;
+        type: import("vue").PropType<PopupPosition>;
+        default: PopupPosition;
     };
     closeIcon: {
-        type: StringConstructor;
+        type: import("vue").PropType<string>;
         default: string;
     };
+    closeable: BooleanConstructor;
+    transition: StringConstructor;
+    iconPrefix: StringConstructor;
+    closeOnPopstate: BooleanConstructor;
     closeIconPosition: {
-        type: PropType<PopupCloseIconPosition>;
-        default: string;
+        type: import("vue").PropType<PopupCloseIconPosition>;
+        default: PopupCloseIconPosition;
     };
+    safeAreaInsetBottom: BooleanConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("open" | "click" | "close" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon")[], "open" | "click" | "close" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
     zIndex?: unknown;
@@ -59,14 +59,14 @@ declare const _default: import("vue").DefineComponent<{
     transitionAppear?: unknown;
     closeOnClickOverlay?: unknown;
     round?: unknown;
+    position?: unknown;
+    closeIcon?: unknown;
     closeable?: unknown;
     transition?: unknown;
     iconPrefix?: unknown;
     closeOnPopstate?: unknown;
-    safeAreaInsetBottom?: unknown;
-    position?: unknown;
-    closeIcon?: unknown;
     closeIconPosition?: unknown;
+    safeAreaInsetBottom?: unknown;
 } & {
     round: boolean;
     safeAreaInsetBottom: boolean;
@@ -76,10 +76,10 @@ declare const _default: import("vue").DefineComponent<{
     lazyRender: boolean;
     transitionAppear: boolean;
     closeOnClickOverlay: boolean;
-    closeable: boolean;
-    closeOnPopstate: boolean;
     position: PopupPosition;
     closeIcon: string;
+    closeable: boolean;
+    closeOnPopstate: boolean;
     closeIconPosition: PopupCloseIconPosition;
 } & {
     iconPrefix?: string | undefined;
@@ -108,10 +108,10 @@ declare const _default: import("vue").DefineComponent<{
     lazyRender: boolean;
     transitionAppear: boolean;
     closeOnClickOverlay: boolean;
-    closeable: boolean;
-    closeOnPopstate: boolean;
     position: PopupPosition;
     closeIcon: string;
+    closeable: boolean;
+    closeOnPopstate: boolean;
     closeIconPosition: PopupCloseIconPosition;
 }>;
 export default _default;

package/es/popup/Popup.js

@@ -2,7 +2,7 @@ import { Fragment as _Fragment, withDirectives as _withDirectives, mergeProps as
 import { ref, watch, provide, Teleport, computed, onMounted, Transition, onActivated, onDeactivated, defineComponent } from 'vue'; // Utils
 
 import { popupSharedProps } from './shared';
-import { extend, isDef, callInterceptor, createNamespace } from '../utils'; // Composables
+import { isDef, extend, makeStringProp, callInterceptor, createNamespace } from '../utils'; // Composables
 
 import { useEventListener } from '@vant/use';
 import { useExpose } from '../composables/use-expose';
@@ -19,23 +19,14 @@ export default defineComponent({
   inheritAttrs: false,
   props: extend({}, popupSharedProps, {
     round: Boolean,
+    position: makeStringProp('center'),
+    closeIcon: makeStringProp('cross'),
     closeable: Boolean,
     transition: String,
     iconPrefix: String,
     closeOnPopstate: Boolean,
-    safeAreaInsetBottom: Boolean,
-    position: {
-      type: String,
-      default: 'center'
-    },
-    closeIcon: {
-      type: String,
-      default: 'cross'
-    },
-    closeIconPosition: {
-      type: String,
-      default: 'top-right'
-    }
+    closeIconPosition: makeStringProp('top-right'),
+    safeAreaInsetBottom: Boolean
   }),
   emits: ['open', 'close', 'click', 'opened', 'closed', 'update:show', 'click-overlay', 'click-close-icon'],
 
@@ -76,9 +67,7 @@ export default defineComponent({
 
     var close = () => {
       if (opened) {
-        callInterceptor({
-          interceptor: props.beforeClose,
-
+        callInterceptor(props.beforeClose, {
           done() {
             opened = false;
             emit('close');
@@ -168,7 +157,7 @@ export default defineComponent({
         "onAfterEnter": onOpened,
         "onAfterLeave": onClosed
       }, {
-        default: () => [renderPopup()]
+        default: renderPopup
       });
     };
 

package/es/popup/index.css

@@ -1 +1 @@
-:root{--van-popup-background-color:var(--van-white);--van-popup-transition:transform var(--van-animation-duration-base);--van-popup-round-border-radius:16px;--van-popup-close-icon-size:22px;--van-popup-close-icon-color:var(--van-gray-5);--van-popup-close-icon-active-color:var(--van-gray-6);--van-popup-close-icon-margin:16px;--van-popup-close-icon-z-index:1}.van-overflow-hidden{overflow:hidden!important}.van-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:var(--van-popup-background-color);transition:var(--van-popup-transition);-webkit-overflow-scrolling:touch}.van-popup--center{top:50%;left:50%;transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:var(--van-popup-round-border-radius)}.van-popup--top{top:0;left:0;width:100%}.van-popup--top.van-popup--round{border-radius:0 0 var(--van-popup-round-border-radius) var(--van-popup-round-border-radius)}.van-popup--right{top:50%;right:0;transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:var(--van-popup-round-border-radius) 0 0 var(--van-popup-round-border-radius)}.van-popup--bottom{bottom:0;left:0;width:100%}.van-popup--bottom.van-popup--round{border-radius:var(--van-popup-round-border-radius) var(--van-popup-round-border-radius) 0 0}.van-popup--left{top:50%;left:0;transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 var(--van-popup-round-border-radius) var(--van-popup-round-border-radius) 0}.van-popup-slide-bottom-enter-active,.van-popup-slide-left-enter-active,.van-popup-slide-right-enter-active,.van-popup-slide-top-enter-active{transition-timing-function:var(--van-animation-timing-function-enter)}.van-popup-slide-bottom-leave-active,.van-popup-slide-left-leave-active,.van-popup-slide-right-leave-active,.van-popup-slide-top-leave-active{transition-timing-function:var(--van-animation-timing-function-leave)}.van-popup-slide-top-enter-from,.van-popup-slide-top-leave-active{transform:translate3d(0,-100%,0)}.van-popup-slide-right-enter-from,.van-popup-slide-right-leave-active{transform:translate3d(100%,-50%,0)}.van-popup-slide-bottom-enter-from,.van-popup-slide-bottom-leave-active{transform:translate3d(0,100%,0)}.van-popup-slide-left-enter-from,.van-popup-slide-left-leave-active{transform:translate3d(-100%,-50%,0)}.van-popup__close-icon{position:absolute;z-index:var(--van-popup-close-icon-z-index);color:var(--van-popup-close-icon-color);font-size:var(--van-popup-close-icon-size);cursor:pointer}.van-popup__close-icon:active{color:var(--van-popup-close-icon-active-color)}.van-popup__close-icon--top-left{top:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--top-right{top:var(--van-popup-close-icon-margin);right:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-left{bottom:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-right{right:var(--van-popup-close-icon-margin);bottom:var(--van-popup-close-icon-margin)}
+:root{--van-popup-background-color:var(--van-white);--van-popup-transition:transform var(--van-animation-duration-base);--van-popup-round-border-radius:16px;--van-popup-close-icon-size:22px;--van-popup-close-icon-color:var(--van-gray-5);--van-popup-close-icon-active-color:var(--van-gray-6);--van-popup-close-icon-margin:16px;--van-popup-close-icon-z-index:1}.van-overflow-hidden{overflow:hidden!important}.van-popup{position:fixed;max-height:100%;overflow-y:auto;background:var(--van-popup-background-color);transition:var(--van-popup-transition);-webkit-overflow-scrolling:touch}.van-popup--center{top:50%;left:50%;transform:translate3d(-50%,-50%,0)}.van-popup--center.van-popup--round{border-radius:var(--van-popup-round-border-radius)}.van-popup--top{top:0;left:0;width:100%}.van-popup--top.van-popup--round{border-radius:0 0 var(--van-popup-round-border-radius) var(--van-popup-round-border-radius)}.van-popup--right{top:50%;right:0;transform:translate3d(0,-50%,0)}.van-popup--right.van-popup--round{border-radius:var(--van-popup-round-border-radius) 0 0 var(--van-popup-round-border-radius)}.van-popup--bottom{bottom:0;left:0;width:100%}.van-popup--bottom.van-popup--round{border-radius:var(--van-popup-round-border-radius) var(--van-popup-round-border-radius) 0 0}.van-popup--left{top:50%;left:0;transform:translate3d(0,-50%,0)}.van-popup--left.van-popup--round{border-radius:0 var(--van-popup-round-border-radius) var(--van-popup-round-border-radius) 0}.van-popup-slide-bottom-enter-active,.van-popup-slide-left-enter-active,.van-popup-slide-right-enter-active,.van-popup-slide-top-enter-active{transition-timing-function:var(--van-animation-timing-function-enter)}.van-popup-slide-bottom-leave-active,.van-popup-slide-left-leave-active,.van-popup-slide-right-leave-active,.van-popup-slide-top-leave-active{transition-timing-function:var(--van-animation-timing-function-leave)}.van-popup-slide-top-enter-from,.van-popup-slide-top-leave-active{transform:translate3d(0,-100%,0)}.van-popup-slide-right-enter-from,.van-popup-slide-right-leave-active{transform:translate3d(100%,-50%,0)}.van-popup-slide-bottom-enter-from,.van-popup-slide-bottom-leave-active{transform:translate3d(0,100%,0)}.van-popup-slide-left-enter-from,.van-popup-slide-left-leave-active{transform:translate3d(-100%,-50%,0)}.van-popup__close-icon{position:absolute;z-index:var(--van-popup-close-icon-z-index);color:var(--van-popup-close-icon-color);font-size:var(--van-popup-close-icon-size);cursor:pointer}.van-popup__close-icon:active{color:var(--van-popup-close-icon-active-color)}.van-popup__close-icon--top-left{top:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--top-right{top:var(--van-popup-close-icon-margin);right:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-left{bottom:var(--van-popup-close-icon-margin);left:var(--van-popup-close-icon-margin)}.van-popup__close-icon--bottom-right{right:var(--van-popup-close-icon-margin);bottom:var(--van-popup-close-icon-margin)}

package/es/popup/index.d.ts

@@ -25,23 +25,23 @@ export declare const Popup: import("../utils").WithInstall<import("vue").DefineC
     };
 } & {
     round: BooleanConstructor;
-    closeable: BooleanConstructor;
-    transition: StringConstructor;
-    iconPrefix: StringConstructor;
-    closeOnPopstate: BooleanConstructor;
-    safeAreaInsetBottom: BooleanConstructor;
     position: {
         type: import("vue").PropType<import("./Popup").PopupPosition>;
-        default: string;
+        default: import("./Popup").PopupPosition;
     };
     closeIcon: {
-        type: StringConstructor;
+        type: import("vue").PropType<string>;
         default: string;
     };
+    closeable: BooleanConstructor;
+    transition: StringConstructor;
+    iconPrefix: StringConstructor;
+    closeOnPopstate: BooleanConstructor;
     closeIconPosition: {
         type: import("vue").PropType<import("./Popup").PopupCloseIconPosition>;
-        default: string;
+        default: import("./Popup").PopupCloseIconPosition;
     };
+    safeAreaInsetBottom: BooleanConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("open" | "click" | "close" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon")[], "open" | "click" | "close" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
     zIndex?: unknown;
@@ -56,14 +56,14 @@ export declare const Popup: import("../utils").WithInstall<import("vue").DefineC
     transitionAppear?: unknown;
     closeOnClickOverlay?: unknown;
     round?: unknown;
+    position?: unknown;
+    closeIcon?: unknown;
     closeable?: unknown;
     transition?: unknown;
     iconPrefix?: unknown;
     closeOnPopstate?: unknown;
-    safeAreaInsetBottom?: unknown;
-    position?: unknown;
-    closeIcon?: unknown;
     closeIconPosition?: unknown;
+    safeAreaInsetBottom?: unknown;
 } & {
     round: boolean;
     safeAreaInsetBottom: boolean;
@@ -73,10 +73,10 @@ export declare const Popup: import("../utils").WithInstall<import("vue").DefineC
     lazyRender: boolean;
     transitionAppear: boolean;
     closeOnClickOverlay: boolean;
-    closeable: boolean;
-    closeOnPopstate: boolean;
     position: import("./Popup").PopupPosition;
     closeIcon: string;
+    closeable: boolean;
+    closeOnPopstate: boolean;
     closeIconPosition: import("./Popup").PopupCloseIconPosition;
 } & {
     iconPrefix?: string | undefined;
@@ -105,10 +105,10 @@ export declare const Popup: import("../utils").WithInstall<import("vue").DefineC
     lazyRender: boolean;
     transitionAppear: boolean;
     closeOnClickOverlay: boolean;
-    closeable: boolean;
-    closeOnPopstate: boolean;
     position: import("./Popup").PopupPosition;
     closeIcon: string;
+    closeable: boolean;
+    closeOnPopstate: boolean;
     closeIconPosition: import("./Popup").PopupCloseIconPosition;
 }>>;
 export default Popup;

package/es/popup/index.less

@@ -20,7 +20,7 @@
     position: fixed;
     max-height: 100%;
     overflow-y: auto;
-    background-color: var(--van-popup-background-color);
+    background: var(--van-popup-background-color);
     transition: var(--van-popup-transition);
     -webkit-overflow-scrolling: touch;
 

package/es/popup/shared.js

@@ -1,13 +1,13 @@
-import { truthProp, unknownProp } from '../utils';
+import { truthProp, unknownProp, numericProp } from '../utils';
 export var popupSharedProps = {
   // whether to show popup
   show: Boolean,
   // z-index
-  zIndex: [Number, String],
+  zIndex: numericProp,
   // whether to show overlay
   overlay: truthProp,
   // transition duration
-  duration: [Number, String],
+  duration: numericProp,
   // teleport
   teleport: [String, Object],
   // prevent body scroll

package/es/progress/Progress.d.ts

@@ -56,7 +56,7 @@ declare const _default: import("vue").DefineComponent<{
     pivotText?: string | undefined;
     pivotColor?: string | undefined;
     trackColor?: string | undefined;
-}> & {}, {
+}>, {
     inactive: boolean;
     showPivot: boolean;
     percentage: string | number;

package/es/progress/Progress.js

@@ -1,6 +1,6 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, defineComponent } from 'vue';
-import { truthProp, createNamespace, addUnit } from '../utils';
+import { addUnit, truthProp, numericProp, createNamespace } from '../utils';
 var [name, bem] = createNamespace('progress');
 var props = {
   color: String,
@@ -10,9 +10,9 @@ var props = {
   showPivot: truthProp,
   pivotColor: String,
   trackColor: String,
-  strokeWidth: [Number, String],
+  strokeWidth: numericProp,
   percentage: {
-    type: [Number, String],
+    type: numericProp,
     default: 0,
     validator: value => value >= 0 && value <= 100
   }
@@ -22,7 +22,7 @@ export default defineComponent({
   props,
 
   setup(props) {
-    var background = computed(() => props.inactive ? '#cacaca' : props.color);
+    var background = computed(() => props.inactive ? undefined : props.color);
 
     var renderPivot = () => {
       var {
@@ -42,7 +42,9 @@ export default defineComponent({
         };
         return _createVNode("span", {
           "style": style,
-          "class": bem('pivot')
+          "class": bem('pivot', {
+            inactive: props.inactive
+          })
         }, [text]);
       }
     };
@@ -65,7 +67,9 @@ export default defineComponent({
         "class": bem(),
         "style": rootStyle
       }, [_createVNode("span", {
-        "class": bem('portion'),
+        "class": bem('portion', {
+          inactive: props.inactive
+        }),
         "style": portionStyle
       }, null), renderPivot()]);
     };

package/es/progress/index.css

@@ -1 +1 @@
-:root{--van-progress-height:4px;--van-progress-color:var(--van-primary-color);--van-progress-background-color:var(--van-gray-3);--van-progress-pivot-padding:0 5px;--van-progress-pivot-text-color:var(--van-white);--van-progress-pivot-font-size:var(--van-font-size-xs);--van-progress-pivot-line-height:1.6;--van-progress-pivot-background-color:var(--van-primary-color)}.van-progress{position:relative;height:var(--van-progress-height);background:var(--van-progress-background-color);border-radius:var(--van-progress-height)}.van-progress__portion{position:absolute;left:0;width:100%;height:100%;background:var(--van-progress-color);border-radius:inherit;transform-origin:0;transition:all var(--van-animation-duration-base) var(--van-animation-timing-function-enter)}.van-progress__pivot{position:absolute;top:50%;box-sizing:border-box;min-width:3.6em;padding:var(--van-progress-pivot-padding);color:var(--van-progress-pivot-text-color);font-size:var(--van-progress-pivot-font-size);line-height:var(--van-progress-pivot-line-height);text-align:center;word-break:keep-all;background-color:var(--van-progress-pivot-background-color);border-radius:1em;transition:all var(--van-animation-duration-base) var(--van-animation-timing-function-enter)}
+:root{--van-progress-height:4px;--van-progress-color:var(--van-primary-color);--van-progress-inactive-color:var(--van-gray-5);--van-progress-background-color:var(--van-gray-3);--van-progress-pivot-padding:0 5px;--van-progress-pivot-text-color:var(--van-white);--van-progress-pivot-font-size:var(--van-font-size-xs);--van-progress-pivot-line-height:1.6;--van-progress-pivot-background-color:var(--van-primary-color)}.van-progress{position:relative;height:var(--van-progress-height);background:var(--van-progress-background-color);border-radius:var(--van-progress-height)}.van-progress__portion{position:absolute;left:0;width:100%;height:100%;background:var(--van-progress-color);border-radius:inherit;transform-origin:0;transition:all var(--van-animation-duration-base) var(--van-animation-timing-function-enter)}.van-progress__portion--inactive{background:var(--van-progress-inactive-color)}.van-progress__pivot{position:absolute;top:50%;box-sizing:border-box;min-width:3.6em;padding:var(--van-progress-pivot-padding);color:var(--van-progress-pivot-text-color);font-size:var(--van-progress-pivot-font-size);line-height:var(--van-progress-pivot-line-height);text-align:center;word-break:keep-all;background:var(--van-progress-pivot-background-color);border-radius:1em;transition:all var(--van-animation-duration-base) var(--van-animation-timing-function-enter)}.van-progress__pivot--inactive{background:var(--van-progress-inactive-color)}

package/es/progress/index.d.ts

@@ -1,3 +1,4 @@
+import { ProgressProps } from './Progress';
 export declare const Progress: import("../utils").WithInstall<import("vue").DefineComponent<{
     color: StringConstructor;
     inactive: BooleanConstructor;
@@ -36,10 +37,11 @@ export declare const Progress: import("../utils").WithInstall<import("vue").Defi
     pivotText?: string | undefined;
     pivotColor?: string | undefined;
     trackColor?: string | undefined;
-}> & {}, {
+}>, {
     inactive: boolean;
     showPivot: boolean;
     percentage: string | number;
 }>>;
 export default Progress;
+export type { ProgressProps };
 export type { ProgressInstance } from './types';

package/es/progress/index.less

@@ -3,6 +3,7 @@
 :root {
   --van-progress-height: @progress-height;
   --van-progress-color: @progress-color;
+  --van-progress-inactive-color: @progress-inactive-color;
   --van-progress-background-color: @progress-background-color;
   --van-progress-pivot-padding: @progress-pivot-padding;
   --van-progress-pivot-text-color: @progress-pivot-text-color;
@@ -27,6 +28,10 @@
     transform-origin: 0;
     transition: all var(--van-animation-duration-base)
       var(--van-animation-timing-function-enter);
+
+    &--inactive {
+      background: var(--van-progress-inactive-color);
+    }
   }
 
   &__pivot {
@@ -40,9 +45,13 @@
     line-height: var(--van-progress-pivot-line-height);
     text-align: center;
     word-break: keep-all;
-    background-color: var(--van-progress-pivot-background-color);
+    background: var(--van-progress-pivot-background-color);
     border-radius: 1em;
     transition: all var(--van-animation-duration-base)
       var(--van-animation-timing-function-enter);
+
+    &--inactive {
+      background: var(--van-progress-inactive-color);
+    }
   }
 }

package/es/progress/var.less

@@ -2,6 +2,7 @@
 
 @progress-height: 4px;
 @progress-color: var(--van-primary-color);
+@progress-inactive-color: var(--van-gray-5);
 @progress-background-color: var(--van-gray-3);
 @progress-pivot-padding: 0 5px;
 @progress-pivot-text-color: var(--van-white);