@varlet/ui 3.4.0 → 3.5.0-alpha.1726249557629

package/es/auto-complete/AutoComplete.mjs

@@ -55,7 +55,8 @@ function __render__(_ctx, _cache) {
       "popover-class": _ctx.variant === "standard" ? _ctx.n("--standard-menu-margin") : void 0,
       show: _ctx.isShowMenuSelect,
       "onUpdate:show": _cache[1] || (_cache[1] = ($event) => _ctx.isShowMenuSelect = $event),
-      "onUpdate:modelValue": _ctx.handleAutoComplete
+      "onUpdate:modelValue": _ctx.handleAutoComplete,
+      onKeyEscape: _ctx.handleKeyEscape
     }, {
       options: _withCtx(() => [
         _createElementVNode(
@@ -146,7 +147,7 @@ function __render__(_ctx, _cache) {
       ]),
       _: 3
       /* FORWARDED */
-    }, 8, ["disabled", "class", "popover-class", "show", "onUpdate:modelValue"]),
+    }, 8, ["disabled", "class", "popover-class", "show", "onUpdate:modelValue", "onKeyEscape"]),
     _createVNode(_component_var_form_details, {
       "error-message": _ctx.errorMessage,
       "extra-message": _ctx.maxlengthText
@@ -303,15 +304,22 @@ const __sfc__ = defineComponent({
       validateWithTrigger("onChange");
     }
     function handleAutoComplete(newValue) {
-      if (props2.maxlength != null) {
-        newValue = newValue.slice(0, toNumber(props2.maxlength));
-      }
-      if (newValue === value.value) {
-        return;
-      }
-      value.value = newValue;
-      call(props2.onChange, newValue);
-      validateWithTrigger("onChange");
+      return __async(this, null, function* () {
+        var _a;
+        if (props2.maxlength != null) {
+          newValue = newValue.slice(0, toNumber(props2.maxlength));
+        }
+        if (newValue !== value.value) {
+          value.value = newValue;
+          call(props2.onChange, newValue);
+          validateWithTrigger("onChange");
+        }
+        yield raf();
+        (_a = input.value) == null ? void 0 : _a.focus();
+      });
+    }
+    function handleKeyEscape() {
+      input.value.focus();
     }
     function getShowMenuSelect(newValue) {
       if (props2.disabled || props2.readonly || (form == null ? void 0 : form.disabled.value) || (form == null ? void 0 : form.readonly.value)) {
@@ -336,6 +344,7 @@ const __sfc__ = defineComponent({
       handleClick,
       handleChange,
       handleBlur,
+      handleKeyEscape,
       handleAutoComplete,
       reset,
       validate,

package/es/auto-complete/props.mjs

@@ -38,7 +38,7 @@ const props = __spreadValues({
     default: () => ["onInput", "onClear", "onChange"]
   },
   getShow: Function,
-  rules: Array,
+  rules: [Array, Function, Object],
   onFocus: defineListenerProp(),
   onBlur: defineListenerProp(),
   onInput: defineListenerProp(),

package/es/checkbox/props.mjs

@@ -26,7 +26,7 @@ const props = {
     type: Array,
     default: () => ["onChange"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onClick: defineListenerProp(),
   onChange: defineListenerProp(),
   "onUpdate:modelValue": defineListenerProp(),

package/es/checkbox-group/props.mjs

@@ -25,7 +25,7 @@ const props = {
     type: Array,
     default: () => ["onChange"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onChange: defineListenerProp(),
   "onUpdate:modelValue": defineListenerProp()
 };

package/es/counter/props.mjs

@@ -45,7 +45,7 @@ const props = {
     type: Array,
     default: () => ["onInputChange", "onLazyChange", "onIncrement", "onDecrement"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onBeforeChange: defineListenerProp(),
   onChange: defineListenerProp(),
   onIncrement: defineListenerProp(),

package/es/index.bundle.mjs

@@ -268,7 +268,7 @@ import './tooltip/style/index.mjs'
 import './uploader/style/index.mjs'
 import './watermark/style/index.mjs'
 
-const version = '3.4.0'
+const version = '3.5.0-alpha.1726249557629'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/index.mjs

@@ -178,7 +178,7 @@ export * from './tooltip/index.mjs'
 export * from './uploader/index.mjs'
 export * from './watermark/index.mjs'
 
-const version = '3.4.0'
+const version = '3.5.0-alpha.1726249557629'
 
 function install(app) {
   ActionSheet.install && app.use(ActionSheet)

package/es/input/props.mjs

@@ -42,7 +42,7 @@ const props = __spreadProps(__spreadValues({
     type: Array,
     default: () => ["onInput", "onClear"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   enterkeyhint: String,
   onFocus: defineListenerProp(),
   onBlur: defineListenerProp(),

package/es/menu-select/MenuSelect.mjs

@@ -118,6 +118,7 @@ const __sfc__ = defineComponent({
       if (key === "Escape") {
         menu.value.$el.focus();
         close();
+        call(props2.onKeyEscape);
         return;
       }
       if (key === "ArrowDown" || key === "ArrowUp") {

package/es/menu-select/props.mjs

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,9 +16,10 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { menuProps } from "../menu/index.mjs";
 import { defineListenerProp, pickProps } from "../utils/components.mjs";
-const props = __spreadValues({
+const props = __spreadProps(__spreadValues({
   modelValue: {
     type: [String, Number, Boolean, Array],
     default: void 0
@@ -64,7 +67,11 @@ const props = __spreadValues({
   "onClosed",
   "onClickOutside",
   "onUpdate:show"
-]));
+])), {
+  // internal start
+  onKeyEscape: defineListenerProp()
+  // internal end
+});
 export {
   props
 };

package/es/radio/props.mjs

@@ -25,7 +25,7 @@ const props = {
     type: Array,
     default: () => ["onChange"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onClick: defineListenerProp(),
   onChange: defineListenerProp(),
   "onUpdate:modelValue": defineListenerProp()

package/es/radio-group/props.mjs

@@ -24,7 +24,7 @@ const props = {
     type: Array,
     default: () => ["onChange"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onChange: defineListenerProp(),
   "onUpdate:modelValue": defineListenerProp()
 };

package/es/select/props.mjs

@@ -52,7 +52,7 @@ const props = __spreadValues({
     type: Array,
     default: () => ["onChange", "onClear", "onClose"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onFocus: defineListenerProp(),
   onBlur: defineListenerProp(),
   onClose: defineListenerProp(),

package/es/slider/props.mjs

@@ -39,7 +39,7 @@ const props = {
     type: String,
     default: "horizontal"
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   onChange: defineListenerProp(),
   onStart: defineListenerProp(),
   onEnd: defineListenerProp(),

package/es/switch/props.mjs

@@ -18,7 +18,7 @@ const props = {
   closeColor: String,
   size: [String, Number],
   variant: Boolean,
-  rules: Array,
+  rules: [Array, Function, Object],
   ripple: {
     type: Boolean,
     default: true

package/es/tooltip/Tooltip.mjs

@@ -43,7 +43,11 @@ function __render__(_ctx, _cache) {
                 _createElementVNode(
                   "div",
                   {
-                    style: _normalizeStyle({ background: _ctx.color, width: _ctx.sameWidth ? _ctx.toSizeUnit(Math.ceil(_ctx.hostSize.width)) : void 0 }),
+                    style: _normalizeStyle({
+                      background: _ctx.color,
+                      color: _ctx.textColor,
+                      width: _ctx.sameWidth ? _ctx.toSizeUnit(Math.ceil(_ctx.hostSize.width)) : void 0
+                    }),
                     class: _normalizeClass(_ctx.classes(_ctx.n("content-container"), _ctx.n(`--${_ctx.type}`))),
                     role: "tooltip"
                   },

package/es/tooltip/props.mjs

@@ -5,6 +5,7 @@ const props = {
     default: "default"
   },
   color: String,
+  textColor: String,
   content: String,
   show: Boolean,
   disabled: Boolean,

package/es/uploader/props.mjs

@@ -41,7 +41,7 @@ const props = {
     type: Array,
     default: () => ["onChange", "onRemove"]
   },
-  rules: Array,
+  rules: [Array, Function, Object],
   hideList: Boolean,
   preventDefaultPreview: Boolean,
   onClickAction: defineListenerProp(),

package/es/utils/components.mjs

@@ -48,7 +48,15 @@ import {
   Fragment,
   defineComponent
 } from "vue";
-import { createNamespaceFn, isArray, isPlainObject, isString } from "@varlet/shared";
+import {
+  createNamespaceFn,
+  hasOwn,
+  isArray,
+  isFunction,
+  isPlainObject,
+  isString,
+  normalizeToArray
+} from "@varlet/shared";
 function pickProps(props, propsKey) {
   return isArray(propsKey) ? propsKey.reduce((pickedProps, key) => {
     pickedProps[key] = props[key];
@@ -124,17 +132,28 @@ function flatFragment(vNodes) {
   });
   return result;
 }
+function isZodRule(rule) {
+  return isPlainObject(rule) && isFunction(rule.safeParseAsync);
+}
+function isZodResult(result) {
+  return isPlainObject(result) && hasOwn(result, "success");
+}
 function useValidation() {
   const errorMessage = ref("");
-  const validate = (rules, value, apis) => __async(this, null, function* () {
-    if (!isArray(rules) || !rules.length) {
-      return true;
-    }
-    const resArr = yield Promise.all(rules.map((rule) => rule(value, apis)));
+  const validate = (ruleOrRules, value, apis) => __async(this, null, function* () {
+    const rules = normalizeToArray(ruleOrRules).filter((rule) => isZodRule(rule) || isFunction(rule));
+    const results = yield Promise.all(
+      rules.map((rule) => isZodRule(rule) ? rule.safeParseAsync(value) : rule(value, apis))
+    );
     resetValidation();
-    return !resArr.some((res) => {
-      if (res !== true) {
-        errorMessage.value = String(res);
+    return !results.some((result) => {
+      if (isZodResult(result)) {
+        if (result.success === false) {
+          errorMessage.value = result.error.issues[0].message;
+          return true;
+        }
+      } else if (result !== true) {
+        errorMessage.value = String(result);
         return true;
       }
       return false;
@@ -208,6 +227,8 @@ export {
   defineListenerProp,
   flatFragment,
   formatElevation,
+  isZodResult,
+  isZodRule,
   mount,
   mountInstance,
   pickProps,