@element-plus/nightly 0.0.20220722 → 0.0.20220723

package/lib/components/calendar/src/calendar2.js

@@ -2,27 +2,244 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
+var dayjs = require('dayjs');
+var index$2 = require('../../button/index.js');
+require('../../../hooks/index.js');
 require('../../../utils/index.js');
 require('../../../constants/index.js');
-var shared = require('@vue/shared');
-var runtime = require('../../../utils/vue/props/runtime.js');
+var dateTable = require('./date-table2.js');
+var calendar = require('./calendar.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var index$1 = require('../../../hooks/use-locale/index.js');
 var event = require('../../../constants/event.js');
+var error = require('../../../utils/error.js');
 
-const isValidRange = (range) => shared.isArray(range) && range.length === 2 && range.every((item) => shared.isDate(item));
-const calendarProps = runtime.buildProps({
-  modelValue: {
-    type: Date
-  },
-  range: {
-    type: runtime.definePropType(Array),
-    validator: isValidRange
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
+
+const __default__ = {
+  name: "ElCalendar"
+};
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: calendar.calendarProps,
+  emits: calendar.calendarEmits,
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const COMPONENT_NAME = "ElCalendar";
+    const ns = index.useNamespace("calendar");
+    const { t, lang } = index$1.useLocale();
+    const selectedDay = vue.ref();
+    const now = dayjs__default["default"]().locale(lang.value);
+    const realSelectedDay = vue.computed({
+      get() {
+        if (!props.modelValue)
+          return selectedDay.value;
+        return date.value;
+      },
+      set(val) {
+        if (!val)
+          return;
+        selectedDay.value = val;
+        const result = val.toDate();
+        emit(event.INPUT_EVENT, result);
+        emit(event.UPDATE_MODEL_EVENT, result);
+      }
+    });
+    const validatedRange = vue.computed(() => {
+      if (!props.range)
+        return [];
+      const rangeArrDayjs = props.range.map((_) => dayjs__default["default"](_).locale(lang.value));
+      const [startDayjs, endDayjs] = rangeArrDayjs;
+      if (startDayjs.isAfter(endDayjs)) {
+        error.debugWarn(COMPONENT_NAME, "end time should be greater than start time");
+        return [];
+      }
+      if (startDayjs.isSame(endDayjs, "month")) {
+        return calculateValidatedDateRange(startDayjs, endDayjs);
+      } else {
+        if (startDayjs.add(1, "month").month() !== endDayjs.month()) {
+          error.debugWarn(COMPONENT_NAME, "start time and end time interval must not exceed two months");
+          return [];
+        }
+        return calculateValidatedDateRange(startDayjs, endDayjs);
+      }
+    });
+    const date = vue.computed(() => {
+      if (!props.modelValue) {
+        if (realSelectedDay.value) {
+          return realSelectedDay.value;
+        } else if (validatedRange.value.length) {
+          return validatedRange.value[0][0];
+        }
+        return now;
+      } else {
+        return dayjs__default["default"](props.modelValue).locale(lang.value);
+      }
+    });
+    const prevMonthDayjs = vue.computed(() => date.value.subtract(1, "month").date(1));
+    const nextMonthDayjs = vue.computed(() => date.value.add(1, "month").date(1));
+    const prevYearDayjs = vue.computed(() => date.value.subtract(1, "year").date(1));
+    const nextYearDayjs = vue.computed(() => date.value.add(1, "year").date(1));
+    const i18nDate = vue.computed(() => {
+      const pickedMonth = `el.datepicker.month${date.value.format("M")}`;
+      return `${date.value.year()} ${t("el.datepicker.year")} ${t(pickedMonth)}`;
+    });
+    const calculateValidatedDateRange = (startDayjs, endDayjs) => {
+      const firstDay = startDayjs.startOf("week");
+      const lastDay = endDayjs.endOf("week");
+      const firstMonth = firstDay.get("month");
+      const lastMonth = lastDay.get("month");
+      if (firstMonth === lastMonth) {
+        return [[firstDay, lastDay]];
+      } else if (firstMonth + 1 === lastMonth) {
+        const firstMonthLastDay = firstDay.endOf("month");
+        const lastMonthFirstDay = lastDay.startOf("month");
+        const isSameWeek = firstMonthLastDay.isSame(lastMonthFirstDay, "week");
+        const lastMonthStartDay = isSameWeek ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
+        return [
+          [firstDay, firstMonthLastDay],
+          [lastMonthStartDay.startOf("week"), lastDay]
+        ];
+      } else if (firstMonth + 2 === lastMonth || (firstMonth + 1) % 11 === lastMonth) {
+        const firstMonthLastDay = firstDay.endOf("month");
+        const secondMonthFirstDay = firstDay.add(1, "month").startOf("month");
+        const secondMonthStartDay = firstMonthLastDay.isSame(secondMonthFirstDay, "week") ? secondMonthFirstDay.add(1, "week") : secondMonthFirstDay;
+        const secondMonthLastDay = secondMonthStartDay.endOf("month");
+        const lastMonthFirstDay = lastDay.startOf("month");
+        const lastMonthStartDay = secondMonthLastDay.isSame(lastMonthFirstDay, "week") ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
+        return [
+          [firstDay, firstMonthLastDay],
+          [secondMonthStartDay.startOf("week"), secondMonthLastDay],
+          [lastMonthStartDay.startOf("week"), lastDay]
+        ];
+      } else {
+        error.debugWarn(COMPONENT_NAME, "start time and end time interval must not exceed two months");
+        return [];
+      }
+    };
+    const pickDay = (day) => {
+      realSelectedDay.value = day;
+    };
+    const selectDate = (type) => {
+      let day;
+      if (type === "prev-month") {
+        day = prevMonthDayjs.value;
+      } else if (type === "next-month") {
+        day = nextMonthDayjs.value;
+      } else if (type === "prev-year") {
+        day = prevYearDayjs.value;
+      } else if (type === "next-year") {
+        day = nextYearDayjs.value;
+      } else {
+        day = now;
+      }
+      if (day.isSame(date.value, "day"))
+        return;
+      pickDay(day);
+    };
+    expose({
+      selectedDay: realSelectedDay,
+      pickDay,
+      selectDate,
+      calculateValidatedDateRange
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", {
+        class: vue.normalizeClass(vue.unref(ns).b())
+      }, [
+        vue.createElementVNode("div", {
+          class: vue.normalizeClass(vue.unref(ns).e("header"))
+        }, [
+          vue.renderSlot(_ctx.$slots, "header", { date: vue.unref(i18nDate) }, () => [
+            vue.createElementVNode("div", {
+              class: vue.normalizeClass(vue.unref(ns).e("title"))
+            }, vue.toDisplayString(vue.unref(i18nDate)), 3),
+            vue.unref(validatedRange).length === 0 ? (vue.openBlock(), vue.createElementBlock("div", {
+              key: 0,
+              class: vue.normalizeClass(vue.unref(ns).e("button-group"))
+            }, [
+              vue.createVNode(vue.unref(index$2.ElButtonGroup), null, {
+                default: vue.withCtx(() => [
+                  vue.createVNode(vue.unref(index$2.ElButton), {
+                    size: "small",
+                    onClick: _cache[0] || (_cache[0] = ($event) => selectDate("prev-month"))
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createTextVNode(vue.toDisplayString(vue.unref(t)("el.datepicker.prevMonth")), 1)
+                    ]),
+                    _: 1
+                  }),
+                  vue.createVNode(vue.unref(index$2.ElButton), {
+                    size: "small",
+                    onClick: _cache[1] || (_cache[1] = ($event) => selectDate("today"))
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createTextVNode(vue.toDisplayString(vue.unref(t)("el.datepicker.today")), 1)
+                    ]),
+                    _: 1
+                  }),
+                  vue.createVNode(vue.unref(index$2.ElButton), {
+                    size: "small",
+                    onClick: _cache[2] || (_cache[2] = ($event) => selectDate("next-month"))
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createTextVNode(vue.toDisplayString(vue.unref(t)("el.datepicker.nextMonth")), 1)
+                    ]),
+                    _: 1
+                  })
+                ]),
+                _: 1
+              })
+            ], 2)) : vue.createCommentVNode("v-if", true)
+          ])
+        ], 2),
+        vue.unref(validatedRange).length === 0 ? (vue.openBlock(), vue.createElementBlock("div", {
+          key: 0,
+          class: vue.normalizeClass(vue.unref(ns).e("body"))
+        }, [
+          vue.createVNode(dateTable["default"], {
+            date: vue.unref(date),
+            "selected-day": vue.unref(realSelectedDay),
+            onPick: pickDay
+          }, vue.createSlots({ _: 2 }, [
+            _ctx.$slots.dateCell ? {
+              name: "dateCell",
+              fn: vue.withCtx((data) => [
+                vue.renderSlot(_ctx.$slots, "dateCell", vue.normalizeProps(vue.guardReactiveProps(data)))
+              ])
+            } : void 0
+          ]), 1032, ["date", "selected-day"])
+        ], 2)) : (vue.openBlock(), vue.createElementBlock("div", {
+          key: 1,
+          class: vue.normalizeClass(vue.unref(ns).e("body"))
+        }, [
+          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(validatedRange), (range_, index) => {
+            return vue.openBlock(), vue.createBlock(dateTable["default"], {
+              key: index,
+              date: range_[0],
+              "selected-day": vue.unref(realSelectedDay),
+              range: range_,
+              "hide-header": index !== 0,
+              onPick: pickDay
+            }, vue.createSlots({ _: 2 }, [
+              _ctx.$slots.dateCell ? {
+                name: "dateCell",
+                fn: vue.withCtx((data) => [
+                  vue.renderSlot(_ctx.$slots, "dateCell", vue.normalizeProps(vue.guardReactiveProps(data)))
+                ])
+              } : void 0
+            ]), 1032, ["date", "selected-day", "range", "hide-header"]);
+          }), 128))
+        ], 2))
+      ], 2);
+    };
   }
 });
-const calendarEmits = {
-  [event.UPDATE_MODEL_EVENT]: (value) => shared.isDate(value),
-  [event.INPUT_EVENT]: (value) => shared.isDate(value)
-};
+var Calendar = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/calendar/src/calendar.vue"]]);
 
-exports.calendarEmits = calendarEmits;
-exports.calendarProps = calendarProps;
+exports["default"] = Calendar;
 //# sourceMappingURL=calendar2.js.map

package/lib/components/calendar/src/calendar2.js.map

@@ -1 +1 @@
-{"version":3,"file":"calendar2.js","sources":["../../../../../../packages/components/calendar/src/calendar.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  isArray,\n  isDate,\n} from '@element-plus/utils'\nimport { INPUT_EVENT, UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type Calendar from './calendar.vue'\n\nexport type CalendarDateType =\n  | 'prev-month'\n  | 'next-month'\n  | 'prev-year'\n  | 'next-year'\n  | 'today'\n\nconst isValidRange = (range: unknown): range is [Date, Date] =>\n  isArray(range) && range.length === 2 && range.every((item) => isDate(item))\n\nexport const calendarProps = buildProps({\n  modelValue: {\n    type: Date,\n  },\n  range: {\n    type: definePropType<[Date, Date]>(Array),\n    validator: isValidRange,\n  },\n} as const)\nexport type CalendarProps = ExtractPropTypes<typeof calendarProps>\n\nexport const calendarEmits = {\n  [UPDATE_MODEL_EVENT]: (value: Date) => isDate(value),\n  [INPUT_EVENT]: (value: Date) => isDate(value),\n}\nexport type CalendarEmits = typeof calendarEmits\n\nexport type CalendarInstance = InstanceType<typeof Calendar>\n"],"names":["isArray","isDate","buildProps","definePropType","UPDATE_MODEL_EVENT","INPUT_EVENT"],"mappings":";;;;;;;;;;AAOA,MAAM,YAAY,GAAG,CAAC,KAAK,KAAKA,cAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,KAAKC,aAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAChG,MAAC,aAAa,GAAGC,kBAAU,CAAC;AACxC,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,IAAI;AACd,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAEC,sBAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,SAAS,EAAE,YAAY;AAC3B,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,CAACC,wBAAkB,GAAG,CAAC,KAAK,KAAKH,aAAM,CAAC,KAAK,CAAC;AAChD,EAAE,CAACI,iBAAW,GAAG,CAAC,KAAK,KAAKJ,aAAM,CAAC,KAAK,CAAC;AACzC;;;;;"}
+{"version":3,"file":"calendar2.js","sources":["../../../../../../packages/components/calendar/src/calendar.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b()\">\n    <div :class=\"ns.e('header')\">\n      <slot name=\"header\" :date=\"i18nDate\">\n        <div :class=\"ns.e('title')\">{{ i18nDate }}</div>\n        <div v-if=\"validatedRange.length === 0\" :class=\"ns.e('button-group')\">\n          <el-button-group>\n            <el-button size=\"small\" @click=\"selectDate('prev-month')\">\n              {{ t('el.datepicker.prevMonth') }}\n            </el-button>\n            <el-button size=\"small\" @click=\"selectDate('today')\">\n              {{ t('el.datepicker.today') }}\n            </el-button>\n            <el-button size=\"small\" @click=\"selectDate('next-month')\">\n              {{ t('el.datepicker.nextMonth') }}\n            </el-button>\n          </el-button-group>\n        </div>\n      </slot>\n    </div>\n    <div v-if=\"validatedRange.length === 0\" :class=\"ns.e('body')\">\n      <date-table :date=\"date\" :selected-day=\"realSelectedDay\" @pick=\"pickDay\">\n        <template v-if=\"$slots.dateCell\" #dateCell=\"data\">\n          <slot name=\"dateCell\" v-bind=\"data\" />\n        </template>\n      </date-table>\n    </div>\n    <div v-else :class=\"ns.e('body')\">\n      <date-table\n        v-for=\"(range_, index) in validatedRange\"\n        :key=\"index\"\n        :date=\"range_[0]\"\n        :selected-day=\"realSelectedDay\"\n        :range=\"range_\"\n        :hide-header=\"index !== 0\"\n        @pick=\"pickDay\"\n      >\n        <template v-if=\"$slots.dateCell\" #dateCell=\"data\">\n          <slot name=\"dateCell\" v-bind=\"data\" />\n        </template>\n      </date-table>\n    </div>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport dayjs from 'dayjs'\nimport { ElButton, ElButtonGroup } from '@element-plus/components/button'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport { debugWarn } from '@element-plus/utils'\nimport { INPUT_EVENT, UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport DateTable from './date-table.vue'\nimport { calendarEmits, calendarProps } from './calendar'\n\nimport type { CalendarDateType } from './calendar'\nimport type { ComputedRef } from 'vue'\nimport type { Dayjs } from 'dayjs'\n\nconst COMPONENT_NAME = 'ElCalendar'\n\ndefineOptions({\n  name: 'ElCalendar',\n})\n\nconst props = defineProps(calendarProps)\nconst emit = defineEmits(calendarEmits)\n\nconst ns = useNamespace('calendar')\nconst { t, lang } = useLocale()\n\nconst selectedDay = ref<Dayjs>()\nconst now = dayjs().locale(lang.value)\n\nconst realSelectedDay = computed<Dayjs | undefined>({\n  get() {\n    if (!props.modelValue) return selectedDay.value\n    return date.value\n  },\n  set(val) {\n    if (!val) return\n    selectedDay.value = val\n    const result = val.toDate()\n\n    emit(INPUT_EVENT, result)\n    emit(UPDATE_MODEL_EVENT, result)\n  },\n})\n\n// if range is valid, we get a two-digit array\nconst validatedRange = computed(() => {\n  if (!props.range) return []\n  const rangeArrDayjs = props.range.map((_) => dayjs(_).locale(lang.value))\n  const [startDayjs, endDayjs] = rangeArrDayjs\n  if (startDayjs.isAfter(endDayjs)) {\n    debugWarn(COMPONENT_NAME, 'end time should be greater than start time')\n    return []\n  }\n  if (startDayjs.isSame(endDayjs, 'month')) {\n    // same month\n    return calculateValidatedDateRange(startDayjs, endDayjs)\n  } else {\n    // two months\n    if (startDayjs.add(1, 'month').month() !== endDayjs.month()) {\n      debugWarn(\n        COMPONENT_NAME,\n        'start time and end time interval must not exceed two months'\n      )\n      return []\n    }\n    return calculateValidatedDateRange(startDayjs, endDayjs)\n  }\n})\n\nconst date: ComputedRef<Dayjs> = computed(() => {\n  if (!props.modelValue) {\n    if (realSelectedDay.value) {\n      return realSelectedDay.value\n    } else if (validatedRange.value.length) {\n      return validatedRange.value[0][0]\n    }\n    return now\n  } else {\n    return dayjs(props.modelValue).locale(lang.value)\n  }\n})\nconst prevMonthDayjs = computed(() => date.value.subtract(1, 'month').date(1))\nconst nextMonthDayjs = computed(() => date.value.add(1, 'month').date(1))\nconst prevYearDayjs = computed(() => date.value.subtract(1, 'year').date(1))\nconst nextYearDayjs = computed(() => date.value.add(1, 'year').date(1))\n\nconst i18nDate = computed(() => {\n  const pickedMonth = `el.datepicker.month${date.value.format('M')}`\n  return `${date.value.year()} ${t('el.datepicker.year')} ${t(pickedMonth)}`\n})\n\n// https://github.com/element-plus/element-plus/issues/3155\n// Calculate the validate date range according to the start and end dates\nconst calculateValidatedDateRange = (\n  startDayjs: Dayjs,\n  endDayjs: Dayjs\n): [Dayjs, Dayjs][] => {\n  const firstDay = startDayjs.startOf('week')\n  const lastDay = endDayjs.endOf('week')\n  const firstMonth = firstDay.get('month')\n  const lastMonth = lastDay.get('month')\n\n  // Current mouth\n  if (firstMonth === lastMonth) {\n    return [[firstDay, lastDay]]\n  }\n  // Two adjacent months\n  else if (firstMonth + 1 === lastMonth) {\n    const firstMonthLastDay = firstDay.endOf('month')\n    const lastMonthFirstDay = lastDay.startOf('month')\n\n    // Whether the last day of the first month and the first day of the last month is in the same week\n    const isSameWeek = firstMonthLastDay.isSame(lastMonthFirstDay, 'week')\n    const lastMonthStartDay = isSameWeek\n      ? lastMonthFirstDay.add(1, 'week')\n      : lastMonthFirstDay\n\n    return [\n      [firstDay, firstMonthLastDay],\n      [lastMonthStartDay.startOf('week'), lastDay],\n    ]\n  }\n  // Three consecutive months (compatible: 2021-01-30 to 2021-02-28)\n  else if (\n    firstMonth + 2 === lastMonth ||\n    (firstMonth + 1) % 11 === lastMonth\n  ) {\n    const firstMonthLastDay = firstDay.endOf('month')\n    const secondMonthFirstDay = firstDay.add(1, 'month').startOf('month')\n\n    // Whether the last day of the first month and the second month is in the same week\n    const secondMonthStartDay = firstMonthLastDay.isSame(\n      secondMonthFirstDay,\n      'week'\n    )\n      ? secondMonthFirstDay.add(1, 'week')\n      : secondMonthFirstDay\n\n    const secondMonthLastDay = secondMonthStartDay.endOf('month')\n    const lastMonthFirstDay = lastDay.startOf('month')\n\n    // Whether the last day of the second month and the last day of the last month is in the same week\n    const lastMonthStartDay = secondMonthLastDay.isSame(\n      lastMonthFirstDay,\n      'week'\n    )\n      ? lastMonthFirstDay.add(1, 'week')\n      : lastMonthFirstDay\n\n    return [\n      [firstDay, firstMonthLastDay],\n      [secondMonthStartDay.startOf('week'), secondMonthLastDay],\n      [lastMonthStartDay.startOf('week'), lastDay],\n    ]\n  }\n  // Other cases\n  else {\n    debugWarn(\n      COMPONENT_NAME,\n      'start time and end time interval must not exceed two months'\n    )\n    return []\n  }\n}\n\nconst pickDay = (day: Dayjs) => {\n  realSelectedDay.value = day\n}\n\nconst selectDate = (type: CalendarDateType) => {\n  let day: Dayjs\n  if (type === 'prev-month') {\n    day = prevMonthDayjs.value\n  } else if (type === 'next-month') {\n    day = nextMonthDayjs.value\n  } else if (type === 'prev-year') {\n    day = prevYearDayjs.value\n  } else if (type === 'next-year') {\n    day = nextYearDayjs.value\n  } else {\n    day = now\n  }\n\n  if (day.isSame(date.value, 'day')) return\n  pickDay(day)\n}\n\ndefineExpose({\n  /** @description currently selected date */\n  selectedDay: realSelectedDay,\n  /** @description select a specific date */\n  pickDay,\n  /** @description select date */\n  selectDate,\n  /** @description Calculate the validate date range according to the start and end dates */\n  calculateValidatedDateRange,\n})\n</script>\n"],"names":["useNamespace","useLocale","ref","dayjs","computed","INPUT_EVENT","UPDATE_MODEL_EVENT","debugWarn"],"mappings":"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"}

package/lib/components/index.js

@@ -85,7 +85,7 @@ var badge = require('./badge/src/badge.js');
 var breadcrumb = require('./breadcrumb/src/breadcrumb.js');
 var breadcrumbItem = require('./breadcrumb/src/breadcrumb-item.js');
 var button = require('./button/src/button.js');
-var calendar = require('./calendar/src/calendar2.js');
+var calendar = require('./calendar/src/calendar.js');
 var card = require('./card/src/card.js');
 var carousel = require('./carousel/src/carousel.js');
 var carouselItem = require('./carousel/src/carousel-item.js');
@@ -123,11 +123,11 @@ var pagination = require('./pagination/src/pagination.js');
 var popconfirm = require('./popconfirm/src/popconfirm.js');
 var popper = require('./popper/src/popper.js');
 var trigger$1 = require('./popper/src/trigger.js');
-var content$1 = require('./popper/src/content2.js');
+var content$1 = require('./popper/src/content.js');
 var arrow$1 = require('./popper/src/arrow.js');
 var arrow = require('./popper/src/arrow2.js');
 var trigger = require('./popper/src/trigger2.js');
-var content = require('./popper/src/content.js');
+var content = require('./popper/src/content2.js');
 var progress = require('./progress/src/progress.js');
 var radio = require('./radio/src/radio.js');
 var radioGroup = require('./radio/src/radio-group.js');
@@ -179,7 +179,7 @@ var dynamicSizeGrid = require('./virtual-list/src/components/dynamic-size-grid.j
 var props$1 = require('./virtual-list/src/props.js');
 var directive = require('./loading/src/directive.js');
 var service = require('./loading/src/service.js');
-var message = require('./message/src/message.js');
+var message = require('./message/src/message2.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/message.js');
+var message = require('./src/message2.js');
 var install = require('../../utils/vue/install.js');
 
 const ElMessage = install.withInstallFunction(method["default"], "$message");

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

@@ -2,99 +2,156 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
 var core = require('@vueuse/core');
 require('../../../utils/index.js');
-var typescript = require('../../../utils/typescript.js');
-var runtime = require('../../../utils/vue/props/runtime.js');
+require('../../../constants/index.js');
+var index$1 = require('../../badge/index.js');
+var index$2 = require('../../icon/index.js');
+require('../../../hooks/index.js');
+var message = require('./message2.js');
+var instance = require('./instance.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
 var icon = require('../../../utils/vue/icon.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var aria = require('../../../constants/aria.js');
 
-const messageTypes = ["success", "info", "warning", "error"];
-const messageDefaults = typescript.mutable({
-  customClass: "",
-  center: false,
-  dangerouslyUseHTMLString: false,
-  duration: 3e3,
-  icon: "",
-  id: "",
-  message: "",
-  onClose: void 0,
-  showClose: false,
-  type: "info",
-  offset: 16,
-  zIndex: 0,
-  grouping: false,
-  repeatNum: 1,
-  appendTo: core.isClient ? document.body : void 0
-});
-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),
-    required: false
-  },
-  showClose: {
-    type: Boolean,
-    default: messageDefaults.showClose
-  },
-  type: {
-    type: String,
-    values: messageTypes,
-    default: messageDefaults.type
-  },
-  offset: {
-    type: Number,
-    default: messageDefaults.offset
-  },
-  zIndex: {
-    type: Number,
-    default: messageDefaults.zIndex
-  },
-  grouping: {
-    type: Boolean,
-    default: messageDefaults.grouping
-  },
-  repeatNum: {
-    type: Number,
-    default: messageDefaults.repeatNum
+const _hoisted_1 = ["id"];
+const _hoisted_2 = ["innerHTML"];
+const __default__ = {
+  name: "ElMessage"
+};
+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 = index.useNamespace("message");
+    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(() => props.offset + lastOffset.value);
+    const bottom = vue.computed(() => height.value + offset.value);
+    const customStyle = vue.computed(() => ({
+      top: `${offset.value}px`,
+      zIndex: props.zIndex
+    }));
+    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();
+      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 && !_ctx.icon },
+              vue.unref(ns).is("center", _ctx.center),
+              vue.unref(ns).is("closable", _ctx.showClose),
+              _ctx.customClass
+            ]),
+            style: vue.normalizeStyle(vue.unref(customStyle)),
+            role: "alert",
+            onMouseenter: clearTimer,
+            onMouseleave: startTimer
+          }, [
+            _ctx.repeatNum > 1 ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.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$2.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$2.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 messageEmits = {
-  destroy: () => true
-};
+var MessageConstructor = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/message/src/message.vue"]]);
 
-exports.messageDefaults = messageDefaults;
-exports.messageEmits = messageEmits;
-exports.messageProps = messageProps;
-exports.messageTypes = messageTypes;
+exports["default"] = MessageConstructor;
 //# sourceMappingURL=message.js.map