vant 3.4.3 → 3.4.6

package/lib/vant.es.js

@@ -1,5 +1,5 @@
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, useToggle, raf, useScrollParent, usePageVisibility, doubleRaf, cancelRaf, useCountDown, useClickAway, inBrowser as inBrowser$1 } from "@vant/use";
-import { unref, ref, reactive, defineComponent, createVNode, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, onMounted, onActivated, Teleport, Fragment, nextTick, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, onUpdated, watchEffect, h } from "vue";
+import { unref, ref, reactive, defineComponent, createVNode, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, nextTick, onMounted, onActivated, Teleport, Fragment, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, withKeys, onUpdated, watchEffect, h } from "vue";
 import { createPopper, offsetModifier } from "@vant/popperjs";
 function noop() {
 }
@@ -259,7 +259,7 @@ var stdin_default$1D = {
     loosing: "\u91CA\u653E\u5373\u53EF\u5237\u65B0..."
   },
   vanSubmitBar: {
-    label: "\u5408\u8BA1\uFF1A"
+    label: "\u5408\u8BA1:"
   },
   vanCoupon: {
     unlimited: "\u65E0\u95E8\u69DB",
@@ -1126,6 +1126,7 @@ const popupProps$2 = extend({}, popupSharedProps, {
   iconPrefix: String,
   closeOnPopstate: Boolean,
   closeIconPosition: makeStringProp("top-right"),
+  safeAreaInsetTop: Boolean,
   safeAreaInsetBottom: Boolean
 });
 const [name$1l, bem$1h] = createNamespace("popup");
@@ -1134,7 +1135,7 @@ var stdin_default$1s = defineComponent({
   name: name$1l,
   inheritAttrs: false,
   props: popupProps$2,
-  emits: ["open", "close", "opened", "closed", "update:show", "click-overlay", "click-close-icon"],
+  emits: ["open", "close", "opened", "closed", "keydown", "update:show", "click-overlay", "click-close-icon"],
   setup(props, {
     emit,
     attrs,
@@ -1214,11 +1215,13 @@ var stdin_default$1s = defineComponent({
     };
     const onOpened = () => emit("opened");
     const onClosed = () => emit("closed");
+    const onKeydown = (event) => emit("keydown", event);
     const renderPopup = lazyRender(() => {
       var _a;
       const {
         round,
         position,
+        safeAreaInsetTop,
         safeAreaInsetBottom
       } = props;
       return withDirectives(createVNode("div", mergeProps({
@@ -1228,8 +1231,10 @@ var stdin_default$1s = defineComponent({
           round,
           [position]: position
         }), {
+          "van-safe-area-top": safeAreaInsetTop,
           "van-safe-area-bottom": safeAreaInsetBottom
-        }]
+        }],
+        "onKeydown": onKeydown
       }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[vShow, props.show]]);
     });
     const renderTransition = () => {
@@ -1251,6 +1256,12 @@ var stdin_default$1s = defineComponent({
     watch(() => props.show, (show) => {
       if (show && !opened) {
         open();
+        if (attrs.tabindex === 0) {
+          nextTick(() => {
+            var _a;
+            (_a = popupRef.value) == null ? void 0 : _a.focus();
+          });
+        }
       }
       if (!show && opened) {
         opened = false;
@@ -2166,7 +2177,9 @@ var stdin_default$1o = defineComponent({
     watch(() => props.areaList, setValues, {
       deep: true
     });
-    watch(() => props.columnsNum, () => nextTick(setValues));
+    watch(() => props.columnsNum, () => {
+      nextTick(setValues);
+    });
     useExpose({
       reset,
       getArea,
@@ -2464,7 +2477,8 @@ function runRuleValidator(value, rule) {
   return new Promise((resolve) => {
     const returnVal = rule.validator(value, rule);
     if (isPromise(returnVal)) {
-      return returnVal.then(resolve);
+      returnVal.then(resolve);
+      return;
     }
     resolve(returnVal);
   });
@@ -3002,7 +3016,7 @@ function lockClick(lock) {
   }
 }
 const [name$1d, bem$19] = createNamespace("toast");
-const popupInheritProps = ["show", "overlay", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -3012,6 +3026,7 @@ const toastProps = {
   iconSize: numericProp,
   duration: makeNumberProp(2e3),
   position: makeStringProp("middle"),
+  teleport: [String, Object],
   className: unknownProp,
   iconPrefix: String,
   transition: makeStringProp("van-fade"),
@@ -3077,6 +3092,7 @@ var stdin_default$1k = defineComponent({
       } = props;
       if (isDef(message) && message !== "") {
         return type === "html" ? createVNode("div", {
+          "key": 0,
           "class": bem$19("text"),
           "innerHTML": String(message)
         }, null) : createVNode("div", {
@@ -4600,6 +4616,7 @@ const calendarProps = {
   showRangePrompt: truthProp,
   confirmDisabledText: String,
   closeOnClickOverlay: truthProp,
+  safeAreaInsetTop: Boolean,
   safeAreaInsetBottom: truthProp,
   minDate: {
     type: Date,
@@ -4948,6 +4965,7 @@ var stdin_default$17 = defineComponent({
           "closeable": props.showTitle || props.showSubtitle,
           "teleport": props.teleport,
           "closeOnPopstate": props.closeOnPopstate,
+          "safeAreaInsetTop": props.safeAreaInsetTop,
           "closeOnClickOverlay": props.closeOnClickOverlay,
           "onUpdate:show": updateShow
         }, {
@@ -7120,7 +7138,8 @@ const collapseItemProps = extend({}, cellSharedProps, {
   name: numericProp,
   isLink: truthProp,
   disabled: Boolean,
-  readonly: Boolean
+  readonly: Boolean,
+  lazyRender: truthProp
 });
 var stdin_default$R = defineComponent({
   name: name$L,
@@ -7143,7 +7162,7 @@ var stdin_default$R = defineComponent({
     });
     const expanded = computed(() => parent.isExpanded(name2.value));
     const show = ref(expanded.value);
-    const lazyRender = useLazyRender(show);
+    const lazyRender = useLazyRender(() => show.value || !props.lazyRender);
     const onTransitionEnd = () => {
       if (!expanded.value) {
         show.value = false;
@@ -8242,11 +8261,12 @@ const popupInheritKeys$1 = [...popupSharedPropKeys, "transition", "closeOnPopsta
 var stdin_default$G = defineComponent({
   name: name$A,
   props: dialogProps,
-  emits: ["confirm", "cancel", "update:show"],
+  emits: ["confirm", "cancel", "keydown", "update:show"],
   setup(props, {
     emit,
     slots
   }) {
+    const root = ref();
     const loading = reactive({
       confirm: false,
       cancel: false
@@ -8280,6 +8300,18 @@ var stdin_default$G = defineComponent({
     };
     const onCancel = getActionHandler("cancel");
     const onConfirm = getActionHandler("confirm");
+    const onKeydown = withKeys((event) => {
+      var _a, _b;
+      if (event.target !== ((_b = (_a = root.value) == null ? void 0 : _a.popupRef) == null ? void 0 : _b.value)) {
+        return;
+      }
+      const onEventType = {
+        Enter: props.showConfirmButton ? onConfirm : noop,
+        Escape: props.showCancelButton ? onCancel : noop
+      };
+      onEventType[event.key]();
+      emit("keydown", event);
+    }, ["enter", "esc"]);
     const renderTitle = () => {
       const title = slots.title ? slots.title() : props.title;
       if (title) {
@@ -8389,12 +8421,15 @@ var stdin_default$G = defineComponent({
         className
       } = props;
       return createVNode(Popup, mergeProps({
+        "ref": root,
         "role": "dialog",
         "class": [bem$B([theme]), className],
         "style": {
           width: addUnit(width)
         },
+        "tabindex": 0,
         "aria-labelledby": title || message,
+        "onKeydown": onKeydown,
         "onUpdate:show": updateShow
       }, pick(props, popupInheritKeys$1)), {
         default: () => [renderTitle(), renderContent(), renderFooter()]
@@ -9658,7 +9693,9 @@ var stdin_default$x = defineComponent({
         });
       }
     };
-    const init = () => nextTick(onScroll);
+    const init = () => {
+      nextTick(onScroll);
+    };
     useEventListener("scroll", onScroll, {
       target: scrollParent
     });
@@ -10016,10 +10053,10 @@ var stdin_default$u = defineComponent({
         "ref": navBarRef,
         "style": style,
         "class": [bem$p({
-          fixed,
-          "safe-area-inset-top": props.safeAreaInsetTop
+          fixed
         }), {
-          [BORDER_BOTTOM]: border
+          [BORDER_BOTTOM]: border,
+          "van-safe-area-top": props.safeAreaInsetTop
         }]
       }, [createVNode("div", {
         "class": bem$p("content")
@@ -11740,9 +11777,11 @@ const skeletonProps = {
 };
 var stdin_default$f = defineComponent({
   name: name$a,
+  inheritAttrs: false,
   props: skeletonProps,
   setup(props, {
-    slots
+    slots,
+    attrs
   }) {
     const renderAvatar = () => {
       if (props.avatar) {
@@ -11785,12 +11824,12 @@ var stdin_default$f = defineComponent({
       if (!props.loading) {
         return (_a = slots.default) == null ? void 0 : _a.call(slots);
       }
-      return createVNode("div", {
+      return createVNode("div", mergeProps({
         "class": bem$a({
           animate: props.animate,
           round: props.round
         })
-      }, [renderAvatar(), createVNode("div", {
+      }, attrs), [renderAvatar(), createVNode("div", {
         "class": bem$a("content")
       }, [renderTitle(), renderRows()])]);
     };
@@ -12681,7 +12720,7 @@ var stdin_default$9 = defineComponent({
       return createVNode("div", {
         "ref": root,
         "class": bem$4(),
-        "onClick": getClickHandler("cell"),
+        "onClick": getClickHandler("cell", lockClick2),
         "onTouchstart": onTouchStart,
         "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
@@ -14228,7 +14267,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.3";
+const version = "3.4.6";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.es.min.js

@@ -1,5 +1,5 @@
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, useToggle, raf, useScrollParent, usePageVisibility, doubleRaf, cancelRaf, useCountDown, useClickAway, inBrowser as inBrowser$1 } from "@vant/use";
-import { unref, ref, reactive, defineComponent, createVNode, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, onMounted, onActivated, Teleport, Fragment, nextTick, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, onUpdated, watchEffect, h } from "vue";
+import { unref, ref, reactive, defineComponent, createVNode, getCurrentInstance, computed, provide, inject, mergeProps, onDeactivated, onBeforeUnmount, watch, Transition, withDirectives, vShow, nextTick, onMounted, onActivated, Teleport, Fragment, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, withKeys, onUpdated, watchEffect, h } from "vue";
 import { createPopper, offsetModifier } from "@vant/popperjs";
 function noop() {
 }
@@ -259,7 +259,7 @@ var stdin_default$1D = {
     loosing: "\u91CA\u653E\u5373\u53EF\u5237\u65B0..."
   },
   vanSubmitBar: {
-    label: "\u5408\u8BA1\uFF1A"
+    label: "\u5408\u8BA1:"
   },
   vanCoupon: {
     unlimited: "\u65E0\u95E8\u69DB",
@@ -1126,6 +1126,7 @@ const popupProps$2 = extend({}, popupSharedProps, {
   iconPrefix: String,
   closeOnPopstate: Boolean,
   closeIconPosition: makeStringProp("top-right"),
+  safeAreaInsetTop: Boolean,
   safeAreaInsetBottom: Boolean
 });
 const [name$1l, bem$1h] = createNamespace("popup");
@@ -1134,7 +1135,7 @@ var stdin_default$1s = defineComponent({
   name: name$1l,
   inheritAttrs: false,
   props: popupProps$2,
-  emits: ["open", "close", "opened", "closed", "update:show", "click-overlay", "click-close-icon"],
+  emits: ["open", "close", "opened", "closed", "keydown", "update:show", "click-overlay", "click-close-icon"],
   setup(props, {
     emit,
     attrs,
@@ -1214,11 +1215,13 @@ var stdin_default$1s = defineComponent({
     };
     const onOpened = () => emit("opened");
     const onClosed = () => emit("closed");
+    const onKeydown = (event) => emit("keydown", event);
     const renderPopup = lazyRender(() => {
       var _a;
       const {
         round,
         position,
+        safeAreaInsetTop,
         safeAreaInsetBottom
       } = props;
       return withDirectives(createVNode("div", mergeProps({
@@ -1228,8 +1231,10 @@ var stdin_default$1s = defineComponent({
           round,
           [position]: position
         }), {
+          "van-safe-area-top": safeAreaInsetTop,
           "van-safe-area-bottom": safeAreaInsetBottom
-        }]
+        }],
+        "onKeydown": onKeydown
       }, attrs), [(_a = slots.default) == null ? void 0 : _a.call(slots), renderCloseIcon()]), [[vShow, props.show]]);
     });
     const renderTransition = () => {
@@ -1251,6 +1256,12 @@ var stdin_default$1s = defineComponent({
     watch(() => props.show, (show) => {
       if (show && !opened) {
         open();
+        if (attrs.tabindex === 0) {
+          nextTick(() => {
+            var _a;
+            (_a = popupRef.value) == null ? void 0 : _a.focus();
+          });
+        }
       }
       if (!show && opened) {
         opened = false;
@@ -2166,7 +2177,9 @@ var stdin_default$1o = defineComponent({
     watch(() => props.areaList, setValues, {
       deep: true
     });
-    watch(() => props.columnsNum, () => nextTick(setValues));
+    watch(() => props.columnsNum, () => {
+      nextTick(setValues);
+    });
     useExpose({
       reset,
       getArea,
@@ -2464,7 +2477,8 @@ function runRuleValidator(value, rule) {
   return new Promise((resolve) => {
     const returnVal = rule.validator(value, rule);
     if (isPromise(returnVal)) {
-      return returnVal.then(resolve);
+      returnVal.then(resolve);
+      return;
     }
     resolve(returnVal);
   });
@@ -3002,7 +3016,7 @@ function lockClick(lock) {
   }
 }
 const [name$1d, bem$19] = createNamespace("toast");
-const popupInheritProps = ["show", "overlay", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -3012,6 +3026,7 @@ const toastProps = {
   iconSize: numericProp,
   duration: makeNumberProp(2e3),
   position: makeStringProp("middle"),
+  teleport: [String, Object],
   className: unknownProp,
   iconPrefix: String,
   transition: makeStringProp("van-fade"),
@@ -3077,6 +3092,7 @@ var stdin_default$1k = defineComponent({
       } = props;
       if (isDef(message) && message !== "") {
         return type === "html" ? createVNode("div", {
+          "key": 0,
           "class": bem$19("text"),
           "innerHTML": String(message)
         }, null) : createVNode("div", {
@@ -4600,6 +4616,7 @@ const calendarProps = {
   showRangePrompt: truthProp,
   confirmDisabledText: String,
   closeOnClickOverlay: truthProp,
+  safeAreaInsetTop: Boolean,
   safeAreaInsetBottom: truthProp,
   minDate: {
     type: Date,
@@ -4948,6 +4965,7 @@ var stdin_default$17 = defineComponent({
           "closeable": props.showTitle || props.showSubtitle,
           "teleport": props.teleport,
           "closeOnPopstate": props.closeOnPopstate,
+          "safeAreaInsetTop": props.safeAreaInsetTop,
           "closeOnClickOverlay": props.closeOnClickOverlay,
           "onUpdate:show": updateShow
         }, {
@@ -7120,7 +7138,8 @@ const collapseItemProps = extend({}, cellSharedProps, {
   name: numericProp,
   isLink: truthProp,
   disabled: Boolean,
-  readonly: Boolean
+  readonly: Boolean,
+  lazyRender: truthProp
 });
 var stdin_default$R = defineComponent({
   name: name$L,
@@ -7143,7 +7162,7 @@ var stdin_default$R = defineComponent({
     });
     const expanded = computed(() => parent.isExpanded(name2.value));
     const show = ref(expanded.value);
-    const lazyRender = useLazyRender(show);
+    const lazyRender = useLazyRender(() => show.value || !props.lazyRender);
     const onTransitionEnd = () => {
       if (!expanded.value) {
         show.value = false;
@@ -8242,11 +8261,12 @@ const popupInheritKeys$1 = [...popupSharedPropKeys, "transition", "closeOnPopsta
 var stdin_default$G = defineComponent({
   name: name$A,
   props: dialogProps,
-  emits: ["confirm", "cancel", "update:show"],
+  emits: ["confirm", "cancel", "keydown", "update:show"],
   setup(props, {
     emit,
     slots
   }) {
+    const root = ref();
     const loading = reactive({
       confirm: false,
       cancel: false
@@ -8280,6 +8300,18 @@ var stdin_default$G = defineComponent({
     };
     const onCancel = getActionHandler("cancel");
     const onConfirm = getActionHandler("confirm");
+    const onKeydown = withKeys((event) => {
+      var _a, _b;
+      if (event.target !== ((_b = (_a = root.value) == null ? void 0 : _a.popupRef) == null ? void 0 : _b.value)) {
+        return;
+      }
+      const onEventType = {
+        Enter: props.showConfirmButton ? onConfirm : noop,
+        Escape: props.showCancelButton ? onCancel : noop
+      };
+      onEventType[event.key]();
+      emit("keydown", event);
+    }, ["enter", "esc"]);
     const renderTitle = () => {
       const title = slots.title ? slots.title() : props.title;
       if (title) {
@@ -8389,12 +8421,15 @@ var stdin_default$G = defineComponent({
         className
       } = props;
       return createVNode(Popup, mergeProps({
+        "ref": root,
         "role": "dialog",
         "class": [bem$B([theme]), className],
         "style": {
           width: addUnit(width)
         },
+        "tabindex": 0,
         "aria-labelledby": title || message,
+        "onKeydown": onKeydown,
         "onUpdate:show": updateShow
       }, pick(props, popupInheritKeys$1)), {
         default: () => [renderTitle(), renderContent(), renderFooter()]
@@ -9658,7 +9693,9 @@ var stdin_default$x = defineComponent({
         });
       }
     };
-    const init = () => nextTick(onScroll);
+    const init = () => {
+      nextTick(onScroll);
+    };
     useEventListener("scroll", onScroll, {
       target: scrollParent
     });
@@ -10016,10 +10053,10 @@ var stdin_default$u = defineComponent({
         "ref": navBarRef,
         "style": style,
         "class": [bem$p({
-          fixed,
-          "safe-area-inset-top": props.safeAreaInsetTop
+          fixed
         }), {
-          [BORDER_BOTTOM]: border
+          [BORDER_BOTTOM]: border,
+          "van-safe-area-top": props.safeAreaInsetTop
         }]
       }, [createVNode("div", {
         "class": bem$p("content")
@@ -11740,9 +11777,11 @@ const skeletonProps = {
 };
 var stdin_default$f = defineComponent({
   name: name$a,
+  inheritAttrs: false,
   props: skeletonProps,
   setup(props, {
-    slots
+    slots,
+    attrs
   }) {
     const renderAvatar = () => {
       if (props.avatar) {
@@ -11785,12 +11824,12 @@ var stdin_default$f = defineComponent({
       if (!props.loading) {
         return (_a = slots.default) == null ? void 0 : _a.call(slots);
       }
-      return createVNode("div", {
+      return createVNode("div", mergeProps({
         "class": bem$a({
           animate: props.animate,
           round: props.round
         })
-      }, [renderAvatar(), createVNode("div", {
+      }, attrs), [renderAvatar(), createVNode("div", {
         "class": bem$a("content")
       }, [renderTitle(), renderRows()])]);
     };
@@ -12681,7 +12720,7 @@ var stdin_default$9 = defineComponent({
       return createVNode("div", {
         "ref": root,
         "class": bem$4(),
-        "onClick": getClickHandler("cell"),
+        "onClick": getClickHandler("cell", lockClick2),
         "onTouchstart": onTouchStart,
         "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
@@ -14228,7 +14267,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.4.3";
+const version = "3.4.6";
 function install(app) {
   const components = [
     ActionBar,