@element-plus/nightly 0.0.20220721 → 0.0.20220722

package/es/components/calendar/src/calendar2.mjs

@@ -1,237 +1,23 @@
-import { defineComponent, ref, computed, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, renderSlot, toDisplayString, createVNode, withCtx, createTextVNode, createCommentVNode, createSlots, normalizeProps, guardReactiveProps, Fragment, renderList, createBlock } from 'vue';
-import dayjs from 'dayjs';
-import { ElButtonGroup, ElButton } from '../../button/index.mjs';
-import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
 import '../../../constants/index.mjs';
-import DateTable from './date-table2.mjs';
-import { calendarProps, calendarEmits } from './calendar.mjs';
-import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
-import { useLocale } from '../../../hooks/use-locale/index.mjs';
-import { INPUT_EVENT, UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
-import { debugWarn } from '../../../utils/error.mjs';
+import { isArray, isDate } from '@vue/shared';
+import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { UPDATE_MODEL_EVENT, INPUT_EVENT } from '../../../constants/event.mjs';
 
-const __default__ = {
-  name: "ElCalendar"
-};
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...__default__,
-  props: calendarProps,
-  emits: calendarEmits,
-  setup(__props, { expose, emit }) {
-    const props = __props;
-    const COMPONENT_NAME = "ElCalendar";
-    const ns = useNamespace("calendar");
-    const { t, lang } = useLocale();
-    const selectedDay = ref();
-    const now = dayjs().locale(lang.value);
-    const realSelectedDay = computed({
-      get() {
-        if (!props.modelValue)
-          return selectedDay.value;
-        return date.value;
-      },
-      set(val) {
-        if (!val)
-          return;
-        selectedDay.value = val;
-        const result = val.toDate();
-        emit(INPUT_EVENT, result);
-        emit(UPDATE_MODEL_EVENT, result);
-      }
-    });
-    const validatedRange = computed(() => {
-      if (!props.range)
-        return [];
-      const rangeArrDayjs = props.range.map((_) => dayjs(_).locale(lang.value));
-      const [startDayjs, endDayjs] = rangeArrDayjs;
-      if (startDayjs.isAfter(endDayjs)) {
-        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()) {
-          debugWarn(COMPONENT_NAME, "start time and end time interval must not exceed two months");
-          return [];
-        }
-        return calculateValidatedDateRange(startDayjs, endDayjs);
-      }
-    });
-    const date = 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(props.modelValue).locale(lang.value);
-      }
-    });
-    const prevMonthDayjs = computed(() => date.value.subtract(1, "month").date(1));
-    const nextMonthDayjs = computed(() => date.value.add(1, "month").date(1));
-    const prevYearDayjs = computed(() => date.value.subtract(1, "year").date(1));
-    const nextYearDayjs = computed(() => date.value.add(1, "year").date(1));
-    const i18nDate = 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 {
-        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 openBlock(), createElementBlock("div", {
-        class: normalizeClass(unref(ns).b())
-      }, [
-        createElementVNode("div", {
-          class: normalizeClass(unref(ns).e("header"))
-        }, [
-          renderSlot(_ctx.$slots, "header", { date: unref(i18nDate) }, () => [
-            createElementVNode("div", {
-              class: normalizeClass(unref(ns).e("title"))
-            }, toDisplayString(unref(i18nDate)), 3),
-            unref(validatedRange).length === 0 ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              class: normalizeClass(unref(ns).e("button-group"))
-            }, [
-              createVNode(unref(ElButtonGroup), null, {
-                default: withCtx(() => [
-                  createVNode(unref(ElButton), {
-                    size: "small",
-                    onClick: _cache[0] || (_cache[0] = ($event) => selectDate("prev-month"))
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString(unref(t)("el.datepicker.prevMonth")), 1)
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(unref(ElButton), {
-                    size: "small",
-                    onClick: _cache[1] || (_cache[1] = ($event) => selectDate("today"))
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString(unref(t)("el.datepicker.today")), 1)
-                    ]),
-                    _: 1
-                  }),
-                  createVNode(unref(ElButton), {
-                    size: "small",
-                    onClick: _cache[2] || (_cache[2] = ($event) => selectDate("next-month"))
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(toDisplayString(unref(t)("el.datepicker.nextMonth")), 1)
-                    ]),
-                    _: 1
-                  })
-                ]),
-                _: 1
-              })
-            ], 2)) : createCommentVNode("v-if", true)
-          ])
-        ], 2),
-        unref(validatedRange).length === 0 ? (openBlock(), createElementBlock("div", {
-          key: 0,
-          class: normalizeClass(unref(ns).e("body"))
-        }, [
-          createVNode(DateTable, {
-            date: unref(date),
-            "selected-day": unref(realSelectedDay),
-            onPick: pickDay
-          }, createSlots({ _: 2 }, [
-            _ctx.$slots.dateCell ? {
-              name: "dateCell",
-              fn: withCtx((data) => [
-                renderSlot(_ctx.$slots, "dateCell", normalizeProps(guardReactiveProps(data)))
-              ])
-            } : void 0
-          ]), 1032, ["date", "selected-day"])
-        ], 2)) : (openBlock(), createElementBlock("div", {
-          key: 1,
-          class: normalizeClass(unref(ns).e("body"))
-        }, [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(validatedRange), (range_, index) => {
-            return openBlock(), createBlock(DateTable, {
-              key: index,
-              date: range_[0],
-              "selected-day": unref(realSelectedDay),
-              range: range_,
-              "hide-header": index !== 0,
-              onPick: pickDay
-            }, createSlots({ _: 2 }, [
-              _ctx.$slots.dateCell ? {
-                name: "dateCell",
-                fn: withCtx((data) => [
-                  renderSlot(_ctx.$slots, "dateCell", normalizeProps(guardReactiveProps(data)))
-                ])
-              } : void 0
-            ]), 1032, ["date", "selected-day", "range", "hide-header"]);
-          }), 128))
-        ], 2))
-      ], 2);
-    };
+const isValidRange = (range) => isArray(range) && range.length === 2 && range.every((item) => isDate(item));
+const calendarProps = buildProps({
+  modelValue: {
+    type: Date
+  },
+  range: {
+    type: definePropType(Array),
+    validator: isValidRange
   }
 });
-var Calendar = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/calendar/src/calendar.vue"]]);
+const calendarEmits = {
+  [UPDATE_MODEL_EVENT]: (value) => isDate(value),
+  [INPUT_EVENT]: (value) => isDate(value)
+};
 
-export { Calendar as default };
+export { calendarEmits, calendarProps };
 //# sourceMappingURL=calendar2.mjs.map

package/es/components/calendar/src/calendar2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"calendar2.mjs","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":[],"mappings":"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"}
+{"version":3,"file":"calendar2.mjs","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":[],"mappings":";;;;;;AAOA,MAAM,YAAY,GAAG,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAChG,MAAC,aAAa,GAAG,UAAU,CAAC;AACxC,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,IAAI;AACd,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,cAAc,CAAC,KAAK,CAAC;AAC/B,IAAI,SAAS,EAAE,YAAY;AAC3B,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC;AAChD,EAAE,CAAC,WAAW,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC;AACzC;;;;"}

package/es/components/index.mjs

@@ -75,13 +75,13 @@ export { ElPopover, ElPopoverDirective } from './popover/index.mjs';
 export { affixEmits, affixProps } from './affix/src/affix.mjs';
 export { alertEffects, alertEmits, alertProps } from './alert/src/alert.mjs';
 export { autocompleteEmits, autocompleteProps } from './autocomplete/src/autocomplete.mjs';
-export { avatarEmits, avatarProps } from './avatar/src/avatar2.mjs';
+export { avatarEmits, avatarProps } from './avatar/src/avatar.mjs';
 export { backtopEmits, backtopProps } from './backtop/src/backtop.mjs';
 export { badgeProps } from './badge/src/badge.mjs';
 export { breadcrumbProps } from './breadcrumb/src/breadcrumb.mjs';
 export { breadcrumbItemProps } from './breadcrumb/src/breadcrumb-item.mjs';
 export { buttonEmits, buttonNativeTypes, buttonProps, buttonTypes } from './button/src/button.mjs';
-export { calendarEmits, calendarProps } from './calendar/src/calendar.mjs';
+export { calendarEmits, calendarProps } from './calendar/src/calendar2.mjs';
 export { cardProps } from './card/src/card.mjs';
 export { carouselEmits, carouselProps } from './carousel/src/carousel.mjs';
 export { carouselItemProps } from './carousel/src/carousel-item.mjs';
@@ -119,11 +119,11 @@ export { paginationEmits, paginationProps } from './pagination/src/pagination.mj
 export { popconfirmProps } from './popconfirm/src/popconfirm.mjs';
 export { Effect, usePopperProps } from './popper/src/popper.mjs';
 export { usePopperTriggerProps } from './popper/src/trigger.mjs';
-export { usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './popper/src/content.mjs';
+export { usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './popper/src/content2.mjs';
 export { usePopperArrowProps } from './popper/src/arrow.mjs';
 export { default as ElPopperArrow } from './popper/src/arrow2.mjs';
 export { default as ElPopperTrigger } from './popper/src/trigger2.mjs';
-export { default as ElPopperContent } from './popper/src/content2.mjs';
+export { default as ElPopperContent } from './popper/src/content.mjs';
 export { progressProps } from './progress/src/progress.mjs';
 export { radioEmits, radioProps, radioPropsBase } from './radio/src/radio.mjs';
 export { radioGroupEmits, radioGroupProps } from './radio/src/radio-group.mjs';

package/es/components/popper/index.mjs

@@ -2,10 +2,10 @@ import '../../utils/index.mjs';
 import Popper from './src/popper2.mjs';
 export { default as ElPopperArrow } from './src/arrow2.mjs';
 export { default as ElPopperTrigger } from './src/trigger2.mjs';
-export { default as ElPopperContent } from './src/content2.mjs';
+export { default as ElPopperContent } from './src/content.mjs';
 export { Effect, usePopperProps } from './src/popper.mjs';
 export { usePopperTriggerProps } from './src/trigger.mjs';
-export { usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './src/content.mjs';
+export { usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './src/content2.mjs';
 export { usePopperArrowProps } from './src/arrow.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';
 

package/es/components/popper/src/content.mjs

@@ -1,93 +1,213 @@
-import { placements } from '@popperjs/core';
+import { defineComponent, inject, ref, provide, computed, unref, onMounted, watch, toRefs, onBeforeUnmount, openBlock, createElementBlock, normalizeStyle, normalizeClass, createVNode, withCtx, renderSlot } from 'vue';
+import { NOOP } from '@vue/shared';
+import { isNil } from 'lodash-unified';
+import { createPopper } from '@popperjs/core';
+import '../../focus-trap/index.mjs';
+import '../../../hooks/index.mjs';
+import '../../../tokens/index.mjs';
 import '../../../utils/index.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
+import { usePopperContentProps, usePopperContentEmits } from './content2.mjs';
+import { unwrapMeasurableEl, buildPopperOptions } from './utils.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { POPPER_INJECTION_KEY, POPPER_CONTENT_INJECTION_KEY } from '../../../tokens/popper.mjs';
+import { formItemContextKey } from '../../../tokens/form.mjs';
+import { useZIndex } from '../../../hooks/use-z-index/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { isElement } from '../../../utils/types.mjs';
+import ElFocusTrap from '../../focus-trap/src/focus-trap.mjs';
 
-const POSITIONING_STRATEGIES = ["fixed", "absolute"];
-const usePopperCoreConfigProps = buildProps({
-  boundariesPadding: {
-    type: Number,
-    default: 0
-  },
-  fallbackPlacements: {
-    type: definePropType(Array),
-    default: () => []
-  },
-  gpuAcceleration: {
-    type: Boolean,
-    default: true
-  },
-  offset: {
-    type: Number,
-    default: 12
-  },
-  placement: {
-    type: String,
-    values: placements,
-    default: "bottom"
-  },
-  popperOptions: {
-    type: definePropType(Object),
-    default: () => ({})
-  },
-  strategy: {
-    type: String,
-    values: POSITIONING_STRATEGIES,
-    default: "absolute"
+const __default__ = {
+  name: "ElPopperContent"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: usePopperContentProps,
+  emits: usePopperContentEmits,
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const { popperInstanceRef, contentRef, triggerRef, role } = inject(POPPER_INJECTION_KEY, void 0);
+    const formItemContext = inject(formItemContextKey, void 0);
+    const { nextZIndex } = useZIndex();
+    const ns = useNamespace("popper");
+    const popperContentRef = ref();
+    const focusStartRef = ref("first");
+    const arrowRef = ref();
+    const arrowOffset = ref();
+    provide(POPPER_CONTENT_INJECTION_KEY, {
+      arrowRef,
+      arrowOffset
+    });
+    if (formItemContext && (formItemContext.addInputId || formItemContext.removeInputId)) {
+      provide(formItemContextKey, {
+        ...formItemContext,
+        addInputId: NOOP,
+        removeInputId: NOOP
+      });
+    }
+    const contentZIndex = ref(props.zIndex || nextZIndex());
+    const trapped = ref(false);
+    let triggerTargetAriaStopWatch = void 0;
+    const computedReference = computed(() => unwrapMeasurableEl(props.referenceEl) || unref(triggerRef));
+    const contentStyle = computed(() => [{ zIndex: unref(contentZIndex) }, props.popperStyle]);
+    const contentClass = computed(() => [
+      ns.b(),
+      ns.is("pure", props.pure),
+      ns.is(props.effect),
+      props.popperClass
+    ]);
+    const ariaModal = computed(() => {
+      return role && role.value === "dialog" ? "false" : void 0;
+    });
+    const createPopperInstance = ({ referenceEl, popperContentEl, arrowEl }) => {
+      const options = buildPopperOptions(props, {
+        arrowEl,
+        arrowOffset: unref(arrowOffset)
+      });
+      return createPopper(referenceEl, popperContentEl, options);
+    };
+    const updatePopper = (shouldUpdateZIndex = true) => {
+      var _a;
+      (_a = unref(popperInstanceRef)) == null ? void 0 : _a.update();
+      shouldUpdateZIndex && (contentZIndex.value = props.zIndex || nextZIndex());
+    };
+    const togglePopperAlive = () => {
+      var _a, _b;
+      const monitorable = { name: "eventListeners", enabled: props.visible };
+      (_b = (_a = unref(popperInstanceRef)) == null ? void 0 : _a.setOptions) == null ? void 0 : _b.call(_a, (options) => ({
+        ...options,
+        modifiers: [...options.modifiers || [], monitorable]
+      }));
+      updatePopper(false);
+      if (props.visible && props.focusOnShow) {
+        trapped.value = true;
+      } else if (props.visible === false) {
+        trapped.value = false;
+      }
+    };
+    const onFocusAfterTrapped = () => {
+      emit("focus");
+    };
+    const onFocusAfterReleased = () => {
+      focusStartRef.value = "first";
+      emit("blur");
+    };
+    const onFocusInTrap = (event) => {
+      var _a;
+      if (props.visible && !trapped.value) {
+        if (event.target) {
+          focusStartRef.value = event.target;
+        }
+        trapped.value = true;
+        if (event.relatedTarget) {
+          ;
+          (_a = event.relatedTarget) == null ? void 0 : _a.focus();
+        }
+      }
+    };
+    const onFocusoutPrevented = () => {
+      if (!props.trapping) {
+        trapped.value = false;
+      }
+    };
+    const onReleaseRequested = () => {
+      trapped.value = false;
+      emit("close");
+    };
+    onMounted(() => {
+      let updateHandle;
+      watch(computedReference, (referenceEl) => {
+        var _a;
+        updateHandle == null ? void 0 : updateHandle();
+        const popperInstance = unref(popperInstanceRef);
+        (_a = popperInstance == null ? void 0 : popperInstance.destroy) == null ? void 0 : _a.call(popperInstance);
+        if (referenceEl) {
+          const popperContentEl = unref(popperContentRef);
+          contentRef.value = popperContentEl;
+          popperInstanceRef.value = createPopperInstance({
+            referenceEl,
+            popperContentEl,
+            arrowEl: unref(arrowRef)
+          });
+          updateHandle = watch(() => referenceEl.getBoundingClientRect(), () => updatePopper(), {
+            immediate: true
+          });
+        } else {
+          popperInstanceRef.value = void 0;
+        }
+      }, {
+        immediate: true
+      });
+      watch(() => props.triggerTargetEl, (triggerTargetEl, prevTriggerTargetEl) => {
+        triggerTargetAriaStopWatch == null ? void 0 : triggerTargetAriaStopWatch();
+        triggerTargetAriaStopWatch = void 0;
+        const el = unref(triggerTargetEl || popperContentRef.value);
+        const prevEl = unref(prevTriggerTargetEl || popperContentRef.value);
+        if (isElement(el)) {
+          const { ariaLabel, id } = toRefs(props);
+          triggerTargetAriaStopWatch = watch([role, ariaLabel, ariaModal, id], (watches) => {
+            ;
+            ["role", "aria-label", "aria-modal", "id"].forEach((key, idx) => {
+              isNil(watches[idx]) ? el.removeAttribute(key) : el.setAttribute(key, watches[idx]);
+            });
+          }, { immediate: true });
+        }
+        if (isElement(prevEl)) {
+          ;
+          ["role", "aria-label", "aria-modal", "id"].forEach((key) => {
+            prevEl.removeAttribute(key);
+          });
+        }
+      }, { immediate: true });
+      watch(() => props.visible, togglePopperAlive, { immediate: true });
+      watch(() => buildPopperOptions(props, {
+        arrowEl: unref(arrowRef),
+        arrowOffset: unref(arrowOffset)
+      }), (option) => {
+        var _a;
+        return (_a = popperInstanceRef.value) == null ? void 0 : _a.setOptions(option);
+      });
+    });
+    onBeforeUnmount(() => {
+      triggerTargetAriaStopWatch == null ? void 0 : triggerTargetAriaStopWatch();
+      triggerTargetAriaStopWatch = void 0;
+    });
+    expose({
+      popperContentRef,
+      popperInstanceRef,
+      updatePopper,
+      contentStyle
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        ref_key: "popperContentRef",
+        ref: popperContentRef,
+        style: normalizeStyle(unref(contentStyle)),
+        class: normalizeClass(unref(contentClass)),
+        tabindex: "-1",
+        onMouseenter: _cache[0] || (_cache[0] = (e) => _ctx.$emit("mouseenter", e)),
+        onMouseleave: _cache[1] || (_cache[1] = (e) => _ctx.$emit("mouseleave", e))
+      }, [
+        createVNode(unref(ElFocusTrap), {
+          trapped: trapped.value,
+          "trap-on-focus-in": true,
+          "focus-trap-el": popperContentRef.value,
+          "focus-start-el": focusStartRef.value,
+          onFocusAfterTrapped,
+          onFocusAfterReleased,
+          onFocusin: onFocusInTrap,
+          onFocusoutPrevented,
+          onReleaseRequested
+        }, {
+          default: withCtx(() => [
+            renderSlot(_ctx.$slots, "default")
+          ]),
+          _: 3
+        }, 8, ["trapped", "focus-trap-el", "focus-start-el"])
+      ], 38);
+    };
   }
 });
-const usePopperContentProps = buildProps({
-  ...usePopperCoreConfigProps,
-  id: String,
-  style: { type: definePropType([String, Array, Object]) },
-  className: { type: definePropType([String, Array, Object]) },
-  effect: {
-    type: String,
-    default: "dark"
-  },
-  visible: Boolean,
-  enterable: {
-    type: Boolean,
-    default: true
-  },
-  pure: Boolean,
-  focusOnShow: {
-    type: Boolean,
-    default: false
-  },
-  trapping: {
-    type: Boolean,
-    default: false
-  },
-  popperClass: {
-    type: definePropType([String, Array, Object])
-  },
-  popperStyle: {
-    type: definePropType([String, Array, Object])
-  },
-  referenceEl: {
-    type: definePropType(Object)
-  },
-  triggerTargetEl: {
-    type: definePropType(Object)
-  },
-  stopPopperMouseEvent: {
-    type: Boolean,
-    default: true
-  },
-  ariaLabel: {
-    type: String,
-    default: void 0
-  },
-  virtualTriggering: Boolean,
-  zIndex: Number
-});
-const usePopperContentEmits = [
-  "mouseenter",
-  "mouseleave",
-  "focus",
-  "blur",
-  "close"
-];
+var ElPopperContent = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/home/runner/work/element-plus/element-plus/packages/components/popper/src/content.vue"]]);
 
-export { usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps };
+export { ElPopperContent as default };
 //# sourceMappingURL=content.mjs.map