vant 3.5.4 → 3.6.0

package/lib/index.d.ts

@@ -67,6 +67,7 @@ export * from "./sidebar";
 export * from "./sidebar-item";
 export * from "./skeleton";
 export * from "./slider";
+export * from "./space";
 export * from "./step";
 export * from "./stepper";
 export * from "./steps";
@@ -90,4 +91,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "3.5.4";
+export const version: "3.6.0";

package/lib/index.js

@@ -91,6 +91,7 @@ var import_sidebar = require("./sidebar");
 var import_sidebar_item = require("./sidebar-item");
 var import_skeleton = require("./skeleton");
 var import_slider = require("./slider");
+var import_space = require("./space");
 var import_step = require("./step");
 var import_stepper = require("./stepper");
 var import_steps = require("./steps");
@@ -177,6 +178,7 @@ __reExport(stdin_exports, require("./sidebar"), module.exports);
 __reExport(stdin_exports, require("./sidebar-item"), module.exports);
 __reExport(stdin_exports, require("./skeleton"), module.exports);
 __reExport(stdin_exports, require("./slider"), module.exports);
+__reExport(stdin_exports, require("./space"), module.exports);
 __reExport(stdin_exports, require("./step"), module.exports);
 __reExport(stdin_exports, require("./stepper"), module.exports);
 __reExport(stdin_exports, require("./steps"), module.exports);
@@ -194,7 +196,7 @@ __reExport(stdin_exports, require("./tag"), module.exports);
 __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
-const version = "3.5.4";
+const version = "3.6.0";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,
@@ -265,6 +267,7 @@ function install(app) {
     import_sidebar_item.SidebarItem,
     import_skeleton.Skeleton,
     import_slider.Slider,
+    import_space.Space,
     import_step.Step,
     import_stepper.Stepper,
     import_steps.Steps,

package/lib/index.less

@@ -72,6 +72,7 @@
 @import "./tree-select/index.less";
 @import "./skeleton/index.less";
 @import "./slider/index.less";
+@import "./space/index.less";
 @import "./steps/index.less";
 @import "./step/index.less";
 @import "./stepper/index.less";

package/lib/popover/Popover.js

@@ -63,6 +63,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     attrs
   }) {
     let popper;
+    const popupRef = (0, import_vue2.ref)();
     const wrapperRef = (0, import_vue2.ref)();
     const popoverRef = (0, import_vue2.ref)();
     const getPopoverOptions = () => ({
@@ -103,10 +104,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
         updateShow(!props.show);
       }
     };
-    const onTouchstart = (event) => {
-      event.stopPropagation();
-      emit("touchstart", event);
-    };
     const onClickAction = (action, index) => {
       if (action.disabled) {
         return;
@@ -117,7 +114,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const onClickAway = () => {
-      if (props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
+      if (props.show && props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
         updateShow(false);
       }
     };
@@ -157,7 +154,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "onClick": () => onClickAction(action, index)
       }, [renderActionContent(action, index)]);
     };
-    (0, import_vue2.onMounted)(updateLocation);
+    (0, import_vue2.onMounted)(() => {
+      updateLocation();
+      (0, import_vue2.watchEffect)(() => {
+        var _a;
+        popupRef.value = (_a = popoverRef.value) == null ? void 0 : _a.popupRef.value;
+      });
+    });
     (0, import_vue2.onBeforeUnmount)(() => {
       if (popper) {
         popper.destroy();
@@ -165,7 +168,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     });
     (0, import_vue2.watch)(() => [props.show, props.offset, props.placement], updateLocation);
-    (0, import_use.useClickAway)(wrapperRef, onClickAway, {
+    (0, import_use.useClickAway)([wrapperRef, popupRef], onClickAway, {
       eventName: "touchstart"
     });
     return () => {
@@ -180,7 +183,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "position": "",
         "transition": "van-popover-zoom",
         "lockScroll": false,
-        "onTouchstart": onTouchstart,
         "onUpdate:show": updateShow
       }, attrs, (0, import_utils.pick)(props, popupProps)), {
         default: () => [props.showArrow && (0, import_vue.createVNode)("div", {

package/lib/popup/Popup.js

@@ -29,6 +29,7 @@ var import_use_expose = require("../composables/use-expose");
 var import_use_lock_scroll = require("../composables/use-lock-scroll");
 var import_use_lazy_render = require("../composables/use-lazy-render");
 var import_on_popup_reopen = require("../composables/on-popup-reopen");
+var import_use_global_z_index = require("../composables/use-global-z-index");
 var import_icon = require("../icon");
 var import_overlay = require("../overlay");
 const popupProps = (0, import_utils.extend)({}, import_shared.popupSharedProps, {
@@ -44,7 +45,6 @@ const popupProps = (0, import_utils.extend)({}, import_shared.popupSharedProps,
   safeAreaInsetBottom: Boolean
 });
 const [name, bem] = (0, import_utils.createNamespace)("popup");
-let globalZIndex = 2e3;
 var stdin_default = (0, import_vue2.defineComponent)({
   name,
   inheritAttrs: false,
@@ -72,11 +72,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
     });
     const open = () => {
       if (!opened) {
-        if (props.zIndex !== void 0) {
-          globalZIndex = +props.zIndex;
-        }
         opened = true;
-        zIndex.value = ++globalZIndex;
+        zIndex.value = props.zIndex !== void 0 ? +props.zIndex : (0, import_use_global_z_index.useGlobalZIndex)();
         emit("open");
       }
     };
@@ -105,6 +102,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
           "zIndex": zIndex.value,
           "duration": props.duration,
           "customStyle": props.overlayStyle,
+          "role": props.closeOnClickOverlay ? "button" : void 0,
+          "tabindex": props.closeOnClickOverlay ? 0 : void 0,
           "onClick": onClickOverlay
         }, {
           default: slots["overlay-content"]
@@ -141,6 +140,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return (0, import_vue.withDirectives)((0, import_vue.createVNode)("div", (0, import_vue.mergeProps)({
         "ref": popupRef,
         "style": style.value,
+        "role": "dialog",
+        "tabindex": 0,
         "class": [bem({
           round,
           [position]: position

package/lib/pull-refresh/PullRefresh.js

@@ -51,6 +51,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
   }) {
     let reachTop;
     const root = (0, import_vue2.ref)();
+    const track = (0, import_vue2.ref)();
     const scrollParent = (0, import_use.useScrollParent)(root);
     const state = (0, import_vue2.reactive)({
       status: "normal",
@@ -183,6 +184,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         setStatus(0, false);
       }
     });
+    (0, import_use.useEventListener)("touchstart", onTouchStart, {
+      target: track,
+      passive: true
+    });
+    (0, import_use.useEventListener)("touchmove", onTouchMove, {
+      target: track
+    });
     return () => {
       var _a;
       const trackStyle = {
@@ -193,10 +201,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "ref": root,
         "class": bem()
       }, [(0, import_vue.createVNode)("div", {
+        "ref": track,
         "class": bem("track"),
         "style": trackStyle,
-        "onTouchstart": onTouchStart,
-        "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd
       }, [(0, import_vue.createVNode)("div", {

package/lib/search/index.css

@@ -1 +1 @@
-:root{--van-search-padding: 10px var(--van-padding-sm);--van-search-background-color: var(--van-background-color-light);--van-search-content-background-color: var(--van-gray-1);--van-search-input-height: 34px;--van-search-label-padding: 0 5px;--van-search-label-color: var(--van-text-color);--van-search-label-font-size: var(--van-font-size-md);--van-search-left-icon-color: var(--van-gray-6);--van-search-action-padding: 0 var(--van-padding-xs);--van-search-action-text-color: var(--van-text-color);--van-search-action-font-size: var(--van-font-size-md)}.van-search{display:flex;align-items:center;box-sizing:border-box;padding:var(--van-search-padding);background:var(--van-search-background-color)}.van-search__content{display:flex;flex:1;padding-left:var(--van-padding-sm);background:var(--van-search-content-background-color);border-radius:var(--van-border-radius-sm)}.van-search__content--round{border-radius:var(--van-border-radius-max)}.van-search__label{padding:var(--van-search-label-padding);color:var(--van-search-label-color);font-size:var(--van-search-label-font-size);line-height:var(--van-search-input-height)}.van-search__field{flex:1;padding:5px var(--van-padding-xs) 5px 0;background-color:transparent}.van-search__field .van-field__left-icon{color:var(--van-search-left-icon-color)}.van-search--show-action{padding-right:0}.van-search input::-webkit-search-decoration,.van-search input::-webkit-search-cancel-button,.van-search input::-webkit-search-results-button,.van-search input::-webkit-search-results-decoration{display:none}.van-search__action{padding:var(--van-search-action-padding);color:var(--van-search-action-text-color);font-size:var(--van-search-action-font-size);line-height:var(--van-search-input-height);cursor:pointer;-webkit-user-select:none;user-select:none}.van-search__action:active{background-color:var(--van-active-color)}
+:root{--van-search-padding: 10px var(--van-padding-sm);--van-search-background-color: var(--van-background-color-light);--van-search-content-background-color: var(--van-gray-1);--van-search-input-height: 34px;--van-search-label-padding: 0 5px;--van-search-label-color: var(--van-text-color);--van-search-label-font-size: var(--van-font-size-md);--van-search-left-icon-color: var(--van-gray-6);--van-search-action-padding: 0 var(--van-padding-xs);--van-search-action-text-color: var(--van-text-color);--van-search-action-font-size: var(--van-font-size-md)}.van-search{display:flex;align-items:center;box-sizing:border-box;padding:var(--van-search-padding);background:var(--van-search-background-color)}.van-search__content{display:flex;flex:1;padding-left:var(--van-padding-sm);background:var(--van-search-content-background-color);border-radius:var(--van-border-radius-sm)}.van-search__content--round{border-radius:var(--van-border-radius-max)}.van-search__label{padding:var(--van-search-label-padding);color:var(--van-search-label-color);font-size:var(--van-search-label-font-size);line-height:var(--van-search-input-height)}.van-search__field{flex:1;align-items:center;padding:0 var(--van-padding-xs) 0 0;height:var(--van-search-input-height);background-color:transparent}.van-search__field .van-field__left-icon{color:var(--van-search-left-icon-color)}.van-search--show-action{padding-right:0}.van-search input::-webkit-search-decoration,.van-search input::-webkit-search-cancel-button,.van-search input::-webkit-search-results-button,.van-search input::-webkit-search-results-decoration{display:none}.van-search__action{padding:var(--van-search-action-padding);color:var(--van-search-action-text-color);font-size:var(--van-search-action-font-size);line-height:var(--van-search-input-height);cursor:pointer;-webkit-user-select:none;user-select:none}.van-search__action:active{background-color:var(--van-active-color)}

package/lib/search/index.less

@@ -42,7 +42,9 @@
 
   &__field {
     flex: 1;
-    padding: 5px var(--van-padding-xs) 5px 0;
+    align-items: center;
+    padding: 0 var(--van-padding-xs) 0 0;
+    height: var(--van-search-input-height);
     background-color: transparent;
 
     .van-field__left-icon {

package/lib/space/Space.d.ts

@@ -0,0 +1,48 @@
+import { ExtractPropTypes, PropType } from 'vue';
+export declare type SpaceSize = number | string;
+export declare type SpaceAlign = 'start' | 'end' | 'center' | 'baseline';
+declare const spaceProps: {
+    align: PropType<SpaceAlign>;
+    direction: {
+        type: PropType<"vertical" | "horizontal">;
+        default: string;
+    };
+    size: {
+        type: PropType<string | number | [SpaceSize, SpaceSize]>;
+        default: number;
+    };
+    wrap: BooleanConstructor;
+    fill: BooleanConstructor;
+};
+export declare type SpaceProps = ExtractPropTypes<typeof spaceProps>;
+declare const _default: import("vue").DefineComponent<{
+    align: PropType<SpaceAlign>;
+    direction: {
+        type: PropType<"vertical" | "horizontal">;
+        default: string;
+    };
+    size: {
+        type: PropType<string | number | [SpaceSize, SpaceSize]>;
+        default: number;
+    };
+    wrap: BooleanConstructor;
+    fill: BooleanConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+    align: PropType<SpaceAlign>;
+    direction: {
+        type: PropType<"vertical" | "horizontal">;
+        default: string;
+    };
+    size: {
+        type: PropType<string | number | [SpaceSize, SpaceSize]>;
+        default: number;
+    };
+    wrap: BooleanConstructor;
+    fill: BooleanConstructor;
+}>>, {
+    fill: boolean;
+    size: string | number | [SpaceSize, SpaceSize];
+    wrap: boolean;
+    direction: "vertical" | "horizontal";
+}>;
+export default _default;

package/lib/space/Space.js

@@ -0,0 +1,106 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => stdin_default
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_vue = require("vue");
+var import_vue2 = require("vue");
+var import_utils = require("../utils");
+const [name, bem] = (0, import_utils.createNamespace)("space");
+const spaceProps = {
+  align: String,
+  direction: {
+    type: String,
+    default: "horizontal"
+  },
+  size: {
+    type: [Number, String, Array],
+    default: 8
+  },
+  wrap: Boolean,
+  fill: Boolean
+};
+function filterEmpty(children = []) {
+  const nodes = [];
+  children.forEach((child) => {
+    if (Array.isArray(child)) {
+      nodes.push(...child);
+    } else if (child.type === import_vue2.Fragment) {
+      nodes.push(...filterEmpty(child.children));
+    } else {
+      nodes.push(child);
+    }
+  });
+  return nodes.filter((c) => {
+    var _a;
+    return !(c && (typeof Comment !== "undefined" && c.type === Comment || c.type === import_vue2.Fragment && ((_a = c.children) == null ? void 0 : _a.length) === 0 || c.type === Text && c.children.trim() === ""));
+  });
+}
+var stdin_default = (0, import_vue2.defineComponent)({
+  name,
+  props: spaceProps,
+  setup(props, {
+    slots
+  }) {
+    const mergedAlign = (0, import_vue2.computed)(() => {
+      var _a;
+      return (_a = props.align) != null ? _a : props.direction === "horizontal" ? "center" : "";
+    });
+    const getMargin = (size) => {
+      if (typeof size === "number") {
+        return size + "px";
+      }
+      return size;
+    };
+    const getMarginStyle = (isLast) => {
+      const style = {};
+      const marginRight = `${getMargin(Array.isArray(props.size) ? props.size[0] : props.size)}`;
+      const marginBottom = `${getMargin(Array.isArray(props.size) ? props.size[1] : props.size)}`;
+      if (isLast) {
+        return props.wrap ? {
+          marginBottom
+        } : {};
+      }
+      if (props.direction === "horizontal") {
+        style.marginRight = marginRight;
+      }
+      if (props.direction === "vertical" || props.wrap) {
+        style.marginBottom = marginBottom;
+      }
+      return style;
+    };
+    return () => {
+      var _a;
+      const children = filterEmpty((_a = slots.default) == null ? void 0 : _a.call(slots));
+      return (0, import_vue.createVNode)("div", {
+        "class": [bem({
+          [props.direction]: props.direction,
+          [`align-${mergedAlign.value}`]: mergedAlign.value,
+          wrap: props.wrap,
+          fill: props.fill
+        })]
+      }, [children.map((c, i) => (0, import_vue.createVNode)("div", {
+        "key": `item-${i}`,
+        "class": `${name}-item`,
+        "style": getMarginStyle(i === children.length - 1)
+      }, [c]))]);
+    };
+  }
+});

package/lib/space/index.css

@@ -0,0 +1 @@
+.van-space{display:inline-flex}.van-space--horizontal .van-space-item{display:flex;align-items:center}.van-space--vertical{flex-direction:column}.van-space--align-baseline{align-items:baseline}.van-space--align-start{align-items:flex-start}.van-space--align-end{align-items:flex-end}.van-space--align-center{align-items:center}.van-space--wrap{flex-wrap:wrap}.van-space--fill{display:flex}

package/lib/space/index.d.ts

@@ -0,0 +1,37 @@
+export declare const Space: import("../utils").WithInstall<import("vue").DefineComponent<{
+    align: import("vue").PropType<import("./Space").SpaceAlign>;
+    direction: {
+        type: import("vue").PropType<"vertical" | "horizontal">;
+        default: string;
+    };
+    size: {
+        type: import("vue").PropType<string | number | [import("./Space").SpaceSize, import("./Space").SpaceSize]>;
+        default: number;
+    };
+    wrap: BooleanConstructor;
+    fill: BooleanConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    align: import("vue").PropType<import("./Space").SpaceAlign>;
+    direction: {
+        type: import("vue").PropType<"vertical" | "horizontal">;
+        default: string;
+    };
+    size: {
+        type: import("vue").PropType<string | number | [import("./Space").SpaceSize, import("./Space").SpaceSize]>;
+        default: number;
+    };
+    wrap: BooleanConstructor;
+    fill: BooleanConstructor;
+}>>, {
+    fill: boolean;
+    size: string | number | [import("./Space").SpaceSize, import("./Space").SpaceSize];
+    wrap: boolean;
+    direction: "vertical" | "horizontal";
+}>>;
+export default Space;
+export type { SpaceProps, SpaceSize, SpaceAlign } from './Space';
+declare module 'vue' {
+    interface GlobalComponents {
+        VanSpace: typeof Space;
+    }
+}

package/lib/space/index.js

@@ -0,0 +1,30 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  Space: () => Space,
+  default: () => stdin_default
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_utils = require("../utils");
+var import_Space = __toESM(require("./Space"));
+const Space = (0, import_utils.withInstall)(import_Space.default);
+var stdin_default = Space;

package/lib/space/index.less

@@ -0,0 +1,38 @@
+.van-space {
+  display: inline-flex;
+
+  &--horizontal {
+    .van-space-item {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  &--vertical {
+    flex-direction: column;
+  }
+
+  &--align-baseline {
+    align-items: baseline;
+  }
+
+  &--align-start {
+    align-items: flex-start;
+  }
+
+  &--align-end {
+    align-items: flex-end;
+  }
+
+  &--align-center {
+    align-items: center;
+  }
+
+  &--wrap {
+    flex-wrap: wrap;
+  }
+
+  &--fill {
+    display: flex;
+  }
+}

package/lib/space/style/index.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/space/style/index.js

@@ -0,0 +1,2 @@
+require("../../style/base.css");
+require("../index.css");

package/lib/space/style/less.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/space/style/less.js

@@ -0,0 +1,2 @@
+require("../../style/base.less");
+require("../index.less");