vant 3.2.3 → 3.2.7

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, HAPTICS_FEEDBACK } from '../utils'; // Composables
 
 import { useEventListener } from '@vant/use';
 import { useExpose } from '../composables/use-expose';
@@ -12,38 +12,31 @@ import { POPUP_TOGGLE_KEY } from '../composables/on-popup-reopen'; // Components
 
 import { Icon } from '../icon';
 import { Overlay } from '../overlay';
+var popupProps = extend({}, popupSharedProps, {
+  round: Boolean,
+  position: makeStringProp('center'),
+  closeIcon: makeStringProp('cross'),
+  closeable: Boolean,
+  transition: String,
+  iconPrefix: String,
+  closeOnPopstate: Boolean,
+  closeIconPosition: makeStringProp('top-right'),
+  safeAreaInsetBottom: Boolean
+});
 var [name, bem] = createNamespace('popup');
 var globalZIndex = 2000;
 export default defineComponent({
   name,
   inheritAttrs: false,
-  props: extend({}, 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 = ref();
@@ -76,9 +69,7 @@ export default defineComponent({
 
     var close = () => {
       if (opened) {
-        callInterceptor({
-          interceptor: props.beforeClose,
-
+        callInterceptor(props.beforeClose, {
           done() {
             opened = false;
             emit('close');
@@ -123,7 +114,7 @@ export default defineComponent({
           "role": "button",
           "tabindex": 0,
           "name": props.closeIcon,
-          "class": bem('close-icon', props.closeIconPosition),
+          "class": [bem('close-icon', props.closeIconPosition), HAPTICS_FEEDBACK],
           "classPrefix": props.iconPrefix,
           "onClick": onClickCloseIcon
         }, null);
@@ -168,7 +159,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-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/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,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/es/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/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/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/es/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/es/progress/Progress.js

@@ -1,8 +1,8 @@
 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 = {
+var progressProps = {
   color: String,
   inactive: Boolean,
   pivotText: String,
@@ -10,19 +10,19 @@ 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
   }
 };
 export default defineComponent({
   name,
-  props,
+  props: progressProps,
 
   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;
@@ -42,4 +43,5 @@ export declare const Progress: import("../utils").WithInstall<import("vue").Defi
     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);

package/es/pull-refresh/PullRefresh.d.ts

@@ -1,14 +1,16 @@
-declare const _default: import("vue").DefineComponent<{
+import { ExtractPropTypes } from 'vue';
+declare const pullRefreshProps: {
     disabled: BooleanConstructor;
+    modelValue: BooleanConstructor;
+    headHeight: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     successText: StringConstructor;
     pullingText: StringConstructor;
     loosingText: StringConstructor;
     loadingText: StringConstructor;
     pullDistance: (NumberConstructor | StringConstructor)[];
-    modelValue: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     successDuration: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
@@ -17,27 +19,45 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+};
+export declare type PullRefreshProps = ExtractPropTypes<typeof pullRefreshProps>;
+declare const _default: import("vue").DefineComponent<{
+    disabled: BooleanConstructor;
+    modelValue: BooleanConstructor;
     headHeight: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    successText: StringConstructor;
+    pullingText: StringConstructor;
+    loosingText: StringConstructor;
+    loadingText: StringConstructor;
+    pullDistance: (NumberConstructor | StringConstructor)[];
+    successDuration: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    animationDuration: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "refresh")[], "update:modelValue" | "refresh", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     disabled?: unknown;
+    modelValue?: unknown;
+    headHeight?: unknown;
     successText?: unknown;
     pullingText?: unknown;
     loosingText?: unknown;
     loadingText?: unknown;
     pullDistance?: unknown;
-    modelValue?: unknown;
     successDuration?: unknown;
     animationDuration?: unknown;
-    headHeight?: unknown;
 } & {
     disabled: boolean;
     modelValue: boolean;
     animationDuration: string | number;
-    successDuration: string | number;
     headHeight: string | number;
+    successDuration: string | number;
 } & {
     loadingText?: string | undefined;
     successText?: string | undefined;
@@ -51,7 +71,7 @@ declare const _default: import("vue").DefineComponent<{
     disabled: boolean;
     modelValue: boolean;
     animationDuration: string | number;
-    successDuration: string | number;
     headHeight: string | number;
+    successDuration: string | number;
 }>;
 export default _default;

package/es/pull-refresh/PullRefresh.js

@@ -1,7 +1,7 @@
-import { createVNode as _createVNode } from "vue";
+import { resolveDirective as _resolveDirective, createVNode as _createVNode } from "vue";
 import { ref, watch, reactive, nextTick, defineComponent } from 'vue'; // Utils
 
-import { preventDefault, getScrollTop, createNamespace } from '../utils'; // Composables
+import { numericProp, getScrollTop, preventDefault, createNamespace, makeNumericProp } from '../utils'; // Composables
 
 import { useScrollParent } from '@vant/use';
 import { useTouch } from '../composables/use-touch'; // Components
@@ -10,38 +10,28 @@ import { Loading } from '../loading';
 var [name, bem, t] = createNamespace('pull-refresh');
 var DEFAULT_HEAD_HEIGHT = 50;
 var TEXT_STATUS = ['pulling', 'loosing', 'success'];
+var pullRefreshProps = {
+  disabled: Boolean,
+  modelValue: Boolean,
+  headHeight: makeNumericProp(DEFAULT_HEAD_HEIGHT),
+  successText: String,
+  pullingText: String,
+  loosingText: String,
+  loadingText: String,
+  pullDistance: numericProp,
+  successDuration: makeNumericProp(500),
+  animationDuration: makeNumericProp(300)
+};
 export default defineComponent({
   name,
-  props: {
-    disabled: Boolean,
-    successText: String,
-    pullingText: String,
-    loosingText: String,
-    loadingText: String,
-    pullDistance: [Number, String],
-    modelValue: {
-      type: Boolean,
-      default: false
-    },
-    successDuration: {
-      type: [Number, String],
-      default: 500
-    },
-    animationDuration: {
-      type: [Number, String],
-      default: 300
-    },
-    headHeight: {
-      type: [Number, String],
-      default: DEFAULT_HEAD_HEIGHT
-    }
-  },
+  props: pullRefreshProps,
   emits: ['refresh', 'update:modelValue'],
 
-  setup(props, {
-    emit,
-    slots
-  }) {
+  setup(props, _ref) {
+    var {
+      emit,
+      slots
+    } = _ref;
     var reachTop;
     var root = ref();
     var scrollParent = useScrollParent(root);
@@ -127,7 +117,7 @@ export default defineComponent({
         nodes.push(_createVNode(Loading, {
           "class": bem('loading')
         }, {
-          default: () => [getStatusText()]
+          default: getStatusText
         }));
       }
 

package/es/pull-refresh/index.css

@@ -1 +1 @@
-:root{--van-pull-refresh-head-height:50px;--van-pull-refresh-head-font-size:var(--van-font-size-md);--van-pull-refresh-head-text-color:var(--van-gray-6);--van-pull-refresh-loading-icon-size:16px}.van-pull-refresh{overflow:hidden;-webkit-user-select:none;user-select:none}.van-pull-refresh__track{position:relative;height:100%;transition-property:transform}.van-pull-refresh__head{position:absolute;left:0;width:100%;height:var(--van-pull-refresh-head-height);overflow:hidden;color:var(--van-pull-refresh-head-text-color);font-size:var(--van-pull-refresh-head-font-size);line-height:var(--van-pull-refresh-head-height);text-align:center;transform:translateY(-100%)}.van-pull-refresh__loading .van-loading__spinner{width:var(--van-pull-refresh-loading-icon-size);height:var(--van-pull-refresh-loading-icon-size)}
+:root{--van-pull-refresh-head-height:50px;--van-pull-refresh-head-font-size:var(--van-font-size-md);--van-pull-refresh-head-text-color:var(--van-text-color-2);--van-pull-refresh-loading-icon-size:16px}.van-pull-refresh{overflow:hidden;-webkit-user-select:none;user-select:none}.van-pull-refresh__track{position:relative;height:100%;transition-property:transform}.van-pull-refresh__head{position:absolute;left:0;width:100%;height:var(--van-pull-refresh-head-height);overflow:hidden;color:var(--van-pull-refresh-head-text-color);font-size:var(--van-pull-refresh-head-font-size);line-height:var(--van-pull-refresh-head-height);text-align:center;transform:translateY(-100%)}.van-pull-refresh__loading .van-loading__spinner{width:var(--van-pull-refresh-loading-icon-size);height:var(--van-pull-refresh-loading-icon-size)}

package/es/pull-refresh/index.d.ts

@@ -1,14 +1,15 @@
 export declare const PullRefresh: import("../utils").WithInstall<import("vue").DefineComponent<{
     disabled: BooleanConstructor;
+    modelValue: BooleanConstructor;
+    headHeight: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     successText: StringConstructor;
     pullingText: StringConstructor;
     loosingText: StringConstructor;
     loadingText: StringConstructor;
     pullDistance: (NumberConstructor | StringConstructor)[];
-    modelValue: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     successDuration: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
@@ -17,27 +18,23 @@ export declare const PullRefresh: import("../utils").WithInstall<import("vue").D
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    headHeight: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "refresh")[], "update:modelValue" | "refresh", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     disabled?: unknown;
+    modelValue?: unknown;
+    headHeight?: unknown;
     successText?: unknown;
     pullingText?: unknown;
     loosingText?: unknown;
     loadingText?: unknown;
     pullDistance?: unknown;
-    modelValue?: unknown;
     successDuration?: unknown;
     animationDuration?: unknown;
-    headHeight?: unknown;
 } & {
     disabled: boolean;
     modelValue: boolean;
     animationDuration: string | number;
-    successDuration: string | number;
     headHeight: string | number;
+    successDuration: string | number;
 } & {
     loadingText?: string | undefined;
     successText?: string | undefined;
@@ -51,7 +48,8 @@ export declare const PullRefresh: import("../utils").WithInstall<import("vue").D
     disabled: boolean;
     modelValue: boolean;
     animationDuration: string | number;
-    successDuration: string | number;
     headHeight: string | number;
+    successDuration: string | number;
 }>>;
 export default PullRefresh;
+export type { PullRefreshProps } from './PullRefresh';

package/es/pull-refresh/var.less

@@ -2,5 +2,5 @@
 
 @pull-refresh-head-height: 50px;
 @pull-refresh-head-font-size: var(--van-font-size-md);
-@pull-refresh-head-text-color: var(--van-gray-6);
+@pull-refresh-head-text-color: var(--van-text-color-2);
 @pull-refresh-loading-icon-size: 16px;

package/es/radio/Radio.d.ts

@@ -1,39 +1,44 @@
+import { ExtractPropTypes } from 'vue';
+import { checkerProps, CheckerShape, CheckerLabelPosition } from '../checkbox/Checker';
+export declare type RadioShape = CheckerShape;
+export declare type RadioLabelPosition = CheckerLabelPosition;
+export declare type RadioProps = ExtractPropTypes<typeof checkerProps>;
 declare const _default: import("vue").DefineComponent<{
     name: import("vue").PropType<unknown>;
+    shape: {
+        type: import("vue").PropType<CheckerShape>;
+        default: CheckerShape;
+    };
     disabled: BooleanConstructor;
     iconSize: (NumberConstructor | StringConstructor)[];
     modelValue: import("vue").PropType<unknown>;
     checkedColor: StringConstructor;
-    labelPosition: import("vue").PropType<import("../checkbox/Checker").CheckerLabelPosition>;
+    labelPosition: import("vue").PropType<CheckerLabelPosition>;
     labelDisabled: BooleanConstructor;
-    shape: {
-        type: import("vue").PropType<import("../checkbox/Checker").CheckerShape>;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     name?: unknown;
+    shape?: unknown;
     disabled?: unknown;
     iconSize?: unknown;
     modelValue?: unknown;
     checkedColor?: unknown;
     labelPosition?: unknown;
     labelDisabled?: unknown;
-    shape?: unknown;
 } & {
     disabled: boolean;
-    shape: import("../checkbox/Checker").CheckerShape;
+    shape: CheckerShape;
     labelDisabled: boolean;
 } & {
     name?: unknown;
     modelValue?: unknown;
     iconSize?: string | number | undefined;
     checkedColor?: string | undefined;
-    labelPosition?: import("../checkbox/Checker").CheckerLabelPosition | undefined;
+    labelPosition?: CheckerLabelPosition | undefined;
 }> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
     disabled: boolean;
-    shape: import("../checkbox/Checker").CheckerShape;
+    shape: CheckerShape;
     labelDisabled: boolean;
 }>;
 export default _default;