element-plus-secondary 0.3.3 → 0.3.5

package/es/components/popconfirm/src/popconfirm2.mjs

@@ -1,55 +1,117 @@
-import '../../button/index.mjs';
-import { QuestionFilled } from '@element-plus/icons-vue';
+import { defineComponent, ref, computed, openBlock, createBlock, unref, mergeProps, withCtx, createElementVNode, normalizeClass, normalizeStyle, resolveDynamicComponent, createCommentVNode, createTextVNode, toDisplayString, createVNode, renderSlot } from 'vue';
+import { ElButton } from '../../button/index.mjs';
+import { ElIcon } from '../../icon/index.mjs';
+import { ElTooltip } from '../../tooltip/index.mjs';
+import '../../../hooks/index.mjs';
 import '../../../utils/index.mjs';
-import '../../tooltip/index.mjs';
-import { buildProps, definePropType } from '../../../utils/vue/props/runtime.mjs';
-import { buttonTypes } from '../../button/src/button2.mjs';
-import { iconPropType } from '../../../utils/vue/icon.mjs';
-import { useTooltipContentProps } from '../../tooltip/src/content.mjs';
+import { popconfirmProps } from './popconfirm.mjs';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
+import { useLocale } from '../../../hooks/use-locale/index.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { addUnit } from '../../../utils/dom/style.mjs';
 
-const popconfirmProps = buildProps({
-  title: String,
-  confirmButtonText: String,
-  cancelButtonText: String,
-  confirmButtonType: {
-    type: String,
-    values: buttonTypes,
-    default: "primary"
-  },
-  cancelButtonType: {
-    type: String,
-    values: buttonTypes,
-    default: "text"
-  },
-  icon: {
-    type: iconPropType,
-    default: () => QuestionFilled
-  },
-  iconColor: {
-    type: String,
-    default: "#f90"
-  },
-  hideIcon: {
-    type: Boolean,
-    default: false
-  },
-  hideAfter: {
-    type: Number,
-    default: 200
-  },
-  onConfirm: {
-    type: definePropType(Function)
-  },
-  onCancel: {
-    type: definePropType(Function)
-  },
-  teleported: useTooltipContentProps.teleported,
-  persistent: useTooltipContentProps.persistent,
-  width: {
-    type: [String, Number],
-    default: 150
+const __default__ = defineComponent({
+  name: "ElPopconfirm"
+});
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: popconfirmProps,
+  setup(__props) {
+    const props = __props;
+    const { t } = useLocale();
+    const ns = useNamespace("popconfirm");
+    const tooltipRef = ref();
+    const hidePopper = () => {
+      var _a, _b;
+      (_b = (_a = tooltipRef.value) == null ? void 0 : _a.onClose) == null ? void 0 : _b.call(_a);
+    };
+    const style = computed(() => {
+      return {
+        width: addUnit(props.width)
+      };
+    });
+    const confirm = (e) => {
+      var _a;
+      (_a = props.onConfirm) == null ? void 0 : _a.call(props, e);
+      hidePopper();
+    };
+    const cancel = (e) => {
+      var _a;
+      (_a = props.onCancel) == null ? void 0 : _a.call(props, e);
+      hidePopper();
+    };
+    const finalConfirmButtonText = computed(() => props.confirmButtonText || t("el.popconfirm.confirmButtonText"));
+    const finalCancelButtonText = computed(() => props.cancelButtonText || t("el.popconfirm.cancelButtonText"));
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(ElTooltip), mergeProps({
+        ref_key: "tooltipRef",
+        ref: tooltipRef,
+        trigger: "click",
+        effect: "light"
+      }, _ctx.$attrs, {
+        "popper-class": `${unref(ns).namespace.value}-popover`,
+        "popper-style": unref(style),
+        teleported: _ctx.teleported,
+        "fallback-placements": ["bottom", "top", "right", "left"],
+        "hide-after": _ctx.hideAfter,
+        persistent: _ctx.persistent
+      }), {
+        content: withCtx(() => [
+          createElementVNode("div", {
+            class: normalizeClass(unref(ns).b())
+          }, [
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("main"))
+            }, [
+              !_ctx.hideIcon && _ctx.icon ? (openBlock(), createBlock(unref(ElIcon), {
+                key: 0,
+                class: normalizeClass(unref(ns).e("icon")),
+                style: normalizeStyle({ color: _ctx.iconColor })
+              }, {
+                default: withCtx(() => [
+                  (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon)))
+                ]),
+                _: 1
+              }, 8, ["class", "style"])) : createCommentVNode("v-if", true),
+              createTextVNode(" " + toDisplayString(_ctx.title), 1)
+            ], 2),
+            createElementVNode("div", {
+              class: normalizeClass(unref(ns).e("action"))
+            }, [
+              createVNode(unref(ElButton), {
+                size: "small",
+                type: _ctx.cancelButtonType === "text" ? "" : _ctx.cancelButtonType,
+                text: _ctx.cancelButtonType === "text",
+                onClick: cancel
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(toDisplayString(unref(finalCancelButtonText)), 1)
+                ]),
+                _: 1
+              }, 8, ["type", "text"]),
+              createVNode(unref(ElButton), {
+                size: "small",
+                type: _ctx.confirmButtonType === "text" ? "" : _ctx.confirmButtonType,
+                text: _ctx.confirmButtonType === "text",
+                onClick: confirm
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(toDisplayString(unref(finalConfirmButtonText)), 1)
+                ]),
+                _: 1
+              }, 8, ["type", "text"])
+            ], 2)
+          ], 2)
+        ]),
+        default: withCtx(() => [
+          _ctx.$slots.reference ? renderSlot(_ctx.$slots, "reference", { key: 0 }) : createCommentVNode("v-if", true)
+        ]),
+        _: 3
+      }, 16, ["popper-class", "popper-style", "teleported", "hide-after", "persistent"]);
+    };
   }
 });
+var Popconfirm = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "/Users/st/Desktop/vue/nxx-ui/packages/components/popconfirm/src/popconfirm.vue"]]);
 
-export { popconfirmProps };
+export { Popconfirm as default };
 //# sourceMappingURL=popconfirm2.mjs.map

package/es/components/popconfirm/src/popconfirm2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"popconfirm2.mjs","sources":["../../../../../../packages/components/popconfirm/src/popconfirm.ts"],"sourcesContent":["import { buttonTypes } from '@element-plus/components/button'\nimport { QuestionFilled } from '@element-plus/icons-vue'\nimport { buildProps, definePropType, iconPropType } from '@element-plus/utils'\nimport { useTooltipContentProps } from '@element-plus/components/tooltip'\nimport type { ExtractPropTypes } from 'vue'\nimport type Popconfirm from './popconfirm.vue'\n\nexport const popconfirmProps = buildProps({\n  title: String,\n  confirmButtonText: String,\n  cancelButtonText: String,\n  confirmButtonType: {\n    type: String,\n    values: buttonTypes,\n    default: 'primary',\n  },\n  cancelButtonType: {\n    type: String,\n    values: buttonTypes,\n    default: 'text',\n  },\n  icon: {\n    type: iconPropType,\n    default: () => QuestionFilled,\n  },\n  iconColor: {\n    type: String,\n    default: '#f90',\n  },\n  hideIcon: {\n    type: Boolean,\n    default: false,\n  },\n  hideAfter: {\n    type: Number,\n    default: 200,\n  },\n  onConfirm: {\n    type: definePropType<(e: Event) => Promise<void> | void>(Function),\n  },\n  onCancel: {\n    type: definePropType<(e: Event) => Promise<void> | void>(Function),\n  },\n  teleported: useTooltipContentProps.teleported,\n  persistent: useTooltipContentProps.persistent,\n  width: {\n    type: [String, Number],\n    default: 150,\n  },\n} as const)\nexport type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>\n\nexport type PopconfirmInstance = InstanceType<typeof Popconfirm>\n"],"names":[],"mappings":";;;;;;;;;AAIY,MAAC,eAAe,GAAG,UAAU,CAAC;AAC1C,EAAE,KAAK,EAAE,MAAM;AACf,EAAE,iBAAiB,EAAE,MAAM;AAC3B,EAAE,gBAAgB,EAAE,MAAM;AAC1B,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,WAAW;AACvB,IAAI,OAAO,EAAE,SAAS;AACtB,GAAG;AACH,EAAE,gBAAgB,EAAE;AACpB,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,MAAM,EAAE,WAAW;AACvB,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,IAAI,OAAO,EAAE,MAAM,cAAc;AACjC,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,MAAM;AACnB,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,QAAQ,EAAE;AACZ,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,UAAU,EAAE,sBAAsB,CAAC,UAAU;AAC/C,EAAE,UAAU,EAAE,sBAAsB,CAAC,UAAU;AAC/C,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,IAAI,OAAO,EAAE,GAAG;AAChB,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"popconfirm2.mjs","sources":["../../../../../../packages/components/popconfirm/src/popconfirm.vue"],"sourcesContent":["<template>\n  <el-tooltip\n    ref=\"tooltipRef\"\n    trigger=\"click\"\n    effect=\"light\"\n    v-bind=\"$attrs\"\n    :popper-class=\"`${ns.namespace.value}-popover`\"\n    :popper-style=\"style\"\n    :teleported=\"teleported\"\n    :fallback-placements=\"['bottom', 'top', 'right', 'left']\"\n    :hide-after=\"hideAfter\"\n    :persistent=\"persistent\"\n  >\n    <template #content>\n      <div :class=\"ns.b()\">\n        <div :class=\"ns.e('main')\">\n          <el-icon\n            v-if=\"!hideIcon && icon\"\n            :class=\"ns.e('icon')\"\n            :style=\"{ color: iconColor }\"\n          >\n            <component :is=\"icon\" />\n          </el-icon>\n          {{ title }}\n        </div>\n        <div :class=\"ns.e('action')\">\n          <el-button\n            size=\"small\"\n            :type=\"cancelButtonType === 'text' ? '' : cancelButtonType\"\n            :text=\"cancelButtonType === 'text'\"\n            @click=\"cancel\"\n          >\n            {{ finalCancelButtonText }}\n          </el-button>\n          <el-button\n            size=\"small\"\n            :type=\"confirmButtonType === 'text' ? '' : confirmButtonType\"\n            :text=\"confirmButtonType === 'text'\"\n            @click=\"confirm\"\n          >\n            {{ finalConfirmButtonText }}\n          </el-button>\n        </div>\n      </div>\n    </template>\n    <template v-if=\"$slots.reference\">\n      <slot name=\"reference\" />\n    </template>\n  </el-tooltip>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, ref } from 'vue'\nimport ElButton from '@element-plus/components/button'\nimport ElIcon from '@element-plus/components/icon'\nimport ElTooltip from '@element-plus/components/tooltip'\nimport { useLocale, useNamespace } from '@element-plus/hooks'\nimport { addUnit } from '@element-plus/utils'\nimport { popconfirmProps } from './popconfirm'\n\nimport type { TooltipInstance } from '@element-plus/components/tooltip'\n\ndefineOptions({\n  name: 'ElPopconfirm',\n})\n\nconst props = defineProps(popconfirmProps)\n\nconst { t } = useLocale()\nconst ns = useNamespace('popconfirm')\nconst tooltipRef = ref<TooltipInstance>()\n\nconst hidePopper = () => {\n  tooltipRef.value?.onClose?.()\n}\n\nconst style = computed(() => {\n  return {\n    width: addUnit(props.width),\n  }\n})\n\nconst confirm = (e: Event) => {\n  props.onConfirm?.(e)\n  hidePopper()\n}\nconst cancel = (e: Event) => {\n  props.onCancel?.(e)\n  hidePopper()\n}\n\nconst finalConfirmButtonText = computed(\n  () => props.confirmButtonText || t('el.popconfirm.confirmButtonText')\n)\nconst finalCancelButtonText = computed(\n  () => props.cancelButtonText || t('el.popconfirm.cancelButtonText')\n)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;mCA8Dc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AACR,CAAA,CAAA,CAAA;;;;;;AAIA,IAAM,MAAA,EAAE,MAAM,SAAU,EAAA,CAAA;AACxB,IAAM,MAAA,EAAA,GAAK,aAAa,YAAY,CAAA,CAAA;AACpC,IAAA,MAAM,aAAa,GAAqB,EAAA,CAAA;AAExC,IAAA,MAAM,aAAa,MAAM;AACvB,MAAA,IAAA,EAAA,EAAA,EAAA,CAAW;AAAiB,MAC9B,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,UAAA,CAAA,KAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,OAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,CAAA,CAAA;AAEA,KAAM,CAAA;AACJ,IAAO,MAAA,KAAA,GAAA,QAAA,CAAA,MAAA;AAAA,MACL,OAAA;AAA0B,QAC5B,KAAA,EAAA,OAAA,CAAA,KAAA,CAAA,KAAA,CAAA;AAAA,OACD,CAAA;AAED,KAAM,CAAA,CAAA;AACJ,IAAA,MAAA,iBAAmB;AACnB,MAAW,IAAA,EAAA,CAAA;AAAA,MACb,CAAA,EAAA,GAAA,KAAA,CAAA,SAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,KAAA,EAAA,CAAA,CAAA,CAAA;AACA,MAAM,UAAA,EAAA,CAAS;AACb,KAAA,CAAA;AACA,IAAW,MAAA,MAAA,GAAA,CAAA,CAAA,KAAA;AAAA,MACb,IAAA,EAAA,CAAA;AAEA,MAAA,CAAA,EAAA,0BAA+B,GAC7B,KAAA,CAAA,GAAA,EAAA,CAAM,UAA2B,EAAA,CAAA,CAAA,CAAA;AAEnC,MAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/popover/index.d.ts

@@ -2577,7 +2577,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                     readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
                 }, {
-                    emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                    emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                         readonly id: StringConstructor;
                         readonly style: {
@@ -2829,8 +2829,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                         onClose?: (() => any) | undefined;
                         onFocus?: (() => any) | undefined;
                         onBlur?: (() => any) | undefined;
-                        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                         onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     }>>;
                     popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                     contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -2910,7 +2910,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                         };
                     }, {
                         onKeydown: (e: KeyboardEvent) => void;
-                    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                         loop: BooleanConstructor;
                         trapped: BooleanConstructor;
                         focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -2919,10 +2919,10 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                             default: string;
                         };
                     }>> & {
-                        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                        onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                         onFocusin?: ((...args: any[]) => any) | undefined;
                         onFocusout?: ((...args: any[]) => any) | undefined;
+                        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                        onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                         "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                         "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                     }, {
@@ -3187,8 +3187,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }, {
                     readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                     readonly offset: number;
@@ -5435,7 +5435,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                 readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                 readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
             }, {
-                emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     readonly id: StringConstructor;
                     readonly style: {
@@ -5687,8 +5687,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }>>;
                 popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                 contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -5768,7 +5768,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     };
                 }, {
                     onKeydown: (e: KeyboardEvent) => void;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                     loop: BooleanConstructor;
                     trapped: BooleanConstructor;
                     focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -5777,10 +5777,10 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                         default: string;
                     };
                 }>> & {
-                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     onFocusin?: ((...args: any[]) => any) | undefined;
                     onFocusout?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                     "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                 }, {
@@ -6045,8 +6045,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                 onClose?: (() => any) | undefined;
                 onFocus?: (() => any) | undefined;
                 onBlur?: (() => any) | undefined;
-                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
             }, {
                 readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                 readonly offset: number;
@@ -8274,7 +8274,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                 readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                 readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
             }, {
-                emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     readonly id: StringConstructor;
                     readonly style: {
@@ -8526,8 +8526,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }>>;
                 popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                 contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -8607,7 +8607,7 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                     };
                 }, {
                     onKeydown: (e: KeyboardEvent) => void;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                     loop: BooleanConstructor;
                     trapped: BooleanConstructor;
                     focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -8616,10 +8616,10 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                         default: string;
                     };
                 }>> & {
-                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     onFocusin?: ((...args: any[]) => any) | undefined;
                     onFocusout?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                     "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                 }, {
@@ -8884,8 +8884,8 @@ export declare const ElPopover: import("element-plus-secondary/es/utils").SFCWit
                 onClose?: (() => any) | undefined;
                 onFocus?: (() => any) | undefined;
                 onBlur?: (() => any) | undefined;
-                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
             }, {
                 readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                 readonly offset: number;

package/es/components/popover/src/popover.mjs

@@ -3,8 +3,8 @@ import '../../tooltip/index.mjs';
 import '../../dropdown/index.mjs';
 import { buildProps } from '../../../utils/vue/props/runtime.mjs';
 import { useTooltipTriggerProps } from '../../tooltip/src/trigger.mjs';
-import { dropdownProps } from '../../dropdown/src/dropdown2.mjs';
-import { useTooltipContentProps } from '../../tooltip/src/content.mjs';
+import { dropdownProps } from '../../dropdown/src/dropdown.mjs';
+import { useTooltipContentProps } from '../../tooltip/src/content2.mjs';
 import { isBoolean } from '@vueuse/core';
 
 const popoverProps = buildProps({

package/es/components/popover/src/popover.vue.d.ts

@@ -2576,7 +2576,7 @@ declare const _default: import("vue").DefineComponent<{
                     readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                     readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
                 }, {
-                    emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                    emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                         readonly id: StringConstructor;
                         readonly style: {
@@ -2828,8 +2828,8 @@ declare const _default: import("vue").DefineComponent<{
                         onClose?: (() => any) | undefined;
                         onFocus?: (() => any) | undefined;
                         onBlur?: (() => any) | undefined;
-                        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                         onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                        onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     }>>;
                     popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                     contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -2909,7 +2909,7 @@ declare const _default: import("vue").DefineComponent<{
                         };
                     }, {
                         onKeydown: (e: KeyboardEvent) => void;
-                    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                         loop: BooleanConstructor;
                         trapped: BooleanConstructor;
                         focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -2918,10 +2918,10 @@ declare const _default: import("vue").DefineComponent<{
                             default: string;
                         };
                     }>> & {
-                        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                        onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                         onFocusin?: ((...args: any[]) => any) | undefined;
                         onFocusout?: ((...args: any[]) => any) | undefined;
+                        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                        onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                         "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                         "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                     }, {
@@ -3186,8 +3186,8 @@ declare const _default: import("vue").DefineComponent<{
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }, {
                     readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                     readonly offset: number;
@@ -5434,7 +5434,7 @@ declare const _default: import("vue").DefineComponent<{
                 readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                 readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
             }, {
-                emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     readonly id: StringConstructor;
                     readonly style: {
@@ -5686,8 +5686,8 @@ declare const _default: import("vue").DefineComponent<{
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }>>;
                 popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                 contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -5767,7 +5767,7 @@ declare const _default: import("vue").DefineComponent<{
                     };
                 }, {
                     onKeydown: (e: KeyboardEvent) => void;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                     loop: BooleanConstructor;
                     trapped: BooleanConstructor;
                     focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -5776,10 +5776,10 @@ declare const _default: import("vue").DefineComponent<{
                         default: string;
                     };
                 }>> & {
-                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     onFocusin?: ((...args: any[]) => any) | undefined;
                     onFocusout?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                     "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                 }, {
@@ -6044,8 +6044,8 @@ declare const _default: import("vue").DefineComponent<{
                 onClose?: (() => any) | undefined;
                 onFocus?: (() => any) | undefined;
                 onBlur?: (() => any) | undefined;
-                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
             }, {
                 readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                 readonly offset: number;
@@ -8273,7 +8273,7 @@ declare const _default: import("vue").DefineComponent<{
                 readonly popperOptions: import("element-plus-secondary/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>) | ((new (...args: any[]) => Partial<import("@popperjs/core").Options>) | (() => Partial<import("@popperjs/core").Options>))[], unknown, unknown, () => {}, boolean>;
                 readonly strategy: import("element-plus-secondary/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
             }, {
-                emit: ((event: "focus") => void) & ((event: "close") => void) & ((event: "blur") => void) & ((event: "mouseleave", evt: MouseEvent) => void) & ((event: "mouseenter", evt: MouseEvent) => void);
+                emit: ((event: "focus") => void) & ((event: "blur") => void) & ((event: "close") => void) & ((event: "mouseenter", evt: MouseEvent) => void) & ((event: "mouseleave", evt: MouseEvent) => void);
                 props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                     readonly id: StringConstructor;
                     readonly style: {
@@ -8525,8 +8525,8 @@ declare const _default: import("vue").DefineComponent<{
                     onClose?: (() => any) | undefined;
                     onFocus?: (() => any) | undefined;
                     onBlur?: (() => any) | undefined;
-                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                     onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                    onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 }>>;
                 popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
                 contentRef: import("vue").Ref<HTMLElement | undefined>;
@@ -8606,7 +8606,7 @@ declare const _default: import("vue").DefineComponent<{
                     };
                 }, {
                     onKeydown: (e: KeyboardEvent) => void;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested")[], "focusAfterTrapped" | "focusAfterReleased" | "focusin" | "focusout" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested")[], "focusin" | "focusout" | "focusAfterTrapped" | "focusAfterReleased" | "focusout-prevented" | "release-requested", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                     loop: BooleanConstructor;
                     trapped: BooleanConstructor;
                     focusTrapEl: import("vue").PropType<HTMLElement>;
@@ -8615,10 +8615,10 @@ declare const _default: import("vue").DefineComponent<{
                         default: string;
                     };
                 }>> & {
-                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
-                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     onFocusin?: ((...args: any[]) => any) | undefined;
                     onFocusout?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
+                    onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
                     "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
                     "onRelease-requested"?: ((...args: any[]) => any) | undefined;
                 }, {
@@ -8883,8 +8883,8 @@ declare const _default: import("vue").DefineComponent<{
                 onClose?: (() => any) | undefined;
                 onFocus?: (() => any) | undefined;
                 onBlur?: (() => any) | undefined;
-                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
                 onMouseenter?: ((evt: MouseEvent) => any) | undefined;
+                onMouseleave?: ((evt: MouseEvent) => any) | undefined;
             }, {
                 readonly placement: import("element-plus-secondary/es/utils").EpPropMergeType<StringConstructor, import("@popperjs/core").Placement, unknown>;
                 readonly offset: number;

package/es/components/popper/index.mjs

@@ -1,11 +1,11 @@
 import '../../utils/index.mjs';
 import Popper from './src/popper2.mjs';
 export { default as ElPopperArrow } from './src/arrow.mjs';
-export { default as ElPopperTrigger } from './src/trigger.mjs';
-export { default as ElPopperContent } from './src/content.mjs';
+export { default as ElPopperTrigger } from './src/trigger2.mjs';
+export { default as ElPopperContent } from './src/content2.mjs';
 export { Effect, popperProps, roleTypes, usePopperProps } from './src/popper.mjs';
-export { popperTriggerProps, usePopperTriggerProps } from './src/trigger2.mjs';
-export { popperContentEmits, popperContentProps, popperCoreConfigProps, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './src/content2.mjs';
+export { popperTriggerProps, usePopperTriggerProps } from './src/trigger.mjs';
+export { popperContentEmits, popperContentProps, popperCoreConfigProps, usePopperContentEmits, usePopperContentProps, usePopperCoreConfigProps } from './src/content.mjs';
 export { popperArrowProps, usePopperArrowProps } from './src/arrow2.mjs';
 import { withInstall } from '../../utils/vue/install.mjs';