element-plus 2.2.28 → 2.2.29

package/es/components/popper/src/composables/use-content.mjs

@@ -0,0 +1,69 @@
+import { inject, ref, computed, unref, watch, onMounted } from 'vue';
+import { isUndefined } from 'lodash-unified';
+import '../../../../hooks/index.mjs';
+import '../../../../tokens/index.mjs';
+import { buildPopperOptions, unwrapMeasurableEl } from '../utils.mjs';
+import { POPPER_INJECTION_KEY } from '../../../../tokens/popper.mjs';
+import { usePopper } from '../../../../hooks/use-popper/index.mjs';
+
+const DEFAULT_ARROW_OFFSET = 0;
+const usePopperContent = (props) => {
+  const { popperInstanceRef, contentRef, triggerRef, role } = inject(POPPER_INJECTION_KEY, void 0);
+  const arrowRef = ref();
+  const arrowOffset = ref();
+  const eventListenerModifier = computed(() => {
+    return {
+      name: "eventListeners",
+      enabled: !!props.visible
+    };
+  });
+  const arrowModifier = computed(() => {
+    var _a;
+    const arrowEl = unref(arrowRef);
+    const offset = (_a = unref(arrowOffset)) != null ? _a : DEFAULT_ARROW_OFFSET;
+    return {
+      name: "arrow",
+      enabled: !isUndefined(arrowEl),
+      options: {
+        element: arrowEl,
+        padding: offset
+      }
+    };
+  });
+  const options = computed(() => {
+    return {
+      onFirstUpdate: () => {
+        update();
+      },
+      ...buildPopperOptions(props, [
+        unref(arrowModifier),
+        unref(eventListenerModifier)
+      ])
+    };
+  });
+  const computedReference = computed(() => unwrapMeasurableEl(props.referenceEl) || unref(triggerRef));
+  const { attributes, state, styles, update, forceUpdate, instanceRef } = usePopper(computedReference, contentRef, options);
+  watch(instanceRef, (instance) => popperInstanceRef.value = instance);
+  onMounted(() => {
+    watch(() => {
+      var _a;
+      return (_a = unref(computedReference)) == null ? void 0 : _a.getBoundingClientRect();
+    }, () => {
+      update();
+    });
+  });
+  return {
+    attributes,
+    arrowRef,
+    contentRef,
+    instanceRef,
+    state,
+    styles,
+    role,
+    forceUpdate,
+    update
+  };
+};
+
+export { usePopperContent };
+//# sourceMappingURL=use-content.mjs.map

package/es/components/popper/src/composables/use-content.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-content.mjs","sources":["../../../../../../../packages/components/popper/src/composables/use-content.ts"],"sourcesContent":["import { computed, inject, onMounted, ref, unref, watch } from 'vue'\nimport { isUndefined } from 'lodash-unified'\nimport { usePopper } from '@element-plus/hooks'\nimport { POPPER_INJECTION_KEY } from '@element-plus/tokens'\nimport { buildPopperOptions, unwrapMeasurableEl } from '../utils'\nimport type { Modifier } from '@popperjs/core'\n\nimport type { PartialOptions } from '@element-plus/hooks'\nimport type { PopperContentProps } from '../content'\n\nconst DEFAULT_ARROW_OFFSET = 0\n\nexport const usePopperContent = (props: PopperContentProps) => {\n  const { popperInstanceRef, contentRef, triggerRef, role } = inject(\n    POPPER_INJECTION_KEY,\n    undefined\n  )!\n\n  const arrowRef = ref<HTMLElement>()\n  const arrowOffset = ref<number>()\n\n  const eventListenerModifier = computed(() => {\n    return {\n      name: 'eventListeners',\n      enabled: !!props.visible,\n    } as Modifier<'eventListeners', any>\n  })\n\n  const arrowModifier = computed(() => {\n    const arrowEl = unref(arrowRef)\n    const offset = unref(arrowOffset) ?? DEFAULT_ARROW_OFFSET\n    // Seems like the `phase` and `fn` is required by Modifier type\n    // But on its documentation they didn't specify that.\n    // Refer to https://popper.js.org/docs/v2/modifiers/arrow/\n    return {\n      name: 'arrow',\n      enabled: !isUndefined(arrowEl),\n      options: {\n        element: arrowEl,\n        padding: offset,\n      },\n    } as any\n  })\n\n  const options = computed<PartialOptions>(() => {\n    return {\n      onFirstUpdate: () => {\n        update()\n      },\n      ...buildPopperOptions(props, [\n        unref(arrowModifier),\n        unref(eventListenerModifier),\n      ]),\n    }\n  })\n\n  const computedReference = computed(\n    () => unwrapMeasurableEl(props.referenceEl) || unref(triggerRef)\n  )\n\n  const { attributes, state, styles, update, forceUpdate, instanceRef } =\n    usePopper(computedReference, contentRef, options)\n\n  watch(instanceRef, (instance) => (popperInstanceRef.value = instance))\n\n  onMounted(() => {\n    watch(\n      () => unref(computedReference)?.getBoundingClientRect(),\n      () => {\n        update()\n      }\n    )\n  })\n\n  return {\n    attributes,\n    arrowRef,\n    contentRef,\n    instanceRef,\n    state,\n    styles,\n    role,\n\n    forceUpdate,\n    update,\n  }\n}\n\nexport type UsePopperContentReturn = ReturnType<typeof usePopperContent>\n"],"names":[],"mappings":";;;;;;;;AAKA,MAAM,oBAAoB,GAAG,CAAC,CAAC;AACnB,MAAC,gBAAgB,GAAG,CAAC,KAAK,KAAK;AAC3C,EAAE,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC,CAAC;AACnG,EAAE,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC;AACzB,EAAE,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC;AAC5B,EAAE,MAAM,qBAAqB,GAAG,QAAQ,CAAC,MAAM;AAC/C,IAAI,OAAO;AACX,MAAM,IAAI,EAAE,gBAAgB;AAC5B,MAAM,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO;AAC9B,KAAK,CAAC;AACN,GAAG,CAAC,CAAC;AACL,EAAE,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM;AACvC,IAAI,IAAI,EAAE,CAAC;AACX,IAAI,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;AACpC,IAAI,MAAM,MAAM,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,GAAG,EAAE,GAAG,oBAAoB,CAAC;AACjF,IAAI,OAAO;AACX,MAAM,IAAI,EAAE,OAAO;AACnB,MAAM,OAAO,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC;AACpC,MAAM,OAAO,EAAE;AACf,QAAQ,OAAO,EAAE,OAAO;AACxB,QAAQ,OAAO,EAAE,MAAM;AACvB,OAAO;AACP,KAAK,CAAC;AACN,GAAG,CAAC,CAAC;AACL,EAAE,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM;AACjC,IAAI,OAAO;AACX,MAAM,aAAa,EAAE,MAAM;AAC3B,QAAQ,MAAM,EAAE,CAAC;AACjB,OAAO;AACP,MAAM,GAAG,kBAAkB,CAAC,KAAK,EAAE;AACnC,QAAQ,KAAK,CAAC,aAAa,CAAC;AAC5B,QAAQ,KAAK,CAAC,qBAAqB,CAAC;AACpC,OAAO,CAAC;AACR,KAAK,CAAC;AACN,GAAG,CAAC,CAAC;AACL,EAAE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;AACvG,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,iBAAiB,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;AAC5H,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,QAAQ,KAAK,iBAAiB,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;AACvE,EAAE,SAAS,CAAC,MAAM;AAClB,IAAI,KAAK,CAAC,MAAM;AAChB,MAAM,IAAI,EAAE,CAAC;AACb,MAAM,OAAO,CAAC,EAAE,GAAG,KAAK,CAAC,iBAAiB,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,qBAAqB,EAAE,CAAC;AAC3F,KAAK,EAAE,MAAM;AACb,MAAM,MAAM,EAAE,CAAC;AACf,KAAK,CAAC,CAAC;AACP,GAAG,CAAC,CAAC;AACL,EAAE,OAAO;AACT,IAAI,UAAU;AACd,IAAI,QAAQ;AACZ,IAAI,UAAU;AACd,IAAI,WAAW;AACf,IAAI,KAAK;AACT,IAAI,MAAM;AACV,IAAI,IAAI;AACR,IAAI,WAAW;AACf,IAAI,MAAM;AACV,GAAG,CAAC;AACJ;;;;"}

package/es/components/popper/src/composables/use-focus-trap.d.ts

@@ -0,0 +1,12 @@
+import type { SetupContext } from 'vue';
+import type { PopperContentEmits, PopperContentProps } from '../content';
+export declare const usePopperContentFocusTrap: (props: PopperContentProps, emit: SetupContext<PopperContentEmits>['emit']) => {
+    focusStartRef: import("vue").Ref<HTMLElement | "first" | "container" | undefined>;
+    trapped: import("vue").Ref<boolean>;
+    onFocusAfterReleased: (event: CustomEvent) => void;
+    onFocusAfterTrapped: () => void;
+    onFocusInTrap: (event: FocusEvent) => void;
+    onFocusoutPrevented: (event: CustomEvent) => void;
+    onReleaseRequested: () => void;
+};
+export declare type UsePopperContentFocusTrapReturn = ReturnType<typeof usePopperContentFocusTrap>;

package/es/components/popper/src/composables/use-focus-trap.mjs

@@ -0,0 +1,48 @@
+import { ref } from 'vue';
+
+const usePopperContentFocusTrap = (props, emit) => {
+  const trapped = ref(false);
+  const focusStartRef = ref();
+  const onFocusAfterTrapped = () => {
+    emit("focus");
+  };
+  const onFocusAfterReleased = (event) => {
+    var _a;
+    if (((_a = event.detail) == null ? void 0 : _a.focusReason) !== "pointer") {
+      focusStartRef.value = "first";
+      emit("blur");
+    }
+  };
+  const onFocusInTrap = (event) => {
+    if (props.visible && !trapped.value) {
+      if (event.target) {
+        focusStartRef.value = event.target;
+      }
+      trapped.value = true;
+    }
+  };
+  const onFocusoutPrevented = (event) => {
+    if (!props.trapping) {
+      if (event.detail.focusReason === "pointer") {
+        event.preventDefault();
+      }
+      trapped.value = false;
+    }
+  };
+  const onReleaseRequested = () => {
+    trapped.value = false;
+    emit("close");
+  };
+  return {
+    focusStartRef,
+    trapped,
+    onFocusAfterReleased,
+    onFocusAfterTrapped,
+    onFocusInTrap,
+    onFocusoutPrevented,
+    onReleaseRequested
+  };
+};
+
+export { usePopperContentFocusTrap };
+//# sourceMappingURL=use-focus-trap.mjs.map

package/es/components/popper/src/composables/use-focus-trap.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-focus-trap.mjs","sources":["../../../../../../../packages/components/popper/src/composables/use-focus-trap.ts"],"sourcesContent":["import { ref } from 'vue'\n\nimport type { SetupContext } from 'vue'\nimport type { PopperContentEmits, PopperContentProps } from '../content'\n\nexport const usePopperContentFocusTrap = (\n  props: PopperContentProps,\n  emit: SetupContext<PopperContentEmits>['emit']\n) => {\n  const trapped = ref(false)\n  const focusStartRef = ref<'container' | 'first' | HTMLElement>()\n\n  const onFocusAfterTrapped = () => {\n    emit('focus')\n  }\n\n  const onFocusAfterReleased = (event: CustomEvent) => {\n    if (event.detail?.focusReason !== 'pointer') {\n      focusStartRef.value = 'first'\n      emit('blur')\n    }\n  }\n\n  const onFocusInTrap = (event: FocusEvent) => {\n    if (props.visible && !trapped.value) {\n      if (event.target) {\n        focusStartRef.value = event.target as typeof focusStartRef.value\n      }\n      trapped.value = true\n    }\n  }\n\n  const onFocusoutPrevented = (event: CustomEvent) => {\n    if (!props.trapping) {\n      if (event.detail.focusReason === 'pointer') {\n        event.preventDefault()\n      }\n      trapped.value = false\n    }\n  }\n\n  const onReleaseRequested = () => {\n    trapped.value = false\n    emit('close')\n  }\n\n  return {\n    focusStartRef,\n    trapped,\n\n    onFocusAfterReleased,\n    onFocusAfterTrapped,\n    onFocusInTrap,\n    onFocusoutPrevented,\n    onReleaseRequested,\n  }\n}\n\nexport type UsePopperContentFocusTrapReturn = ReturnType<\n  typeof usePopperContentFocusTrap\n>\n"],"names":[],"mappings":";;AACY,MAAC,yBAAyB,GAAG,CAAC,KAAK,EAAE,IAAI,KAAK;AAC1D,EAAE,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;AAC7B,EAAE,MAAM,aAAa,GAAG,GAAG,EAAE,CAAC;AAC9B,EAAE,MAAM,mBAAmB,GAAG,MAAM;AACpC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;AAClB,GAAG,CAAC;AACJ,EAAE,MAAM,oBAAoB,GAAG,CAAC,KAAK,KAAK;AAC1C,IAAI,IAAI,EAAE,CAAC;AACX,IAAI,IAAI,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,MAAM,KAAK,IAAI,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,WAAW,MAAM,SAAS,EAAE;AAC/E,MAAM,aAAa,CAAC,KAAK,GAAG,OAAO,CAAC;AACpC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;AACnB,KAAK;AACL,GAAG,CAAC;AACJ,EAAE,MAAM,aAAa,GAAG,CAAC,KAAK,KAAK;AACnC,IAAI,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;AACzC,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE;AACxB,QAAQ,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;AAC3C,OAAO;AACP,MAAM,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;AAC3B,KAAK;AACL,GAAG,CAAC;AACJ,EAAE,MAAM,mBAAmB,GAAG,CAAC,KAAK,KAAK;AACzC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;AACzB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;AAClD,QAAQ,KAAK,CAAC,cAAc,EAAE,CAAC;AAC/B,OAAO;AACP,MAAM,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;AAC5B,KAAK;AACL,GAAG,CAAC;AACJ,EAAE,MAAM,kBAAkB,GAAG,MAAM;AACnC,IAAI,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;AAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;AAClB,GAAG,CAAC;AACJ,EAAE,OAAO;AACT,IAAI,aAAa;AACjB,IAAI,OAAO;AACX,IAAI,oBAAoB;AACxB,IAAI,mBAAmB;AACvB,IAAI,aAAa;AACjB,IAAI,mBAAmB;AACvB,IAAI,kBAAkB;AACtB,GAAG,CAAC;AACJ;;;;"}

package/es/components/popper/src/content.vue.d.ts

@@ -1,4 +1,3 @@
-import type { CreatePopperInstanceParams } from './content';
 declare const _default: import("vue").DefineComponent<{
     readonly id: StringConstructor;
     readonly style: {
@@ -502,39 +501,31 @@ declare const _default: import("vue").DefineComponent<{
         onMouseleave?: ((evt: MouseEvent) => any) | undefined;
         onMouseenter?: ((evt: MouseEvent) => any) | undefined;
     }>>;
-    popperInstanceRef: import("vue").Ref<import("@popperjs/core").Instance | undefined>;
-    contentRef: import("vue").Ref<HTMLElement | undefined>;
-    triggerRef: import("vue").Ref<import("element-plus/es/tokens").Measurable | undefined>;
-    role: import("vue").ComputedRef<string>;
-    formItemContext: import("element-plus/es/tokens").FormItemContext | undefined;
-    nextZIndex: () => number;
-    ns: {
-        namespace: import("vue").Ref<string>;
-        b: (blockSuffix?: string) => string;
-        e: (element?: string | undefined) => string;
-        m: (modifier?: string | undefined) => string;
-        be: (blockSuffix?: string | undefined, element?: string | undefined) => string;
-        em: (element?: string | undefined, modifier?: string | undefined) => string;
-        bm: (blockSuffix?: string | undefined, modifier?: string | undefined) => string;
-        bem: (blockSuffix?: string | undefined, element?: string | undefined, modifier?: string | undefined) => string;
-        is: {
-            (name: string, state: boolean | undefined): string;
-            (name: string): string;
+    focusStartRef: import("vue").Ref<HTMLElement | "first" | "container" | undefined>;
+    trapped: import("vue").Ref<boolean>;
+    onFocusAfterReleased: (event: CustomEvent<any>) => void;
+    onFocusAfterTrapped: () => void;
+    onFocusInTrap: (event: FocusEvent) => void;
+    onFocusoutPrevented: (event: CustomEvent<any>) => void;
+    onReleaseRequested: () => void;
+    attributes: import("vue").ComputedRef<{
+        [key: string]: {
+            [key: string]: string | boolean;
         };
-        cssVar: (object: Record<string, string>) => Record<string, string>;
-        cssVarName: (name: string) => string;
-        cssVarBlock: (object: Record<string, string>) => Record<string, string>;
-        cssVarBlockName: (name: string) => string;
-    };
-    popperContentRef: import("vue").Ref<HTMLElement | undefined>;
-    focusStartRef: import("vue").Ref<HTMLElement | "first" | "container">;
+    }>;
     arrowRef: import("vue").Ref<HTMLElement | undefined>;
-    arrowOffset: import("vue").Ref<number | undefined>;
-    contentZIndex: import("vue").Ref<number>;
-    trapped: import("vue").Ref<boolean>;
-    triggerTargetAriaStopWatch: undefined;
-    computedReference: import("vue").ComputedRef<import("element-plus/es/tokens").Measurable | undefined>;
-    contentStyle: import("vue").ComputedRef<any>;
+    contentRef: import("vue").Ref<HTMLElement | undefined>;
+    styles: import("vue").ComputedRef<{
+        [key: string]: Partial<CSSStyleDeclaration>;
+    }>;
+    instanceRef: import("vue").ComputedRef<import("@popperjs/core").Instance | undefined>;
+    role: import("vue").ComputedRef<string>;
+    update: () => Promise<Partial<import("@popperjs/core").State>> | undefined;
+    ariaModal: import("vue").ComputedRef<string | undefined>;
+    arrowStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
+    contentAttrs: import("vue").ComputedRef<{
+        [key: string]: string | boolean;
+    }>;
     contentClass: import("vue").ComputedRef<((string | {
         [x: string]: boolean;
     } | (string | {
@@ -560,15 +551,13 @@ declare const _default: import("vue").DefineComponent<{
     } | (string | {
         [x: string]: boolean;
     } | any)[])[])[])[])[])[])[])[])[])[])[]) | undefined)[]>;
-    ariaModal: import("vue").ComputedRef<string | undefined>;
-    createPopperInstance: ({ referenceEl, popperContentEl, arrowEl, }: CreatePopperInstanceParams) => import("@popperjs/core").Instance;
+    contentStyle: import("vue").ComputedRef<import("vue").StyleValue[]>;
+    updateZIndex: () => void;
+    formItemContext: import("element-plus/es/tokens").FormItemContext | undefined;
+    arrowOffset: import("vue").Ref<number | undefined>;
+    triggerTargetAriaStopWatch: undefined;
     updatePopper: (shouldUpdateZIndex?: boolean) => void;
     togglePopperAlive: () => void;
-    onFocusAfterTrapped: () => void;
-    onFocusAfterReleased: (event: CustomEvent) => void;
-    onFocusInTrap: (event: FocusEvent) => void;
-    onFocusoutPrevented: (event: CustomEvent) => void;
-    onReleaseRequested: () => void;
     ElFocusTrap: import("vue").DefineComponent<{
         loop: BooleanConstructor;
         trapped: BooleanConstructor;
@@ -588,15 +577,15 @@ declare const _default: import("vue").DefineComponent<{
             default: string;
         };
     }>> & {
-        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
         onFocusAfterReleased?: ((...args: any[]) => any) | undefined;
+        onFocusAfterTrapped?: ((...args: any[]) => any) | undefined;
         onFocusin?: ((...args: any[]) => any) | undefined;
         onFocusout?: ((...args: any[]) => any) | undefined;
         "onFocusout-prevented"?: ((...args: any[]) => any) | undefined;
         "onRelease-requested"?: ((...args: any[]) => any) | undefined;
     }, {
-        loop: boolean;
         trapped: boolean;
+        loop: boolean;
         focusStartEl: HTMLElement | "first" | "container";
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {

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

@@ -1,18 +1,17 @@
-import { defineComponent, inject, ref, provide, computed, unref, onMounted, watch, onBeforeUnmount, openBlock, createElementBlock, normalizeStyle, normalizeClass, createVNode, withCtx, renderSlot } from 'vue';
+import { defineComponent, inject, ref, provide, onMounted, watch, unref, onBeforeUnmount, openBlock, createElementBlock, mergeProps, 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 { popperContentProps, popperContentEmits } from './content.mjs';
-import { unwrapMeasurableEl, buildPopperOptions } from './utils.mjs';
+import './composables/index.mjs';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
-import { POPPER_INJECTION_KEY, POPPER_CONTENT_INJECTION_KEY } from '../../../tokens/popper.mjs';
+import { usePopperContentFocusTrap } from './composables/use-focus-trap.mjs';
+import { usePopperContent } from './composables/use-content.mjs';
+import { usePopperContentDOM } from './composables/use-content-dom.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 { POPPER_CONTENT_INJECTION_KEY } from '../../../tokens/popper.mjs';
 import { isElement } from '../../../utils/types.mjs';
 import ElFocusTrap from '../../focus-trap/src/focus-trap.mjs';
 
@@ -25,15 +24,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: popperContentEmits,
   setup(__props, { expose, emit }) {
     const props = __props;
-    const { popperInstanceRef, contentRef, triggerRef, role } = inject(POPPER_INJECTION_KEY, void 0);
+    const {
+      focusStartRef,
+      trapped,
+      onFocusAfterReleased,
+      onFocusAfterTrapped,
+      onFocusInTrap,
+      onFocusoutPrevented,
+      onReleaseRequested
+    } = usePopperContentFocusTrap(props, emit);
+    const { attributes, arrowRef, contentRef, styles, instanceRef, role, update } = usePopperContent(props);
+    const {
+      ariaModal,
+      arrowStyle,
+      contentAttrs,
+      contentClass,
+      contentStyle,
+      updateZIndex
+    } = usePopperContentDOM(props, {
+      styles,
+      attributes,
+      role
+    });
     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, {
+      arrowStyle,
       arrowRef,
       arrowOffset
     });
@@ -44,43 +60,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         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());
+      update();
+      shouldUpdateZIndex && updateZIndex();
     };
     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;
@@ -88,65 +73,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         trapped.value = false;
       }
     };
-    const onFocusAfterTrapped = () => {
-      emit("focus");
-    };
-    const onFocusAfterReleased = (event) => {
-      var _a;
-      if (((_a = event.detail) == null ? void 0 : _a.focusReason) !== "pointer") {
-        focusStartRef.value = "first";
-        emit("blur");
-      }
-    };
-    const onFocusInTrap = (event) => {
-      if (props.visible && !trapped.value) {
-        if (event.target) {
-          focusStartRef.value = event.target;
-        }
-        trapped.value = true;
-      }
-    };
-    const onFocusoutPrevented = (event) => {
-      if (!props.trapping) {
-        if (event.detail.focusReason === "pointer") {
-          event.preventDefault();
-        }
-        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);
+        const el = unref(triggerTargetEl || contentRef.value);
+        const prevEl = unref(prevTriggerTargetEl || contentRef.value);
         if (isElement(el)) {
           triggerTargetAriaStopWatch = watch([role, () => props.ariaLabel, ariaModal, () => props.id], (watches) => {
             ;
@@ -163,51 +95,45 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }, { 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,
+      popperContentRef: contentRef,
+      popperInstanceRef: instanceRef,
       updatePopper,
       contentStyle
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        ref_key: "popperContentRef",
-        ref: popperContentRef,
-        style: normalizeStyle(unref(contentStyle)),
-        class: normalizeClass(unref(contentClass)),
+      return openBlock(), createElementBlock("div", mergeProps({
+        ref_key: "contentRef",
+        ref: contentRef
+      }, unref(contentAttrs), {
+        style: unref(contentStyle),
+        class: 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,
+          trapped: unref(trapped),
           "trap-on-focus-in": true,
-          "focus-trap-el": popperContentRef.value,
-          "focus-start-el": focusStartRef.value,
-          onFocusAfterTrapped,
-          onFocusAfterReleased,
-          onFocusin: onFocusInTrap,
-          onFocusoutPrevented,
-          onReleaseRequested
+          "focus-trap-el": unref(contentRef),
+          "focus-start-el": unref(focusStartRef),
+          onFocusAfterTrapped: unref(onFocusAfterTrapped),
+          onFocusAfterReleased: unref(onFocusAfterReleased),
+          onFocusin: unref(onFocusInTrap),
+          onFocusoutPrevented: unref(onFocusoutPrevented),
+          onReleaseRequested: unref(onReleaseRequested)
         }, {
           default: withCtx(() => [
             renderSlot(_ctx.$slots, "default")
           ]),
           _: 3
-        }, 8, ["trapped", "focus-trap-el", "focus-start-el"])
-      ], 38);
+        }, 8, ["trapped", "focus-trap-el", "focus-start-el", "onFocusAfterTrapped", "onFocusAfterReleased", "onFocusin", "onFocusoutPrevented", "onReleaseRequested"])
+      ], 16);
     };
   }
 });

package/es/components/popper/src/content2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"content2.mjs","sources":["../../../../../../packages/components/popper/src/content.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"popperContentRef\"\n    :style=\"contentStyle\"\n    :class=\"contentClass\"\n    tabindex=\"-1\"\n    @mouseenter=\"(e) => $emit('mouseenter', e)\"\n    @mouseleave=\"(e) => $emit('mouseleave', e)\"\n  >\n    <el-focus-trap\n      :trapped=\"trapped\"\n      :trap-on-focus-in=\"true\"\n      :focus-trap-el=\"popperContentRef\"\n      :focus-start-el=\"focusStartRef\"\n      @focus-after-trapped=\"onFocusAfterTrapped\"\n      @focus-after-released=\"onFocusAfterReleased\"\n      @focusin=\"onFocusInTrap\"\n      @focusout-prevented=\"onFocusoutPrevented\"\n      @release-requested=\"onReleaseRequested\"\n    >\n      <slot />\n    </el-focus-trap>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport {\n  computed,\n  inject,\n  onBeforeUnmount,\n  onMounted,\n  provide,\n  ref,\n  unref,\n  watch,\n} from 'vue'\nimport { NOOP } from '@vue/shared'\nimport { isNil } from 'lodash-unified'\nimport { createPopper } from '@popperjs/core'\nimport ElFocusTrap from '@element-plus/components/focus-trap'\nimport { useNamespace, useZIndex } from '@element-plus/hooks'\nimport {\n  POPPER_CONTENT_INJECTION_KEY,\n  POPPER_INJECTION_KEY,\n  formItemContextKey,\n} from '@element-plus/tokens'\nimport { isElement } from '@element-plus/utils'\nimport { popperContentEmits, popperContentProps } from './content'\nimport { buildPopperOptions, unwrapMeasurableEl } from './utils'\n\nimport type { WatchStopHandle } from 'vue'\nimport type { CreatePopperInstanceParams } from './content'\n\ndefineOptions({\n  name: 'ElPopperContent',\n})\n\nconst emit = defineEmits(popperContentEmits)\n\nconst props = defineProps(popperContentProps)\n\nconst { popperInstanceRef, contentRef, triggerRef, role } = inject(\n  POPPER_INJECTION_KEY,\n  undefined\n)!\nconst formItemContext = inject(formItemContextKey, undefined)\nconst { nextZIndex } = useZIndex()\nconst ns = useNamespace('popper')\nconst popperContentRef = ref<HTMLElement>()\nconst focusStartRef = ref<'container' | 'first' | HTMLElement>('first')\nconst arrowRef = ref<HTMLElement>()\nconst arrowOffset = ref<number>()\nprovide(POPPER_CONTENT_INJECTION_KEY, {\n  arrowRef,\n  arrowOffset,\n})\n\nif (\n  formItemContext &&\n  (formItemContext.addInputId || formItemContext.removeInputId)\n) {\n  // disallow auto-id from inside popper content\n  provide(formItemContextKey, {\n    ...formItemContext,\n    addInputId: NOOP,\n    removeInputId: NOOP,\n  })\n}\n\nconst contentZIndex = ref<number>(props.zIndex || nextZIndex())\nconst trapped = ref<boolean>(false)\n\nlet triggerTargetAriaStopWatch: WatchStopHandle | undefined = undefined\n\nconst computedReference = computed(\n  () => unwrapMeasurableEl(props.referenceEl) || unref(triggerRef)\n)\n\nconst contentStyle = computed(\n  () => [{ zIndex: unref(contentZIndex) }, props.popperStyle] as any\n)\n\nconst contentClass = computed(() => [\n  ns.b(),\n  ns.is('pure', props.pure),\n  ns.is(props.effect),\n  props.popperClass,\n])\n\nconst ariaModal = computed<string | undefined>(() => {\n  return role && role.value === 'dialog' ? 'false' : undefined\n})\n\nconst createPopperInstance = ({\n  referenceEl,\n  popperContentEl,\n  arrowEl,\n}: CreatePopperInstanceParams) => {\n  const options = buildPopperOptions(props, {\n    arrowEl,\n    arrowOffset: unref(arrowOffset),\n  })\n\n  return createPopper(referenceEl, popperContentEl, options)\n}\n\nconst updatePopper = (shouldUpdateZIndex = true) => {\n  unref(popperInstanceRef)?.update()\n  shouldUpdateZIndex && (contentZIndex.value = props.zIndex || nextZIndex())\n}\n\nconst togglePopperAlive = () => {\n  const monitorable = { name: 'eventListeners', enabled: props.visible }\n  unref(popperInstanceRef)?.setOptions?.((options) => ({\n    ...options,\n    modifiers: [...(options.modifiers || []), monitorable],\n  }))\n  updatePopper(false)\n  if (props.visible && props.focusOnShow) {\n    trapped.value = true\n  } else if (props.visible === false) {\n    trapped.value = false\n  }\n}\n\nconst onFocusAfterTrapped = () => {\n  emit('focus')\n}\n\nconst onFocusAfterReleased = (event: CustomEvent) => {\n  if (event.detail?.focusReason !== 'pointer') {\n    focusStartRef.value = 'first'\n    emit('blur')\n  }\n}\n\nconst onFocusInTrap = (event: FocusEvent) => {\n  if (props.visible && !trapped.value) {\n    if (event.target) {\n      focusStartRef.value = event.target as typeof focusStartRef.value\n    }\n    trapped.value = true\n  }\n}\n\nconst onFocusoutPrevented = (event: CustomEvent) => {\n  if (!props.trapping) {\n    if (event.detail.focusReason === 'pointer') {\n      event.preventDefault()\n    }\n    trapped.value = false\n  }\n}\n\nconst onReleaseRequested = () => {\n  trapped.value = false\n  emit('close')\n}\n\nonMounted(() => {\n  let updateHandle: WatchStopHandle\n  watch(\n    computedReference,\n    (referenceEl) => {\n      updateHandle?.()\n      const popperInstance = unref(popperInstanceRef)\n      popperInstance?.destroy?.()\n      if (referenceEl) {\n        const popperContentEl = unref(popperContentRef)!\n        contentRef.value = popperContentEl\n\n        popperInstanceRef.value = createPopperInstance({\n          referenceEl,\n          popperContentEl,\n          arrowEl: unref(arrowRef),\n        })\n\n        updateHandle = watch(\n          () => referenceEl.getBoundingClientRect(),\n          () => updatePopper(),\n          {\n            immediate: true,\n          }\n        )\n      } else {\n        popperInstanceRef.value = undefined\n      }\n    },\n    {\n      immediate: true,\n    }\n  )\n\n  watch(\n    () => props.triggerTargetEl,\n    (triggerTargetEl, prevTriggerTargetEl) => {\n      triggerTargetAriaStopWatch?.()\n      triggerTargetAriaStopWatch = undefined\n\n      const el = unref(triggerTargetEl || popperContentRef.value)\n      const prevEl = unref(prevTriggerTargetEl || popperContentRef.value)\n\n      if (isElement(el)) {\n        triggerTargetAriaStopWatch = watch(\n          [role, () => props.ariaLabel, ariaModal, () => props.id],\n          (watches) => {\n            ;['role', 'aria-label', 'aria-modal', 'id'].forEach((key, idx) => {\n              isNil(watches[idx])\n                ? el.removeAttribute(key)\n                : el.setAttribute(key, watches[idx]!)\n            })\n          },\n          { immediate: true }\n        )\n      }\n      if (prevEl !== el && isElement(prevEl)) {\n        ;['role', 'aria-label', 'aria-modal', 'id'].forEach((key) => {\n          prevEl.removeAttribute(key)\n        })\n      }\n    },\n    { immediate: true }\n  )\n\n  watch(() => props.visible, togglePopperAlive, { immediate: true })\n\n  watch(\n    () =>\n      buildPopperOptions(props, {\n        arrowEl: unref(arrowRef),\n        arrowOffset: unref(arrowOffset),\n      }),\n    (option) => popperInstanceRef.value?.setOptions(option)\n  )\n})\n\nonBeforeUnmount(() => {\n  triggerTargetAriaStopWatch?.()\n  triggerTargetAriaStopWatch = undefined\n})\n\ndefineExpose({\n  /**\n   * @description popper content element\n   */\n  popperContentRef,\n  /**\n   * @description popperjs instance\n   */\n  popperInstanceRef,\n  /**\n   * @description method for updating popper\n   */\n  updatePopper,\n\n  /**\n   * @description content style\n   */\n  contentStyle,\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;mCAqDc,CAAA;AAAA,EACZ,IAAM,EAAA,iBAAA;AACR,CAAA,CAAA,CAAA;;;;;;;AAMA,IAAA,MAAM,EAAE,iBAAmB,EAAA,UAAA,EAAY,YAAY,IAAS,EAAA,GAAA,MAAA,CAC1D,sBACA,KACF,CAAA,CAAA,CAAA;AACA,IAAM,MAAA,eAAA,GAAkB,MAAO,CAAA,kBAAA,EAAoB,KAAS,CAAA,CAAA,CAAA;AAC5D,IAAM,MAAA,EAAE,eAAe,SAAU,EAAA,CAAA;AACjC,IAAM,MAAA,EAAA,GAAK,aAAa,QAAQ,CAAA,CAAA;AAChC,IAAA,MAAM,mBAAmB,GAAiB,EAAA,CAAA;AAC1C,IAAM,MAAA,aAAA,GAAgB,IAAyC,OAAO,CAAA,CAAA;AACtE,IAAA,MAAM,WAAW,GAAiB,EAAA,CAAA;AAClC,IAAA,MAAM,cAAc,GAAY,EAAA,CAAA;AAChC,IAAA,OAAA,CAAQ,4BAA8B,EAAA;AAAA,MACpC,QAAA;AAAA,MACA,WAAA;AAAA,KACD,CAAA,CAAA;AAED,IAAA,IACE,eACC,KAAA,eAAA,CAAgB,UAAc,IAAA,eAAA,CAAgB,aAC/C,CAAA,EAAA;AAEA,MAAA,OAAA,CAAQ,kBAAoB,EAAA;AAAA,QAC1B,GAAG,eAAA;AAAA,QACH,UAAY,EAAA,IAAA;AAAA,QACZ,aAAe,EAAA,IAAA;AAAA,OAChB,CAAA,CAAA;AAAA,KACH;AAEA,IAAA,MAAM,aAAgB,GAAA,GAAA,CAAY,KAAM,CAAA,MAAA,IAAU,YAAY,CAAA,CAAA;AAC9D,IAAM,MAAA,OAAA,GAAU,IAAa,KAAK,CAAA,CAAA;AAElC,IAAA,IAAI,0BAA0D,GAAA,KAAA,CAAA,CAAA;AAE9D,IAAM,MAAA,iBAAA,GAAoB,SACxB,MAAM,kBAAA,CAAmB,MAAM,WAAW,CAAA,IAAK,KAAM,CAAA,UAAU,CACjE,CAAA,CAAA;AAEA,IAAA,MAAM,YAAe,GAAA,QAAA,CACnB,MAAM,CAAC,EAAE,MAAA,EAAQ,KAAM,CAAA,aAAa,CAAE,EAAA,EAAG,KAAM,CAAA,WAAW,CAC5D,CAAA,CAAA;AAEA,IAAM,MAAA,YAAA,GAAe,SAAS,MAAM;AAAA,MAClC,GAAG,CAAE,EAAA;AAAA,MACL,EAAG,CAAA,EAAA,CAAG,MAAQ,EAAA,KAAA,CAAM,IAAI,CAAA;AAAA,MACxB,EAAA,CAAG,EAAG,CAAA,KAAA,CAAM,MAAM,CAAA;AAAA,MAClB,KAAM,CAAA,WAAA;AAAA,KACP,CAAA,CAAA;AAED,IAAM,MAAA,SAAA,GAAY,SAA6B,MAAM;AACnD,MAAA,OAAO,IAAQ,IAAA,IAAA,CAAK,KAAU,KAAA,QAAA,GAAW,OAAU,GAAA,KAAA,CAAA,CAAA;AAAA,KACpD,CAAA,CAAA;AAED,IAAA,MAAM,uBAAuB,CAAC;AAAA,MAC5B,WAAA;AAAA,MACA,eAAA;AAAA,MACA,OAAA;AAAA,KACgC,KAAA;AAChC,MAAM,MAAA,OAAA,GAAU,mBAAmB,KAAO,EAAA;AAAA,QACxC,OAAA;AAAA,QACA,WAAA,EAAa,MAAM,WAAW,CAAA;AAAA,OAC/B,CAAA,CAAA;AAED,MAAO,OAAA,YAAA,CAAa,WAAa,EAAA,eAAA,EAAiB,OAAO,CAAA,CAAA;AAAA,KAC3D,CAAA;AAEA,IAAM,MAAA,YAAA,GAAe,CAAC,kBAAA,GAAqB,IAAS,KAAA;AAClD,MAAM,IAAA,EAAA,CAAA;AACN,MAAA,CAAA,EAAA,GAAA,KAAA,CAAA,iBAAqC,CAAA,KAAA,IAAA,GAAA,KAAc,CAAA,GAAA,EAAA,CAAA,MAAA,EAAqB,CAAA;AAAA,MAC1E,kBAAA,KAAA,aAAA,CAAA,KAAA,GAAA,KAAA,CAAA,MAAA,IAAA,UAAA,EAAA,CAAA,CAAA;AAEA,KAAA,CAAA;AACE,IAAA,MAAA,iBAAsB,GAAA,MAAwB;AAC9C,MAAA,IAAA,EAAM,EAAiB,EAAA,CAAA;AAA8B,MAAA,MAChD,WAAA,GAAA,EAAA,IAAA,EAAA,gBAAA,EAAA,OAAA,EAAA,KAAA,CAAA,OAAA,EAAA,CAAA;AAAA,MAAA,CAAA,gBACa,kBAAqB,CAAA,SAAgB,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,UAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,EAAA,EAAA,CAAA,OAAA,MAAA;AAAA,QACrD,GAAA,OAAA;AACF,QAAA,SAAA,EAAa,CAAK,GAAA,OAAA,CAAA,SAAA,IAAA,EAAA,EAAA,WAAA,CAAA;AAClB,OAAI,CAAA,CAAA,CAAA;AACF,MAAA,YAAgB,CAAA,KAAA,CAAA,CAAA;AAAA,MAClB,IAAA,KAAA,CAAA,OAAiB,IAAA,KAAA,CAAA,WAAmB,EAAA;AAClC,QAAA,OAAA,CAAQ,KAAQ,GAAA,IAAA,CAAA;AAAA,OAClB,MAAA,IAAA,KAAA,CAAA,OAAA,KAAA,KAAA,EAAA;AAAA,QACF,OAAA,CAAA,KAAA,GAAA,KAAA,CAAA;AAEA,OAAA;AACE,KAAA,CAAA;AAAY,IACd,MAAA,mBAAA,GAAA,MAAA;AAEA,MAAM,IAAA,CAAA,OAAA,CAAA,CAAA;AACJ,KAAI,CAAA;AACF,IAAA,MAAA,oBAAsB,GAAA,CAAA,KAAA,KAAA;AACtB,MAAA,IAAA,EAAA,CAAK;AAAM,MACb,IAAA,CAAA,CAAA,EAAA,GAAA,KAAA,CAAA,MAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,WAAA,MAAA,SAAA,EAAA;AAAA,QACF,aAAA,CAAA,KAAA,GAAA,OAAA,CAAA;AAEA,QAAM,IAAA,CAAA,MAAA,CAAA,CAAA;AACJ,OAAA;AACE,KAAA,CAAA;AACE,IAAA,MAAA,aAAA,SAAsB,KAAM;AAAA,MAC9B,IAAA,KAAA,CAAA,OAAA,IAAA,CAAA,OAAA,CAAA,KAAA,EAAA;AACA,QAAA,IAAA,KAAgB,CAAA,MAAA,EAAA;AAAA,UAClB,aAAA,CAAA,KAAA,GAAA,KAAA,CAAA,MAAA,CAAA;AAAA,SACF;AAEA,QAAM,OAAA,CAAA,KAAA,GAAA,IAAA,CAAA;AACJ,OAAI;AACF,KAAI,CAAA;AACF,IAAA,MAAA,mBAAqB,GAAA,CAAA,KAAA,KAAA;AAAA,MACvB,IAAA,CAAA,KAAA,CAAA,QAAA,EAAA;AACA,QAAA,IAAA,KAAgB,CAAA,MAAA,CAAA,WAAA,KAAA,SAAA,EAAA;AAAA,UAClB,KAAA,CAAA,cAAA,EAAA,CAAA;AAAA,SACF;AAEA,QAAA;AACE,OAAA;AACA,KAAA,CAAA;AAAY,IACd,MAAA,kBAAA,GAAA,MAAA;AAEA,MAAA,OAAA,CAAU,KAAM,GAAA,KAAA,CAAA;AACd,MAAI,IAAA,CAAA,OAAA,CAAA,CAAA;AACJ,KACE,CAAA;AAEE,IAAe,SAAA,CAAA,MAAA;AACf,MAAM,IAAA,YAAA,CAAA;AACN,MAAA,KAAA,CAAA,iBAA0B,EAAA,CAAA,WAAA,KAAA;AAC1B,QAAA,IAAI,EAAa,CAAA;AACf,QAAM,YAAA,IAAA,IAAA,GAAA,SAAwB,YAAgB,EAAA,CAAA;AAC9C,QAAA,MAAA,cAAmB,GAAA,KAAA,CAAA,iBAAA,CAAA,CAAA;AAEnB,QAAA,CAAA,EAAA,GAAA,cAAkB,QAAQ,GAAqB,KAAA,CAAA,GAAA,cAAA,CAAA,OAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAA,CAAA,cAAA,CAAA,CAAA;AAAA,QAC7C,IAAA,WAAA,EAAA;AAAA,UACA,MAAA,eAAA,GAAA,KAAA,CAAA,gBAAA,CAAA,CAAA;AAAA,UACA,UAAA,CAAS,QAAc,eAAA,CAAA;AAAA,UACzB,iBAAC,CAAA,KAAA,GAAA,oBAAA,CAAA;AAED,YAAA,WAAA;AAGE,YACE,eAAW;AAAA,YAEf,OAAA,EAAA,KAAA,CAAA,QAAA,CAAA;AAAA,WACK,CAAA,CAAA;AACL,UAAA,YAAA,GAAA,KAA0B,CAAA,MAAA,WAAA,CAAA,qBAAA,EAAA,EAAA,MAAA,YAAA,EAAA,EAAA;AAAA,YAC5B,SAAA,EAAA,IAAA;AAAA,WAEF,CAAA,CAAA;AAAA,SACa,MAAA;AAAA,UAEf,iBAAA,CAAA,KAAA,GAAA,KAAA,CAAA,CAAA;AAEA,SAAA;AAGI,OAA6B,EAAA;AAC7B,QAA6B,SAAA,EAAA,IAAA;AAE7B,OAAA,CAAA,CAAA;AACA,MAAA,KAAA,CAAA,MAAe,KAAA,CAAA,eAA6B,EAAA,CAAA,eAAA,EAAA,mBAAsB,KAAA;AAElE,QAAI,0BAAe,IAAA,IAAA,GAAA,KAAA,CAAA,GAAA,0BAAA,EAAA,CAAA;AACjB,QAAA,0BAAA,GAAA,KACE,CAAA,CAAA;AAEE,QAAA,MAAA,EAAA,GAAA,KAAA,CAAA,eAAA,IAAA,gBAAA,CAAA,KAAA,CAAA,CAAA;AAAC,QAAC,MAAA,MAAA,4BAAoC,IAAA,iBAAoB,KAAQ,CAAA,CAAA;AAChE,QAAM,IAAA,SAAA,CAAA,EAAA,CAAA,EAAA;AAEgC,UAAA,0BACvC,GAAA,KAAA,CAAA,CAAA,IAAA,EAAA,MAAA,KAAA,CAAA,SAAA,EAAA,SAAA,EAAA,MAAA,KAAA,CAAA,EAAA,CAAA,EAAA,CAAA,OAAA,KAAA;AAAA,YAEH,CAAA;AACF,YACF,CAAA,MAAA,EAAA,YAAA,EAAA,YAAA,EAAA,IAAA,CAAA,CAAA,OAAA,CAAA,CAAA,GAAA,EAAA,GAAA,KAAA;AACA,cAAe,KAAA,CAAA,OAAA,CAAA,GAAgB,CAAA,CAAA,GAAA,EAAA,CAAA,eAAS,CAAA,GAAA,CAAA,GAAA,EAAA,CAAA,YAAA,CAAA,GAAA,EAAA,OAAA,CAAA,GAAA,CAAA,CAAA,CAAA;AACtC,aAAA,CAAA,CAAA;AAAC,WAAC,aAAsB,EAAA,IAAA,EAAA,CAAA,CAAA;AACtB,SAAA;AAA0B,QAAA,IAC3B,MAAA,KAAA,EAAA,IAAA,SAAA,CAAA,MAAA,CAAA,EAAA;AAAA,UACH,CAAA;AAAA,UAEF,CAAE,MAAW,EAAA,YACf,EAAA,YAAA,EAAA,IAAA,CAAA,CAAA,OAAA,CAAA,CAAA,GAAA,KAAA;AAEA,YAAM,MAAM,CAAM;AAElB,WACE,CAAA,CAAA;AAC4B,SACxB;AAAuB,OACvB,EAAA,EAAA,SAAA,QAA8B,CAAA,CAAA;AAAA,MAChC,KACD,CAAA,MAAA,gCAAoC,EAAA,EAAA,WACvC,IAAA,EAAA,CAAA,CAAA;AAAA,MACD,KAAA,CAAA,MAAA,kBAAA,CAAA,KAAA,EAAA;AAED,QAAA,OAAA,EAAA,KAAsB,CAAA,QAAA,CAAA;AACpB,QAA6B,WAAA,EAAA,KAAA,CAAA,WAAA,CAAA;AAC7B,OAA6B,CAAA,EAAA,CAAA,MAAA,KAAA;AAAA,QAC9B,IAAA,EAAA,CAAA;AAED,QAAa,OAAA,CAAA,EAAA,GAAA,iBAAA,CAAA,KAAA,KAAA,IAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,UAAA,CAAA,MAAA,CAAA,CAAA;AAAA,OAIX,CAAA,CAAA;AAAA,KAIA,CAAA,CAAA;AAAA,IAIA,eAAA,CAAA,MAAA;AAAA,MAKA,0BAAA,IAAA,IAAA,GAAA,KAAA,CAAA,GAAA,0BAAA,EAAA,CAAA;AAAA,MACD,0BAAA,GAAA,KAAA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"content2.mjs","sources":["../../../../../../packages/components/popper/src/content.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"contentRef\"\n    v-bind=\"contentAttrs\"\n    :style=\"contentStyle\"\n    :class=\"contentClass\"\n    tabindex=\"-1\"\n    @mouseenter=\"(e) => $emit('mouseenter', e)\"\n    @mouseleave=\"(e) => $emit('mouseleave', e)\"\n  >\n    <el-focus-trap\n      :trapped=\"trapped\"\n      :trap-on-focus-in=\"true\"\n      :focus-trap-el=\"contentRef\"\n      :focus-start-el=\"focusStartRef\"\n      @focus-after-trapped=\"onFocusAfterTrapped\"\n      @focus-after-released=\"onFocusAfterReleased\"\n      @focusin=\"onFocusInTrap\"\n      @focusout-prevented=\"onFocusoutPrevented\"\n      @release-requested=\"onReleaseRequested\"\n    >\n      <slot />\n    </el-focus-trap>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport {\n  inject,\n  onBeforeUnmount,\n  onMounted,\n  provide,\n  ref,\n  unref,\n  watch,\n} from 'vue'\nimport { NOOP } from '@vue/shared'\nimport { isNil } from 'lodash-unified'\nimport ElFocusTrap from '@element-plus/components/focus-trap'\nimport {\n  POPPER_CONTENT_INJECTION_KEY,\n  formItemContextKey,\n} from '@element-plus/tokens'\nimport { isElement } from '@element-plus/utils'\nimport { popperContentEmits, popperContentProps } from './content'\nimport {\n  usePopperContent,\n  usePopperContentDOM,\n  usePopperContentFocusTrap,\n} from './composables'\n\nimport type { WatchStopHandle } from 'vue'\n\ndefineOptions({\n  name: 'ElPopperContent',\n})\n\nconst emit = defineEmits(popperContentEmits)\n\nconst props = defineProps(popperContentProps)\n\nconst {\n  focusStartRef,\n  trapped,\n\n  onFocusAfterReleased,\n  onFocusAfterTrapped,\n  onFocusInTrap,\n  onFocusoutPrevented,\n  onReleaseRequested,\n} = usePopperContentFocusTrap(props, emit)\n\nconst { attributes, arrowRef, contentRef, styles, instanceRef, role, update } =\n  usePopperContent(props)\n\nconst {\n  ariaModal,\n  arrowStyle,\n  contentAttrs,\n  contentClass,\n  contentStyle,\n  updateZIndex,\n} = usePopperContentDOM(props, {\n  styles,\n  attributes,\n  role,\n})\n\nconst formItemContext = inject(formItemContextKey, undefined)\nconst arrowOffset = ref<number>()\n\nprovide(POPPER_CONTENT_INJECTION_KEY, {\n  arrowStyle,\n  arrowRef,\n  arrowOffset,\n})\n\nif (\n  formItemContext &&\n  (formItemContext.addInputId || formItemContext.removeInputId)\n) {\n  // disallow auto-id from inside popper content\n  provide(formItemContextKey, {\n    ...formItemContext,\n    addInputId: NOOP,\n    removeInputId: NOOP,\n  })\n}\n\nlet triggerTargetAriaStopWatch: WatchStopHandle | undefined = undefined\n\nconst updatePopper = (shouldUpdateZIndex = true) => {\n  update()\n  shouldUpdateZIndex && updateZIndex()\n}\n\nconst togglePopperAlive = () => {\n  updatePopper(false)\n  if (props.visible && props.focusOnShow) {\n    trapped.value = true\n  } else if (props.visible === false) {\n    trapped.value = false\n  }\n}\n\nonMounted(() => {\n  watch(\n    () => props.triggerTargetEl,\n    (triggerTargetEl, prevTriggerTargetEl) => {\n      triggerTargetAriaStopWatch?.()\n      triggerTargetAriaStopWatch = undefined\n\n      const el = unref(triggerTargetEl || contentRef.value)\n      const prevEl = unref(prevTriggerTargetEl || contentRef.value)\n\n      if (isElement(el)) {\n        triggerTargetAriaStopWatch = watch(\n          [role, () => props.ariaLabel, ariaModal, () => props.id],\n          (watches) => {\n            ;['role', 'aria-label', 'aria-modal', 'id'].forEach((key, idx) => {\n              isNil(watches[idx])\n                ? el.removeAttribute(key)\n                : el.setAttribute(key, watches[idx]!)\n            })\n          },\n          { immediate: true }\n        )\n      }\n      if (prevEl !== el && isElement(prevEl)) {\n        ;['role', 'aria-label', 'aria-modal', 'id'].forEach((key) => {\n          prevEl.removeAttribute(key)\n        })\n      }\n    },\n    { immediate: true }\n  )\n\n  watch(() => props.visible, togglePopperAlive, { immediate: true })\n})\n\nonBeforeUnmount(() => {\n  triggerTargetAriaStopWatch?.()\n  triggerTargetAriaStopWatch = undefined\n})\n\ndefineExpose({\n  /**\n   * @description popper content element\n   */\n  popperContentRef: contentRef,\n  /**\n   * @description popperjs instance\n   */\n  popperInstanceRef: instanceRef,\n  /**\n   * @description method for updating popper\n   */\n  updatePopper,\n\n  /**\n   * @description content style\n   */\n  contentStyle,\n})\n</script>\n"],"names":[],"mappings":"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"}

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

@@ -5,7 +5,7 @@ import _export_sfc from '../../../_virtual/plugin-vue_export-helper.mjs';
 import { POPPER_INJECTION_KEY } from '../../../tokens/popper.mjs';
 
 const __default__ = defineComponent({
-  name: "ElPopperRoot",
+  name: "ElPopper",
   inheritAttrs: false
 });
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/es/components/popper/src/popper2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"popper2.mjs","sources":["../../../../../../packages/components/popper/src/popper.vue"],"sourcesContent":["<template>\n  <slot />\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, provide, ref } from 'vue'\nimport { POPPER_INJECTION_KEY } from '@element-plus/tokens'\nimport { popperProps } from './popper'\n\nimport type { Instance as PopperInstance } from '@popperjs/core'\nimport type { ElPopperInjectionContext } from '@element-plus/tokens'\n\ndefineOptions({\n  name: 'ElPopperRoot',\n  inheritAttrs: false,\n})\nconst props = defineProps(popperProps)\n\nconst triggerRef = ref<HTMLElement>()\nconst popperInstanceRef = ref<PopperInstance>()\nconst contentRef = ref<HTMLElement>()\nconst referenceRef = ref<HTMLElement>()\nconst role = computed(() => props.role)\n\nconst popperProvides = {\n  /**\n   * @description trigger element\n   */\n  triggerRef,\n  /**\n   * @description popperjs instance\n   */\n  popperInstanceRef,\n  /**\n   * @description popper content element\n   */\n  contentRef,\n  /**\n   * @description popper reference element\n   */\n  referenceRef,\n  /**\n   * @description role determines how aria attributes are distributed\n   */\n  role,\n} as ElPopperInjectionContext\n\ndefineExpose(popperProvides)\n\nprovide(POPPER_INJECTION_KEY, popperProvides)\n</script>\n"],"names":[],"mappings":";;;;;;mCAYc,CAAA;AAAA,EACZ,IAAM,EAAA,cAAA;AAAA,EACN,YAAc,EAAA,KAAA;AAChB,CAAA,CAAA,CAAA;;;;;;AAGA,IAAA,MAAM,aAAa,GAAiB,EAAA,CAAA;AACpC,IAAA,MAAM,oBAAoB,GAAoB,EAAA,CAAA;AAC9C,IAAA,MAAM,aAAa,GAAiB,EAAA,CAAA;AACpC,IAAA,MAAM,eAAe,GAAiB,EAAA,CAAA;AACtC,IAAA,MAAM,IAAO,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,IAAI,CAAA,CAAA;AAEtC,IAAA,MAAM,cAAiB,GAAA;AAAA,MAIrB,UAAA;AAAA,MAIA,iBAAA;AAAA,MAIA,UAAA;AAAA,MAIA,YAAA;AAAA,MAIA,IAAA;AAAA,KACF,CAAA;AAEA,IAAA,MAAA,CAAa,cAAc,CAAA,CAAA;AAE3B,IAAA,OAAA,CAAQ,sBAAsB,cAAc,CAAA,CAAA;;;;;;;;;;"}
+{"version":3,"file":"popper2.mjs","sources":["../../../../../../packages/components/popper/src/popper.vue"],"sourcesContent":["<template>\n  <slot />\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, provide, ref } from 'vue'\nimport { POPPER_INJECTION_KEY } from '@element-plus/tokens'\nimport { popperProps } from './popper'\n\nimport type { Instance as PopperInstance } from '@popperjs/core'\nimport type { ElPopperInjectionContext } from '@element-plus/tokens'\n\ndefineOptions({\n  name: 'ElPopper',\n  inheritAttrs: false,\n})\nconst props = defineProps(popperProps)\n\nconst triggerRef = ref<HTMLElement>()\nconst popperInstanceRef = ref<PopperInstance>()\nconst contentRef = ref<HTMLElement>()\nconst referenceRef = ref<HTMLElement>()\nconst role = computed(() => props.role)\n\nconst popperProvides = {\n  /**\n   * @description trigger element\n   */\n  triggerRef,\n  /**\n   * @description popperjs instance\n   */\n  popperInstanceRef,\n  /**\n   * @description popper content element\n   */\n  contentRef,\n  /**\n   * @description popper reference element\n   */\n  referenceRef,\n  /**\n   * @description role determines how aria attributes are distributed\n   */\n  role,\n} as ElPopperInjectionContext\n\ndefineExpose(popperProvides)\n\nprovide(POPPER_INJECTION_KEY, popperProvides)\n</script>\n"],"names":[],"mappings":";;;;;;mCAYc,CAAA;AAAA,EACZ,IAAM,EAAA,UAAA;AAAA,EACN,YAAc,EAAA,KAAA;AAChB,CAAA,CAAA,CAAA;;;;;;AAGA,IAAA,MAAM,aAAa,GAAiB,EAAA,CAAA;AACpC,IAAA,MAAM,oBAAoB,GAAoB,EAAA,CAAA;AAC9C,IAAA,MAAM,aAAa,GAAiB,EAAA,CAAA;AACpC,IAAA,MAAM,eAAe,GAAiB,EAAA,CAAA;AACtC,IAAA,MAAM,IAAO,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,IAAI,CAAA,CAAA;AAEtC,IAAA,MAAM,cAAiB,GAAA;AAAA,MAIrB,UAAA;AAAA,MAIA,iBAAA;AAAA,MAIA,UAAA;AAAA,MAIA,YAAA;AAAA,MAIA,IAAA;AAAA,KACF,CAAA;AAEA,IAAA,MAAA,CAAa,cAAc,CAAA,CAAA;AAE3B,IAAA,OAAA,CAAQ,sBAAsB,cAAc,CAAA,CAAA;;;;;;;;;;"}

package/es/components/popper/src/utils.d.ts

@@ -1,13 +1,10 @@
 import type { ComponentPublicInstance } from 'vue';
 import type { MaybeRef } from '@vueuse/core';
+import type { Modifier } from '@popperjs/core';
 import type { Measurable } from 'element-plus/es/tokens';
 import type { PopperCoreConfigProps } from './content';
-declare type ArrowProps = {
-    arrowEl: HTMLElement | undefined;
-    arrowOffset: number | undefined;
-};
-export declare const buildPopperOptions: (props: PopperCoreConfigProps, arrowProps: ArrowProps) => {
-    modifiers: ({
+export declare const buildPopperOptions: (props: PopperCoreConfigProps, modifiers?: Modifier<any, any>[]) => {
+    modifiers: (Modifier<any, any> | {
         name: string;
         options: {
             offset: number[];
@@ -50,4 +47,3 @@ export declare const buildPopperOptions: (props: PopperCoreConfigProps, arrowPro
     onFirstUpdate?: ((arg0: Partial<import("@popperjs/core").State>) => void) | undefined;
 };
 export declare const unwrapMeasurableEl: ($el: MaybeRef<Measurable | undefined | ComponentPublicInstance>) => HTMLElement | undefined;
-export {};

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

@@ -1,14 +1,13 @@
 import { isClient, unrefElement } from '@vueuse/core';
 
-const buildPopperOptions = (props, arrowProps) => {
+const buildPopperOptions = (props, modifiers = []) => {
   const { placement, strategy, popperOptions } = props;
   const options = {
     placement,
     strategy,
     ...popperOptions,
-    modifiers: genModifiers(props)
+    modifiers: [...genModifiers(props), ...modifiers]
   };
-  attachArrow(options, arrowProps);
   deriveExtraModifiers(options, popperOptions == null ? void 0 : popperOptions.modifiers);
   return options;
 };
@@ -52,15 +51,6 @@ function genModifiers(options) {
     }
   ];
 }
-function attachArrow(options, { arrowEl, arrowOffset }) {
-  options.modifiers.push({
-    name: "arrow",
-    options: {
-      element: arrowEl,
-      padding: arrowOffset != null ? arrowOffset : 5
-    }
-  });
-}
 function deriveExtraModifiers(options, modifiers) {
   if (modifiers) {
     options.modifiers = [...options.modifiers, ...modifiers != null ? modifiers : []];