vant 3.2.4 → 3.2.8

package/lib/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("./types").PopoverTheme>;
+        default: import("./types").PopoverTheme;
+    };
     overlay: BooleanConstructor;
+    actions: {
+        type: import("vue").PropType<import("./types").PopoverAction[]>;
+        default: () => never[];
+    };
+    trigger: {
+        type: import("vue").PropType<import("./types").PopoverTrigger>;
+        default: import("./types").PopoverTrigger;
+    };
     duration: (NumberConstructor | StringConstructor)[];
+    showArrow: {
+        type: BooleanConstructor;
+        default: true;
+    };
+    placement: {
+        type: import("vue").PropType<import("./types").PopoverPlacement>;
+        default: import("./types").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,25 +61,20 @@ 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;
     show: boolean;
     teleport: string | import("vue").RendererElement | null | undefined;
     closeOnClickOverlay: boolean;
-    actions: import("./Popover").PopoverAction[];
+    actions: import("./types").PopoverAction[];
     closeOnClickAction: boolean;
-    theme: import("./Popover").PopoverTheme;
+    theme: import("./types").PopoverTheme;
     closeOnClickOutside: boolean;
-    trigger: import("./Popover").PopoverTrigger;
-    placement: import("./Popover").PopoverPlacement;
+    trigger: import("./types").PopoverTrigger;
     showArrow: boolean;
+    placement: import("./types").PopoverPlacement;
 } & {
     iconPrefix?: string | undefined;
     duration?: string | number | undefined;
@@ -90,13 +90,14 @@ export declare const Popover: import("../utils").WithInstall<import("vue").Defin
     show: boolean;
     teleport: string | import("vue").RendererElement | null | undefined;
     closeOnClickOverlay: boolean;
-    actions: import("./Popover").PopoverAction[];
+    actions: import("./types").PopoverAction[];
     closeOnClickAction: boolean;
-    theme: import("./Popover").PopoverTheme;
+    theme: import("./types").PopoverTheme;
     closeOnClickOutside: boolean;
-    trigger: import("./Popover").PopoverTrigger;
-    placement: import("./Popover").PopoverPlacement;
+    trigger: import("./types").PopoverTrigger;
     showArrow: boolean;
+    placement: import("./types").PopoverPlacement;
 }>>;
 export default Popover;
-export type { PopoverTheme, PopoverAction, PopoverTrigger, PopoverPlacement, } from './Popover';
+export type { PopoverProps } from './Popover';
+export type { PopoverTheme, PopoverAction, PopoverTrigger, PopoverPlacement, } from './types';

package/lib/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/lib/popover/types.d.ts

@@ -0,0 +1,11 @@
+export declare type PopoverTheme = 'light' | 'dark';
+export declare type PopoverTrigger = 'manual' | 'click';
+export declare type PopoverPlacement = 'top' | 'top-start' | 'top-end' | 'left' | 'left-start' | 'left-end' | 'right' | 'right-start' | 'right-end' | 'bottom' | 'bottom-start' | 'bottom-end';
+export declare type PopoverAction = {
+    text: string;
+    icon?: string;
+    color?: string;
+    disabled?: boolean;
+    className?: string;
+    [key: PropertyKey]: any;
+};

package/lib/popover/types.js

@@ -0,0 +1,3 @@
+"use strict";
+
+exports.__esModule = true;

package/lib/popover/var.less

@@ -8,8 +8,8 @@
 @popover-action-line-height: var(--van-line-height-md);
 @popover-action-icon-size: 20px;
 @popover-light-text-color: var(--van-text-color);
-@popover-light-background-color: var(--van-white);
-@popover-light-action-disabled-text-color: var(--van-gray-5);
+@popover-light-background-color: var(--van-background-color-light);
+@popover-light-action-disabled-text-color: var(--van-text-color-3);
 @popover-dark-text-color: var(--van-white);
 @popover-dark-background-color: #4a4a4a;
-@popover-dark-action-disabled-text-color: var(--van-gray-6);
+@popover-dark-action-disabled-text-color: var(--van-text-color-2);

package/lib/popup/Popup.d.ts

@@ -1,7 +1,7 @@
-import { PropType, CSSProperties } from 'vue';
+import { CSSProperties, ExtractPropTypes } 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<{
+declare const popupProps: {
     show: BooleanConstructor;
     zIndex: (NumberConstructor | StringConstructor)[];
     overlay: {
@@ -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,69 @@ declare const _default: import("vue").DefineComponent<{
     };
 } & {
     round: BooleanConstructor;
+    position: {
+        type: import("vue").PropType<PopupPosition>;
+        default: PopupPosition;
+    };
+    closeIcon: {
+        type: import("vue").PropType<string>;
+        default: string;
+    };
     closeable: BooleanConstructor;
     transition: StringConstructor;
     iconPrefix: StringConstructor;
     closeOnPopstate: BooleanConstructor;
+    closeIconPosition: {
+        type: import("vue").PropType<PopupCloseIconPosition>;
+        default: PopupCloseIconPosition;
+    };
     safeAreaInsetBottom: BooleanConstructor;
+};
+export declare type PopupProps = ExtractPropTypes<typeof popupProps>;
+declare const _default: import("vue").DefineComponent<{
+    show: BooleanConstructor;
+    zIndex: (NumberConstructor | StringConstructor)[];
+    overlay: {
+        type: BooleanConstructor;
+        default: true;
+    };
+    duration: (NumberConstructor | StringConstructor)[];
+    teleport: import("vue").PropType<string | import("vue").RendererElement | null | undefined>;
+    lockScroll: {
+        type: BooleanConstructor;
+        default: true;
+    };
+    lazyRender: {
+        type: BooleanConstructor;
+        default: true;
+    };
+    beforeClose: import("vue").PropType<import("../utils").Interceptor>;
+    overlayStyle: import("vue").PropType<CSSProperties>;
+    overlayClass: import("vue").PropType<unknown>;
+    transitionAppear: BooleanConstructor;
+    closeOnClickOverlay: {
+        type: BooleanConstructor;
+        default: true;
+    };
+} & {
+    round: 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 +105,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 +122,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 +154,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/lib/popup/Popup.js

@@ -26,39 +26,32 @@ var _overlay = require("../overlay");
 // Utils
 // Composables
 // Components
+var popupProps = (0, _utils.extend)({}, _shared.popupSharedProps, {
+  round: Boolean,
+  position: (0, _utils.makeStringProp)('center'),
+  closeIcon: (0, _utils.makeStringProp)('cross'),
+  closeable: Boolean,
+  transition: String,
+  iconPrefix: String,
+  closeOnPopstate: Boolean,
+  closeIconPosition: (0, _utils.makeStringProp)('top-right'),
+  safeAreaInsetBottom: Boolean
+});
 var [name, bem] = (0, _utils.createNamespace)('popup');
 var globalZIndex = 2000;
 
 var _default = (0, _vue.defineComponent)({
   name,
   inheritAttrs: false,
-  props: (0, _utils.extend)({}, _shared.popupSharedProps, {
-    round: Boolean,
-    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'
-    }
-  }),
+  props: popupProps,
   emits: ['open', 'close', 'click', 'opened', 'closed', 'update:show', 'click-overlay', 'click-close-icon'],
 
-  setup(props, {
-    emit,
-    attrs,
-    slots
-  }) {
+  setup(props, _ref) {
+    var {
+      emit,
+      attrs,
+      slots
+    } = _ref;
     var opened;
     var shouldReopen;
     var zIndex = (0, _vue.ref)();
@@ -91,9 +84,7 @@ var _default = (0, _vue.defineComponent)({
 
     var close = () => {
       if (opened) {
-        (0, _utils.callInterceptor)({
-          interceptor: props.beforeClose,
-
+        (0, _utils.callInterceptor)(props.beforeClose, {
           done() {
             opened = false;
             emit('close');
@@ -138,7 +129,7 @@ var _default = (0, _vue.defineComponent)({
           "role": "button",
           "tabindex": 0,
           "name": props.closeIcon,
-          "class": bem('close-icon', props.closeIconPosition),
+          "class": [bem('close-icon', props.closeIconPosition), _utils.HAPTICS_FEEDBACK],
           "classPrefix": props.iconPrefix,
           "onClick": onClickCloseIcon
         }, null);
@@ -183,7 +174,7 @@ var _default = (0, _vue.defineComponent)({
         "onAfterEnter": onOpened,
         "onAfterLeave": onClosed
       }, {
-        default: () => [renderPopup()]
+        default: renderPopup
       });
     };
 

package/lib/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-background-color-light);--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-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--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/lib/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,11 +105,11 @@ 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;
-export type { PopupPosition, PopupCloseIconPosition } from './Popup';
+export type { PopupProps, PopupPosition, PopupCloseIconPosition, } from './Popup';

package/lib/popup/index.less

@@ -6,7 +6,6 @@
   --van-popup-round-border-radius: @popup-round-border-radius;
   --van-popup-close-icon-size: @popup-close-icon-size;
   --van-popup-close-icon-color: @popup-close-icon-color;
-  --van-popup-close-icon-active-color: @popup-close-icon-active-color;
   --van-popup-close-icon-margin: @popup-close-icon-margin;
   --van-popup-close-icon-z-index: @popup-close-icon-z-index;
 }
@@ -20,7 +19,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;
 
@@ -119,10 +118,6 @@
       font-size: var(--van-popup-close-icon-size);
       cursor: pointer;
 
-      &:active {
-        color: var(--van-popup-close-icon-active-color);
-      }
-
       &--top-left {
         top: var(--van-popup-close-icon-margin);
         left: var(--van-popup-close-icon-margin);

package/lib/popup/shared.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.popupSharedPropKeys = exports.popupSharedProps = void 0;
+exports.popupSharedProps = exports.popupSharedPropKeys = void 0;
 
 var _utils = require("../utils");
 
@@ -9,11 +9,11 @@ var popupSharedProps = {
   // whether to show popup
   show: Boolean,
   // z-index
-  zIndex: [Number, String],
+  zIndex: _utils.numericProp,
   // whether to show overlay
   overlay: _utils.truthProp,
   // transition duration
-  duration: [Number, String],
+  duration: _utils.numericProp,
   // teleport
   teleport: [String, Object],
   // prevent body scroll

package/lib/popup/var.less

@@ -1,10 +1,9 @@
 @import '../style/var.less';
 
-@popup-background-color: var(--van-white);
+@popup-background-color: var(--van-background-color-light);
 @popup-transition: transform var(--van-animation-duration-base);
 @popup-round-border-radius: 16px;
 @popup-close-icon-size: 22px;
 @popup-close-icon-color: var(--van-gray-5);
-@popup-close-icon-active-color: var(--van-gray-6);
 @popup-close-icon-margin: 16px;
 @popup-close-icon-z-index: 1;

package/lib/progress/Progress.d.ts

@@ -1,5 +1,5 @@
 import { ExtractPropTypes } from 'vue';
-declare const props: {
+declare const progressProps: {
     color: StringConstructor;
     inactive: BooleanConstructor;
     pivotText: StringConstructor;
@@ -17,7 +17,7 @@ declare const props: {
         validator: (value: number | string) => boolean;
     };
 };
-export declare type ProgressProps = ExtractPropTypes<typeof props>;
+export declare type ProgressProps = ExtractPropTypes<typeof progressProps>;
 declare const _default: import("vue").DefineComponent<{
     color: StringConstructor;
     inactive: BooleanConstructor;

package/lib/progress/Progress.js

@@ -8,7 +8,7 @@ var _vue = require("vue");
 var _utils = require("../utils");
 
 var [name, bem] = (0, _utils.createNamespace)('progress');
-var props = {
+var progressProps = {
   color: String,
   inactive: Boolean,
   pivotText: String,
@@ -16,9 +16,9 @@ var props = {
   showPivot: _utils.truthProp,
   pivotColor: String,
   trackColor: String,
-  strokeWidth: [Number, String],
+  strokeWidth: _utils.numericProp,
   percentage: {
-    type: [Number, String],
+    type: _utils.numericProp,
     default: 0,
     validator: value => value >= 0 && value <= 100
   }
@@ -26,10 +26,10 @@ var props = {
 
 var _default = (0, _vue.defineComponent)({
   name,
-  props,
+  props: progressProps,
 
   setup(props) {
-    var background = (0, _vue.computed)(() => props.inactive ? '#cacaca' : props.color);
+    var background = (0, _vue.computed)(() => props.inactive ? undefined : props.color);
 
     var renderPivot = () => {
       var {
@@ -49,7 +49,9 @@ var _default = (0, _vue.defineComponent)({
         };
         return (0, _vue.createVNode)("span", {
           "style": style,
-          "class": bem('pivot')
+          "class": bem('pivot', {
+            inactive: props.inactive
+          })
         }, [text]);
       }
     };
@@ -65,14 +67,16 @@ var _default = (0, _vue.defineComponent)({
         height: (0, _utils.addUnit)(strokeWidth)
       };
       var portionStyle = {
-        background: background.value,
-        transform: "scaleX(" + +percentage / 100 + ")"
+        width: percentage + "%",
+        background: background.value
       };
       return (0, _vue.createVNode)("div", {
         "class": bem(),
         "style": rootStyle
       }, [(0, _vue.createVNode)("span", {
-        "class": bem('portion'),
+        "class": bem('portion', {
+          inactive: props.inactive
+        }),
         "style": portionStyle
       }, null), renderPivot()]);
     };

package/lib/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)}