@element-plus/nightly 0.0.20240412 → 0.0.20240414

package/es/components/upload/src/upload-content2.mjs

@@ -1,39 +1,200 @@
-import { NOOP } from '@vue/shared';
+import { defineComponent, shallowRef, openBlock, createElementBlock, normalizeClass, unref, withKeys, withModifiers, createBlock, withCtx, renderSlot, createElementVNode } from 'vue';
+import { isPlainObject, isFunction } from '@vue/shared';
+import { cloneDeep, isEqual } from 'lodash-unified';
+import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import { uploadBaseProps } from './upload.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import '../../form/index.mjs';
+import UploadDragger from './upload-dragger2.mjs';
+import { uploadContentProps } from './upload-content.mjs';
+import { genFileId } from './upload.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { useFormDisabled } from '../../form/src/hooks/use-form-common-props.mjs';
+import { entriesOf } from '../../../utils/objects.mjs';
 
-const uploadContentProps = buildProps({
-  ...uploadBaseProps,
-  beforeUpload: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onRemove: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onStart: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onSuccess: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onProgress: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onError: {
-    type: definePropType(Function),
-    default: NOOP
-  },
-  onExceed: {
-    type: definePropType(Function),
-    default: NOOP
+const _hoisted_1 = ["onKeydown"];
+const _hoisted_2 = ["name", "multiple", "accept"];
+const __default__ = defineComponent({
+  name: "ElUploadContent",
+  inheritAttrs: false
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: uploadContentProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    const ns = useNamespace("upload");
+    const disabled = useFormDisabled();
+    const requests = shallowRef({});
+    const inputRef = shallowRef();
+    const uploadFiles = (files) => {
+      if (files.length === 0)
+        return;
+      const { autoUpload, limit, fileList, multiple, onStart, onExceed } = props;
+      if (limit && fileList.length + files.length > limit) {
+        onExceed(files, fileList);
+        return;
+      }
+      if (!multiple) {
+        files = files.slice(0, 1);
+      }
+      for (const file of files) {
+        const rawFile = file;
+        rawFile.uid = genFileId();
+        onStart(rawFile);
+        if (autoUpload)
+          upload(rawFile);
+      }
+    };
+    const upload = async (rawFile) => {
+      inputRef.value.value = "";
+      if (!props.beforeUpload) {
+        return doUpload(rawFile);
+      }
+      let hookResult;
+      let beforeData = {};
+      try {
+        const originData = props.data;
+        const beforeUploadPromise = props.beforeUpload(rawFile);
+        beforeData = isPlainObject(props.data) ? cloneDeep(props.data) : props.data;
+        hookResult = await beforeUploadPromise;
+        if (isPlainObject(props.data) && isEqual(originData, beforeData)) {
+          beforeData = cloneDeep(props.data);
+        }
+      } catch (e) {
+        hookResult = false;
+      }
+      if (hookResult === false) {
+        props.onRemove(rawFile);
+        return;
+      }
+      let file = rawFile;
+      if (hookResult instanceof Blob) {
+        if (hookResult instanceof File) {
+          file = hookResult;
+        } else {
+          file = new File([hookResult], rawFile.name, {
+            type: rawFile.type
+          });
+        }
+      }
+      doUpload(Object.assign(file, {
+        uid: rawFile.uid
+      }), beforeData);
+    };
+    const resolveData = async (data, rawFile) => {
+      if (isFunction(data)) {
+        return data(rawFile);
+      }
+      return data;
+    };
+    const doUpload = async (rawFile, beforeData) => {
+      const {
+        headers,
+        data,
+        method,
+        withCredentials,
+        name: filename,
+        action,
+        onProgress,
+        onSuccess,
+        onError,
+        httpRequest
+      } = props;
+      try {
+        beforeData = await resolveData(beforeData != null ? beforeData : data, rawFile);
+      } catch (e) {
+        props.onRemove(rawFile);
+        return;
+      }
+      const { uid } = rawFile;
+      const options = {
+        headers: headers || {},
+        withCredentials,
+        file: rawFile,
+        data: beforeData,
+        method,
+        filename,
+        action,
+        onProgress: (evt) => {
+          onProgress(evt, rawFile);
+        },
+        onSuccess: (res) => {
+          onSuccess(res, rawFile);
+          delete requests.value[uid];
+        },
+        onError: (err) => {
+          onError(err, rawFile);
+          delete requests.value[uid];
+        }
+      };
+      const request = httpRequest(options);
+      requests.value[uid] = request;
+      if (request instanceof Promise) {
+        request.then(options.onSuccess, options.onError);
+      }
+    };
+    const handleChange = (e) => {
+      const files = e.target.files;
+      if (!files)
+        return;
+      uploadFiles(Array.from(files));
+    };
+    const handleClick = () => {
+      if (!disabled.value) {
+        inputRef.value.value = "";
+        inputRef.value.click();
+      }
+    };
+    const handleKeydown = () => {
+      handleClick();
+    };
+    const abort = (file) => {
+      const _reqs = entriesOf(requests.value).filter(file ? ([uid]) => String(file.uid) === uid : () => true);
+      _reqs.forEach(([uid, req]) => {
+        if (req instanceof XMLHttpRequest)
+          req.abort();
+        delete requests.value[uid];
+      });
+    };
+    expose({
+      abort,
+      upload
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass([unref(ns).b(), unref(ns).m(_ctx.listType), unref(ns).is("drag", _ctx.drag)]),
+        tabindex: "0",
+        onClick: handleClick,
+        onKeydown: withKeys(withModifiers(handleKeydown, ["self"]), ["enter", "space"])
+      }, [
+        _ctx.drag ? (openBlock(), createBlock(UploadDragger, {
+          key: 0,
+          disabled: unref(disabled),
+          onFile: uploadFiles
+        }, {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "default")
+          ]),
+          _: 3
+        }, 8, ["disabled"])) : renderSlot(_ctx.$slots, "default", { key: 1 }),
+        createElementVNode("input", {
+          ref_key: "inputRef",
+          ref: inputRef,
+          class: normalizeClass(unref(ns).e("input")),
+          name: _ctx.name,
+          multiple: _ctx.multiple,
+          accept: _ctx.accept,
+          type: "file",
+          onChange: handleChange,
+          onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+          }, ["stop"]))
+        }, null, 42, _hoisted_2)
+      ], 42, _hoisted_1);
+    };
   }
 });
+var UploadContent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "upload-content.vue"]]);
 
-export { uploadContentProps };
+export { UploadContent as default };
 //# sourceMappingURL=upload-content2.mjs.map

package/es/components/upload/src/upload-content2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"upload-content2.mjs","sources":["../../../../../../packages/components/upload/src/upload-content.ts"],"sourcesContent":["import { NOOP } from '@vue/shared'\nimport { buildProps, definePropType } from '@element-plus/utils'\nimport { uploadBaseProps } from './upload'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type {\n  UploadFile,\n  UploadHooks,\n  UploadProgressEvent,\n  UploadRawFile,\n} from './upload'\nimport type UploadContent from './upload-content.vue'\nimport type { UploadAjaxError } from './ajax'\n\nexport const uploadContentProps = buildProps({\n  ...uploadBaseProps,\n\n  beforeUpload: {\n    type: definePropType<UploadHooks['beforeUpload']>(Function),\n    default: NOOP,\n  },\n  onRemove: {\n    type: definePropType<\n      (file: UploadFile | UploadRawFile, rawFile?: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onStart: {\n    type: definePropType<(rawFile: UploadRawFile) => void>(Function),\n    default: NOOP,\n  },\n  onSuccess: {\n    type: definePropType<(response: any, rawFile: UploadRawFile) => unknown>(\n      Function\n    ),\n    default: NOOP,\n  },\n  onProgress: {\n    type: definePropType<\n      (evt: UploadProgressEvent, rawFile: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onError: {\n    type: definePropType<\n      (err: UploadAjaxError, rawFile: UploadRawFile) => void\n    >(Function),\n    default: NOOP,\n  },\n  onExceed: {\n    type: definePropType<UploadHooks['onExceed']>(Function),\n    default: NOOP,\n  },\n} as const)\n\nexport type UploadContentProps = ExtractPropTypes<typeof uploadContentProps>\n\nexport type UploadContentInstance = InstanceType<typeof UploadContent>\n"],"names":[],"mappings":";;;;;AAGY,MAAC,kBAAkB,GAAG,UAAU,CAAC;AAC7C,EAAE,GAAG,eAAe;AACpB,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"upload-content2.mjs","sources":["../../../../../../packages/components/upload/src/upload-content.vue"],"sourcesContent":["<template>\n  <div\n    :class=\"[ns.b(), ns.m(listType), ns.is('drag', drag)]\"\n    tabindex=\"0\"\n    @click=\"handleClick\"\n    @keydown.self.enter.space=\"handleKeydown\"\n  >\n    <template v-if=\"drag\">\n      <upload-dragger :disabled=\"disabled\" @file=\"uploadFiles\">\n        <slot />\n      </upload-dragger>\n    </template>\n    <template v-else>\n      <slot />\n    </template>\n    <input\n      ref=\"inputRef\"\n      :class=\"ns.e('input')\"\n      :name=\"name\"\n      :multiple=\"multiple\"\n      :accept=\"accept\"\n      type=\"file\"\n      @change=\"handleChange\"\n      @click.stop\n    />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { shallowRef } from 'vue'\nimport { isPlainObject } from '@vue/shared'\nimport { cloneDeep, isEqual } from 'lodash-unified'\nimport { useNamespace } from '@element-plus/hooks'\nimport { entriesOf, isFunction } from '@element-plus/utils'\nimport { useFormDisabled } from '@element-plus/components/form'\nimport UploadDragger from './upload-dragger.vue'\nimport { uploadContentProps } from './upload-content'\nimport { genFileId } from './upload'\nimport type { UploadContentProps } from './upload-content'\n\nimport type {\n  UploadFile,\n  UploadHooks,\n  UploadRawFile,\n  UploadRequestOptions,\n} from './upload'\n\ndefineOptions({\n  name: 'ElUploadContent',\n  inheritAttrs: false,\n})\n\nconst props = defineProps(uploadContentProps)\nconst ns = useNamespace('upload')\nconst disabled = useFormDisabled()\n\nconst requests = shallowRef<Record<string, XMLHttpRequest | Promise<unknown>>>(\n  {}\n)\nconst inputRef = shallowRef<HTMLInputElement>()\n\nconst uploadFiles = (files: File[]) => {\n  if (files.length === 0) return\n\n  const { autoUpload, limit, fileList, multiple, onStart, onExceed } = props\n\n  if (limit && fileList.length + files.length > limit) {\n    onExceed(files, fileList)\n    return\n  }\n\n  if (!multiple) {\n    files = files.slice(0, 1)\n  }\n\n  for (const file of files) {\n    const rawFile = file as UploadRawFile\n    rawFile.uid = genFileId()\n    onStart(rawFile)\n    if (autoUpload) upload(rawFile)\n  }\n}\n\nconst upload = async (rawFile: UploadRawFile): Promise<void> => {\n  inputRef.value!.value = ''\n\n  if (!props.beforeUpload) {\n    return doUpload(rawFile)\n  }\n\n  let hookResult: Exclude<ReturnType<UploadHooks['beforeUpload']>, Promise<any>>\n  let beforeData: UploadContentProps['data'] = {}\n\n  try {\n    // origin data: Handle data changes after synchronization tasks are executed\n    const originData = props.data\n    const beforeUploadPromise = props.beforeUpload(rawFile)\n    beforeData = isPlainObject(props.data) ? cloneDeep(props.data) : props.data\n    hookResult = await beforeUploadPromise\n    if (isPlainObject(props.data) && isEqual(originData, beforeData)) {\n      beforeData = cloneDeep(props.data)\n    }\n  } catch {\n    hookResult = false\n  }\n\n  if (hookResult === false) {\n    props.onRemove(rawFile)\n    return\n  }\n\n  let file: File = rawFile\n  if (hookResult instanceof Blob) {\n    if (hookResult instanceof File) {\n      file = hookResult\n    } else {\n      file = new File([hookResult], rawFile.name, {\n        type: rawFile.type,\n      })\n    }\n  }\n\n  doUpload(\n    Object.assign(file, {\n      uid: rawFile.uid,\n    }),\n    beforeData\n  )\n}\n\nconst resolveData = async (\n  data: UploadContentProps['data'],\n  rawFile: UploadRawFile\n): Promise<Record<string, any>> => {\n  if (isFunction(data)) {\n    return data(rawFile)\n  }\n\n  return data\n}\n\nconst doUpload = async (\n  rawFile: UploadRawFile,\n  beforeData?: UploadContentProps['data']\n) => {\n  const {\n    headers,\n    data,\n    method,\n    withCredentials,\n    name: filename,\n    action,\n    onProgress,\n    onSuccess,\n    onError,\n    httpRequest,\n  } = props\n\n  try {\n    beforeData = await resolveData(beforeData ?? data, rawFile)\n  } catch {\n    props.onRemove(rawFile)\n    return\n  }\n\n  const { uid } = rawFile\n  const options: UploadRequestOptions = {\n    headers: headers || {},\n    withCredentials,\n    file: rawFile,\n    data: beforeData,\n    method,\n    filename,\n    action,\n    onProgress: (evt) => {\n      onProgress(evt, rawFile)\n    },\n    onSuccess: (res) => {\n      onSuccess(res, rawFile)\n      delete requests.value[uid]\n    },\n    onError: (err) => {\n      onError(err, rawFile)\n      delete requests.value[uid]\n    },\n  }\n  const request = httpRequest(options)\n  requests.value[uid] = request\n  if (request instanceof Promise) {\n    request.then(options.onSuccess, options.onError)\n  }\n}\n\nconst handleChange = (e: Event) => {\n  const files = (e.target as HTMLInputElement).files\n  if (!files) return\n  uploadFiles(Array.from(files))\n}\n\nconst handleClick = () => {\n  if (!disabled.value) {\n    inputRef.value!.value = ''\n    inputRef.value!.click()\n  }\n}\n\nconst handleKeydown = () => {\n  handleClick()\n}\n\nconst abort = (file?: UploadFile) => {\n  const _reqs = entriesOf(requests.value).filter(\n    file ? ([uid]) => String(file.uid) === uid : () => true\n  )\n  _reqs.forEach(([uid, req]) => {\n    if (req instanceof XMLHttpRequest) req.abort()\n    delete requests.value[uid]\n  })\n}\n\ndefineExpose({\n  abort,\n  upload,\n})\n</script>\n"],"names":[],"mappings":"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"}

package/es/components/upload/src/upload2.mjs

@@ -2,7 +2,7 @@ import { defineComponent, shallowRef, computed, onBeforeUnmount, provide, toRef,
 import '../../form/index.mjs';
 import { uploadContextKey } from './constants.mjs';
 import UploadList from './upload-list2.mjs';
-import UploadContent from './upload-content.mjs';
+import UploadContent from './upload-content2.mjs';
 import { useHandlers } from './use-handlers.mjs';
 import { uploadProps } from './upload.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';

package/es/index.mjs

@@ -143,7 +143,7 @@ export { selectGroupKey, selectKey } from './components/select/src/token.mjs';
 export { ElOption, ElOptionGroup, ElSelect } from './components/select/index.mjs';
 export { selectV2InjectionKey } from './components/select-v2/src/token.mjs';
 export { ElSelectV2 } from './components/select-v2/index.mjs';
-export { skeletonProps } from './components/skeleton/src/skeleton.mjs';
+export { skeletonProps } from './components/skeleton/src/skeleton2.mjs';
 export { skeletonItemProps } from './components/skeleton/src/skeleton-item.mjs';
 export { ElSkeleton, ElSkeletonItem } from './components/skeleton/index.mjs';
 export { sliderEmits, sliderProps } from './components/slider/src/slider.mjs';
@@ -191,13 +191,13 @@ export { useTooltipTriggerProps } from './components/tooltip/src/trigger.mjs';
 export { useTooltipContentProps } from './components/tooltip/src/content.mjs';
 export { TOOLTIP_INJECTION_KEY } from './components/tooltip/src/constants.mjs';
 export { ElTooltip } from './components/tooltip/index.mjs';
-export { LEFT_CHECK_CHANGE_EVENT, RIGHT_CHECK_CHANGE_EVENT, transferCheckedChangeFn, transferEmits, transferProps } from './components/transfer/src/transfer.mjs';
+export { LEFT_CHECK_CHANGE_EVENT, RIGHT_CHECK_CHANGE_EVENT, transferCheckedChangeFn, transferEmits, transferProps } from './components/transfer/src/transfer2.mjs';
 export { ElTransfer } from './components/transfer/index.mjs';
 export { ElTree } from './components/tree/index.mjs';
 export { ElTreeSelect } from './components/tree-select/index.mjs';
 export { ElTreeV2 } from './components/tree-v2/index.mjs';
 export { genFileId, uploadBaseProps, uploadListTypes, uploadProps } from './components/upload/src/upload.mjs';
-export { uploadContentProps } from './components/upload/src/upload-content2.mjs';
+export { uploadContentProps } from './components/upload/src/upload-content.mjs';
 export { uploadListEmits, uploadListProps } from './components/upload/src/upload-list.mjs';
 export { uploadDraggerEmits, uploadDraggerProps } from './components/upload/src/upload-dragger.mjs';
 export { uploadContextKey } from './components/upload/src/constants.mjs';
@@ -219,7 +219,7 @@ export { ElInfiniteScroll } from './components/infinite-scroll/index.mjs';
 export { ElLoading } from './components/loading/index.mjs';
 export { vLoading as ElLoadingDirective, vLoading } from './components/loading/src/directive.mjs';
 export { Loading as ElLoadingService } from './components/loading/src/service.mjs';
-export { messageDefaults, messageEmits, messageProps, messageTypes } from './components/message/src/message2.mjs';
+export { messageDefaults, messageEmits, messageProps, messageTypes } from './components/message/src/message.mjs';
 export { ElMessage } from './components/message/index.mjs';
 export { ElMessageBox } from './components/message-box/index.mjs';
 export { notificationEmits, notificationProps, notificationTypes } from './components/notification/src/notification.mjs';

package/es/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.0.20240412";
+export declare const version = "0.0.20240414";

package/es/version.mjs

@@ -1,4 +1,4 @@
-const version = "0.0.20240412";
+const version = "0.0.20240414";
 
 export { version };
 //# sourceMappingURL=version.mjs.map

package/es/version.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"version.mjs","sources":["../../../packages/element-plus/version.ts"],"sourcesContent":["export const version = '0.0.20240412'\n"],"names":[],"mappings":"AAAY,MAAC,OAAO,GAAG;;;;"}
+{"version":3,"file":"version.mjs","sources":["../../../packages/element-plus/version.ts"],"sourcesContent":["export const version = '0.0.20240414'\n"],"names":[],"mappings":"AAAY,MAAC,OAAO,GAAG;;;;"}

package/lib/components/index.js

@@ -170,7 +170,7 @@ var thumb = require('./scrollbar/src/thumb.js');
 var constants$d = require('./scrollbar/src/constants.js');
 var token = require('./select/src/token.js');
 var token$1 = require('./select-v2/src/token.js');
-var skeleton = require('./skeleton/src/skeleton.js');
+var skeleton = require('./skeleton/src/skeleton2.js');
 var skeletonItem = require('./skeleton/src/skeleton-item.js');
 var slider = require('./slider/src/slider.js');
 var constants$e = require('./slider/src/constants.js');
@@ -203,9 +203,9 @@ var tooltip = require('./tooltip/src/tooltip.js');
 var trigger$2 = require('./tooltip/src/trigger.js');
 var content$2 = require('./tooltip/src/content.js');
 var constants$i = require('./tooltip/src/constants.js');
-var transfer = require('./transfer/src/transfer.js');
+var transfer = require('./transfer/src/transfer2.js');
 var upload = require('./upload/src/upload.js');
-var uploadContent = require('./upload/src/upload-content2.js');
+var uploadContent = require('./upload/src/upload-content.js');
 var uploadList = require('./upload/src/upload-list.js');
 var uploadDragger = require('./upload/src/upload-dragger.js');
 var constants$j = require('./upload/src/constants.js');
@@ -220,7 +220,7 @@ var anchor = require('./anchor/src/anchor.js');
 var segmented = require('./segmented/src/segmented.js');
 var directive = require('./loading/src/directive.js');
 var service = require('./loading/src/service.js');
-var message = require('./message/src/message2.js');
+var message = require('./message/src/message.js');
 var notification = require('./notification/src/notification.js');
 var popover = require('./popover/src/popover.js');
 

package/lib/components/message/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../../utils/index.js');
 var method = require('./src/method.js');
-var message = require('./src/message2.js');
+var message = require('./src/message.js');
 var install = require('../../utils/vue/install.js');
 
 const ElMessage = install.withInstallFunction(method["default"], "$message");

package/lib/components/message/src/message.js

@@ -2,159 +2,104 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
-var core = require('@vueuse/core');
 require('../../../utils/index.js');
-require('../../../constants/index.js');
-var index = require('../../badge/index.js');
-require('../../config-provider/index.js');
-var index$1 = require('../../icon/index.js');
-var message = require('./message2.js');
-var instance = require('./instance.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var typescript = require('../../../utils/typescript.js');
+var core = require('@vueuse/core');
+var runtime = require('../../../utils/vue/props/runtime.js');
 var icon = require('../../../utils/vue/icon.js');
-var useGlobalConfig = require('../../config-provider/src/hooks/use-global-config.js');
-var aria = require('../../../constants/aria.js');
 
-const _hoisted_1 = ["id"];
-const _hoisted_2 = ["innerHTML"];
-const __default__ = vue.defineComponent({
-  name: "ElMessage"
+const messageTypes = ["success", "info", "warning", "error"];
+const messageDefaults = typescript.mutable({
+  customClass: "",
+  center: false,
+  dangerouslyUseHTMLString: false,
+  duration: 3e3,
+  icon: void 0,
+  id: "",
+  message: "",
+  onClose: void 0,
+  showClose: false,
+  type: "info",
+  plain: false,
+  offset: 16,
+  zIndex: 0,
+  grouping: false,
+  repeatNum: 1,
+  appendTo: core.isClient ? document.body : void 0
 });
-const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
-  props: message.messageProps,
-  emits: message.messageEmits,
-  setup(__props, { expose }) {
-    const props = __props;
-    const { Close } = icon.TypeComponents;
-    const { ns, zIndex } = useGlobalConfig.useGlobalComponentSettings("message");
-    const { currentZIndex, nextZIndex } = zIndex;
-    const messageRef = vue.ref();
-    const visible = vue.ref(false);
-    const height = vue.ref(0);
-    let stopTimer = void 0;
-    const badgeType = vue.computed(() => props.type ? props.type === "error" ? "danger" : props.type : "info");
-    const typeClass = vue.computed(() => {
-      const type = props.type;
-      return { [ns.bm("icon", type)]: type && icon.TypeComponentsMap[type] };
-    });
-    const iconComponent = vue.computed(() => props.icon || icon.TypeComponentsMap[props.type] || "");
-    const lastOffset = vue.computed(() => instance.getLastOffset(props.id));
-    const offset = vue.computed(() => instance.getOffsetOrSpace(props.id, props.offset) + lastOffset.value);
-    const bottom = vue.computed(() => height.value + offset.value);
-    const customStyle = vue.computed(() => ({
-      top: `${offset.value}px`,
-      zIndex: currentZIndex.value
-    }));
-    function startTimer() {
-      if (props.duration === 0)
-        return;
-      ({ stop: stopTimer } = core.useTimeoutFn(() => {
-        close();
-      }, props.duration));
-    }
-    function clearTimer() {
-      stopTimer == null ? void 0 : stopTimer();
-    }
-    function close() {
-      visible.value = false;
-    }
-    function keydown({ code }) {
-      if (code === aria.EVENT_CODE.esc) {
-        close();
-      }
-    }
-    vue.onMounted(() => {
-      startTimer();
-      nextZIndex();
-      visible.value = true;
-    });
-    vue.watch(() => props.repeatNum, () => {
-      clearTimer();
-      startTimer();
-    });
-    core.useEventListener(document, "keydown", keydown);
-    core.useResizeObserver(messageRef, () => {
-      height.value = messageRef.value.getBoundingClientRect().height;
-    });
-    expose({
-      visible,
-      bottom,
-      close
-    });
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.Transition, {
-        name: vue.unref(ns).b("fade"),
-        onBeforeLeave: _ctx.onClose,
-        onAfterLeave: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("destroy")),
-        persisted: ""
-      }, {
-        default: vue.withCtx(() => [
-          vue.withDirectives(vue.createElementVNode("div", {
-            id: _ctx.id,
-            ref_key: "messageRef",
-            ref: messageRef,
-            class: vue.normalizeClass([
-              vue.unref(ns).b(),
-              { [vue.unref(ns).m(_ctx.type)]: _ctx.type },
-              vue.unref(ns).is("center", _ctx.center),
-              vue.unref(ns).is("closable", _ctx.showClose),
-              vue.unref(ns).is("plain", _ctx.plain),
-              _ctx.customClass
-            ]),
-            style: vue.normalizeStyle(vue.unref(customStyle)),
-            role: "alert",
-            onMouseenter: clearTimer,
-            onMouseleave: startTimer
-          }, [
-            _ctx.repeatNum > 1 ? (vue.openBlock(), vue.createBlock(vue.unref(index.ElBadge), {
-              key: 0,
-              value: _ctx.repeatNum,
-              type: vue.unref(badgeType),
-              class: vue.normalizeClass(vue.unref(ns).e("badge"))
-            }, null, 8, ["value", "type", "class"])) : vue.createCommentVNode("v-if", true),
-            vue.unref(iconComponent) ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.ElIcon), {
-              key: 1,
-              class: vue.normalizeClass([vue.unref(ns).e("icon"), vue.unref(typeClass)])
-            }, {
-              default: vue.withCtx(() => [
-                (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(iconComponent))))
-              ]),
-              _: 1
-            }, 8, ["class"])) : vue.createCommentVNode("v-if", true),
-            vue.renderSlot(_ctx.$slots, "default", {}, () => [
-              !_ctx.dangerouslyUseHTMLString ? (vue.openBlock(), vue.createElementBlock("p", {
-                key: 0,
-                class: vue.normalizeClass(vue.unref(ns).e("content"))
-              }, vue.toDisplayString(_ctx.message), 3)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-                vue.createCommentVNode(" Caution here, message could've been compromised, never use user's input as message "),
-                vue.createElementVNode("p", {
-                  class: vue.normalizeClass(vue.unref(ns).e("content")),
-                  innerHTML: _ctx.message
-                }, null, 10, _hoisted_2)
-              ], 2112))
-            ]),
-            _ctx.showClose ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.ElIcon), {
-              key: 2,
-              class: vue.normalizeClass(vue.unref(ns).e("closeBtn")),
-              onClick: vue.withModifiers(close, ["stop"])
-            }, {
-              default: vue.withCtx(() => [
-                vue.createVNode(vue.unref(Close))
-              ]),
-              _: 1
-            }, 8, ["class", "onClick"])) : vue.createCommentVNode("v-if", true)
-          ], 46, _hoisted_1), [
-            [vue.vShow, visible.value]
-          ])
-        ]),
-        _: 3
-      }, 8, ["name", "onBeforeLeave"]);
-    };
+const messageProps = runtime.buildProps({
+  customClass: {
+    type: String,
+    default: messageDefaults.customClass
+  },
+  center: {
+    type: Boolean,
+    default: messageDefaults.center
+  },
+  dangerouslyUseHTMLString: {
+    type: Boolean,
+    default: messageDefaults.dangerouslyUseHTMLString
+  },
+  duration: {
+    type: Number,
+    default: messageDefaults.duration
+  },
+  icon: {
+    type: icon.iconPropType,
+    default: messageDefaults.icon
+  },
+  id: {
+    type: String,
+    default: messageDefaults.id
+  },
+  message: {
+    type: runtime.definePropType([
+      String,
+      Object,
+      Function
+    ]),
+    default: messageDefaults.message
+  },
+  onClose: {
+    type: runtime.definePropType(Function),
+    default: messageDefaults.onClose
+  },
+  showClose: {
+    type: Boolean,
+    default: messageDefaults.showClose
+  },
+  type: {
+    type: String,
+    values: messageTypes,
+    default: messageDefaults.type
+  },
+  plain: {
+    type: Boolean,
+    default: messageDefaults.plain
+  },
+  offset: {
+    type: Number,
+    default: messageDefaults.offset
+  },
+  zIndex: {
+    type: Number,
+    default: messageDefaults.zIndex
+  },
+  grouping: {
+    type: Boolean,
+    default: messageDefaults.grouping
+  },
+  repeatNum: {
+    type: Number,
+    default: messageDefaults.repeatNum
   }
 });
-var MessageConstructor = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "message.vue"]]);
+const messageEmits = {
+  destroy: () => true
+};
 
-exports["default"] = MessageConstructor;
+exports.messageDefaults = messageDefaults;
+exports.messageEmits = messageEmits;
+exports.messageProps = messageProps;
+exports.messageTypes = messageTypes;
 //# sourceMappingURL=message.js.map