@element-plus/nightly 0.0.20220228 → 0.0.20220301

package/es/components/collapse/src/collapse2.mjs

@@ -0,0 +1,67 @@
+import { defineComponent, ref, watch, provide, openBlock, createElementBlock, normalizeClass, unref, renderSlot } from 'vue';
+import '../../../utils/index.mjs';
+import '../../../constants/index.mjs';
+import '../../../hooks/index.mjs';
+import '../../../tokens/index.mjs';
+import { collapseProps, collapseEmits } from './collapse.mjs';
+import { useNamespace } from '../../../hooks/use-namespace/index.mjs';
+import { castArray } from 'lodash-unified';
+import { UPDATE_MODEL_EVENT, CHANGE_EVENT } from '../../../constants/event.mjs';
+import { collapseContextKey } from '../../../tokens/collapse.mjs';
+
+const __default__ = {
+  name: "ElCollapse"
+};
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...__default__,
+  props: collapseProps,
+  emits: collapseEmits,
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const ns = useNamespace("collapse");
+    const activeNames = ref(castArray(props.modelValue));
+    const setActiveNames = (_activeNames) => {
+      activeNames.value = _activeNames;
+      const value = props.accordion ? activeNames.value[0] : activeNames.value;
+      emit(UPDATE_MODEL_EVENT, value);
+      emit(CHANGE_EVENT, value);
+    };
+    const handleItemClick = (name) => {
+      if (props.accordion) {
+        setActiveNames([
+          (activeNames.value[0] || activeNames.value[0] === 0) && activeNames.value[0] === name ? "" : name
+        ]);
+      } else {
+        const _activeNames = [...activeNames.value];
+        const index = _activeNames.indexOf(name);
+        if (index > -1) {
+          _activeNames.splice(index, 1);
+        } else {
+          _activeNames.push(name);
+        }
+        setActiveNames(_activeNames);
+      }
+    };
+    watch(() => props.modelValue, () => activeNames.value = castArray(props.modelValue), { deep: true });
+    provide(collapseContextKey, {
+      activeNames,
+      handleItemClick
+    });
+    expose({
+      activeNames,
+      setActiveNames
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(unref(ns).b()),
+        role: "tablist",
+        "aria-multiselectable": "true"
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 2);
+    };
+  }
+});
+
+export { _sfc_main as default };
+//# sourceMappingURL=collapse2.mjs.map

package/es/components/collapse/src/collapse2.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"collapse2.mjs","sources":["../../../../../../packages/components/collapse/src/collapse.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b()\" role=\"tablist\" aria-multiselectable=\"true\">\n    <slot></slot>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { ref, watch, provide } from 'vue'\nimport { ensureArray } from '@element-plus/utils'\nimport { UPDATE_MODEL_EVENT, CHANGE_EVENT } from '@element-plus/constants'\nimport { useNamespace } from '@element-plus/hooks'\nimport { collapseContextKey } from '@element-plus/tokens'\nimport { collapseProps, collapseEmits } from './collapse'\nimport type { CollapseActiveName } from './collapse'\n\ndefineOptions({\n  name: 'ElCollapse',\n})\nconst props = defineProps(collapseProps)\nconst emit = defineEmits(collapseEmits)\n\nconst ns = useNamespace('collapse')\nconst activeNames = ref(ensureArray(props.modelValue))\n\nconst setActiveNames = (_activeNames: CollapseActiveName[]) => {\n  activeNames.value = _activeNames\n  const value = props.accordion ? activeNames.value[0] : activeNames.value\n  emit(UPDATE_MODEL_EVENT, value)\n  emit(CHANGE_EVENT, value)\n}\n\nconst handleItemClick = (name: CollapseActiveName) => {\n  if (props.accordion) {\n    setActiveNames([\n      (activeNames.value[0] || activeNames.value[0] === 0) &&\n      activeNames.value[0] === name\n        ? ''\n        : name,\n    ])\n  } else {\n    const _activeNames = [...activeNames.value]\n    const index = _activeNames.indexOf(name)\n\n    if (index > -1) {\n      _activeNames.splice(index, 1)\n    } else {\n      _activeNames.push(name)\n    }\n    setActiveNames(_activeNames)\n  }\n}\n\nwatch(\n  () => props.modelValue,\n  () => (activeNames.value = ensureArray(props.modelValue)),\n  { deep: true }\n)\n\nprovide(collapseContextKey, {\n  activeNames,\n  handleItemClick,\n})\n\ndefineExpose({\n  /** @description active names */\n  activeNames,\n  /** @description set active names */\n  setActiveNames,\n})\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAqBA;AACA;AAEA;;;;;;AAOA;;;;;;;;;;;;;;;;AAqBA;AAMA;;;;AAKA;;;;;;;;;;;;;;;;;;"}

package/es/components/date-picker/index.d.ts

@@ -221,8 +221,8 @@ declare const _DatePicker: SFCWithInstall<import("vue").DefineComponent<{
     name: string | unknown[];
     modelValue: string | number | Date | (string | number | Date)[];
     editable: boolean;
-    popperOptions: Partial<import("@popperjs/core").Options>;
     popperClass: string;
+    popperOptions: Partial<import("@popperjs/core").Options>;
     placeholder: string;
     readonly: boolean;
     clearable: boolean;
@@ -458,8 +458,8 @@ export declare const ElDatePicker: SFCWithInstall<import("vue").DefineComponent<
     name: string | unknown[];
     modelValue: string | number | Date | (string | number | Date)[];
     editable: boolean;
-    popperOptions: Partial<import("@popperjs/core").Options>;
     popperClass: string;
+    popperOptions: Partial<import("@popperjs/core").Options>;
     placeholder: string;
     readonly: boolean;
     clearable: boolean;

package/es/components/date-picker/src/date-picker.d.ts

@@ -222,8 +222,8 @@ declare const _default: import("vue").DefineComponent<{
     name: string | unknown[];
     modelValue: string | number | Date | (string | number | Date)[];
     editable: boolean;
-    popperOptions: Partial<import("@popperjs/core").Options>;
     popperClass: string;
+    popperOptions: Partial<import("@popperjs/core").Options>;
     placeholder: string;
     readonly: boolean;
     clearable: boolean;

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

@@ -67,9 +67,9 @@ export declare const ElDescriptions: import("element-plus/es/utils").SFCWithInst
     };
 }>>, {
     title: string;
-    column: number;
-    border: boolean;
     direction: "horizontal" | "vertical";
+    border: boolean;
+    column: number;
     extra: string;
 }>> & {
     DescriptionsItem: import("vue").DefineComponent<{
@@ -140,8 +140,8 @@ export declare const ElDescriptions: import("element-plus/es/utils").SFCWithInst
         };
     }>>, {
         label: string;
-        className: string;
         width: string | number;
+        className: string;
         minWidth: string | number;
         span: number;
         align: string;
@@ -218,8 +218,8 @@ export declare const ElDescriptionsItem: import("element-plus/es/utils").SFCWith
     };
 }>>, {
     label: string;
-    className: string;
     width: string | number;
+    className: string;
     minWidth: string | number;
     span: number;
     align: string;

package/es/components/descriptions/src/description-item.d.ts

@@ -66,8 +66,8 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     label: string;
-    className: string;
     width: string | number;
+    className: string;
     minWidth: string | number;
     span: number;
     align: string;

package/es/components/descriptions/src/index.vue.d.ts

@@ -68,9 +68,9 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     title: string;
-    column: number;
-    border: boolean;
     direction: "horizontal" | "vertical";
+    border: boolean;
+    column: number;
     extra: string;
 }>;
 export default _default;

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

@@ -1,6 +1,6 @@
 export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
     readonly appendToBody: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<(...args: any[]) => void>, unknown, unknown, unknown, unknown>;
+    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<import("./src/dialog").DialogBeforeCloseFn>, unknown, unknown, unknown, unknown>;
     readonly destroyOnClose: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeOnClickModal: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
     readonly closeOnPressEscape: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
@@ -13,6 +13,7 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
     readonly modalClass: StringConstructor;
     readonly width: import("element-plus/es/utils").BuildPropReturn<readonly [StringConstructor, NumberConstructor], unknown, unknown, unknown, unknown>;
     readonly zIndex: import("element-plus/es/utils").BuildPropReturn<NumberConstructor, unknown, unknown, unknown, unknown>;
+    readonly trapFocus: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly center: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeIcon: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, "", unknown, unknown, unknown>;
     readonly customClass: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
@@ -23,7 +24,7 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         readonly appendToBody: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-        readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<(...args: any[]) => void>, unknown, unknown, unknown, unknown>;
+        readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<import("./src/dialog").DialogBeforeCloseFn>, unknown, unknown, unknown, unknown>;
         readonly destroyOnClose: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
         readonly closeOnClickModal: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
         readonly closeOnPressEscape: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
@@ -36,6 +37,7 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
         readonly modalClass: StringConstructor;
         readonly width: import("element-plus/es/utils").BuildPropReturn<readonly [StringConstructor, NumberConstructor], unknown, unknown, unknown, unknown>;
         readonly zIndex: import("element-plus/es/utils").BuildPropReturn<NumberConstructor, unknown, unknown, unknown, unknown>;
+        readonly trapFocus: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
         readonly center: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
         readonly closeIcon: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, "", unknown, unknown, unknown>;
         readonly customClass: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
@@ -45,14 +47,13 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
         readonly title: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
     }>> & {
         onClose?: (() => any) | undefined;
-        onOpen?: (() => any) | undefined;
         "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
+        onOpen?: (() => any) | undefined;
         onOpened?: (() => any) | undefined;
         onClosed?: (() => any) | undefined;
         onOpenAutoFocus?: (() => any) | undefined;
         onCloseAutoFocus?: (() => any) | undefined;
     }>>;
-    emit: ((event: "update:modelValue", value: boolean) => void) & ((event: "close") => void) & ((event: "open") => void) & ((event: "opened") => void) & ((event: "closed") => void) & ((event: "openAutoFocus") => void) & ((event: "closeAutoFocus") => void);
     ns: {
         namespace: import("vue").ComputedRef<string>;
         b: (blockSuffix?: string) => string;
@@ -67,29 +68,17 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
             (name: string): string;
         };
     };
-    dialogRef: import("vue").Ref<HTMLElement | null>;
-    headerRef: import("vue").Ref<HTMLElement | null>;
-    dialog: {
-        afterEnter: () => void;
-        afterLeave: () => void;
-        beforeLeave: () => void;
-        handleClose: () => void;
-        onModalClick: () => void;
-        close: () => void;
-        doClose: () => void;
-        closed: import("vue").Ref<boolean>;
-        style: import("vue").ComputedRef<import("vue").CSSProperties>;
-        rendered: import("vue").Ref<boolean>;
-        visible: import("vue").Ref<boolean>;
-        zIndex: import("vue").Ref<number>;
-    };
+    dialogRef: import("vue").Ref<HTMLElement | undefined>;
+    headerRef: import("vue").Ref<HTMLElement | undefined>;
     visible: import("vue").Ref<boolean>;
+    style: import("vue").ComputedRef<import("vue").CSSProperties>;
+    rendered: import("vue").Ref<boolean>;
+    zIndex: import("vue").Ref<number>;
     afterEnter: () => void;
     afterLeave: () => void;
     beforeLeave: () => void;
-    style: import("vue").ComputedRef<import("vue").CSSProperties>;
     handleClose: () => void;
-    rendered: import("vue").Ref<boolean>;
+    onModalClick: () => void;
     overlayEvent: {
         onClick: (e: MouseEvent) => void;
         onMousedown: (e: MouseEvent) => void;
@@ -118,23 +107,6 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
         customMaskEvent: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
         overlayClass: import("element-plus/es/utils").BuildPropType<import("element-plus/es/utils").PropWrapper<string | string[] | Record<string, boolean>>, unknown, unknown>;
     }>;
-    ElFocusTrap: import("vue").DefineComponent<{
-        loop: BooleanConstructor;
-        trapped: BooleanConstructor;
-    }, {
-        focusTrapRef: import("vue").Ref<HTMLElement | null | undefined>;
-        forwardRef: import("vue").Ref<HTMLElement | null>;
-        onKeydown: (e: KeyboardEvent) => void;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("mountOnFocus" | "unmountOnFocus")[], "mountOnFocus" | "unmountOnFocus", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-        loop: BooleanConstructor;
-        trapped: BooleanConstructor;
-    }>> & {
-        onMountOnFocus?: ((...args: any[]) => any) | undefined;
-        onUnmountOnFocus?: ((...args: any[]) => any) | undefined;
-    }, {
-        loop: boolean;
-        trapped: boolean;
-    }>;
     ElDialogContent: import("vue").DefineComponent<{
         readonly center: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
         readonly closeIcon: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, "", unknown, unknown, unknown>;
@@ -145,8 +117,8 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
         readonly title: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
     }, {
         Close: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-        dialogRef: import("vue").Ref<HTMLElement | null>;
-        headerRef: import("vue").Ref<HTMLElement | null>;
+        dialogRef: import("vue").Ref<HTMLElement | undefined>;
+        headerRef: import("vue").Ref<HTMLElement | undefined>;
         ns: {
             namespace: import("vue").ComputedRef<string>;
             b: (blockSuffix?: string) => string;
@@ -162,9 +134,6 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
             };
         };
         style: import("vue").ComputedRef<import("vue").CSSProperties>;
-        focusTrapRef: import("vue").Ref<HTMLElement | null>;
-        onKeydown: (e: KeyboardEvent) => void;
-        composedDialogRef: (el: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | Element | null) => void;
         ElIcon: import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
             readonly size: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | number>, unknown, unknown, unknown, unknown>;
             readonly color: import("element-plus/es/utils").BuildPropReturn<StringConstructor, unknown, unknown, unknown, unknown>;
@@ -228,7 +197,7 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
     closeAutoFocus: () => boolean;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     readonly appendToBody: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<(...args: any[]) => void>, unknown, unknown, unknown, unknown>;
+    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<import("./src/dialog").DialogBeforeCloseFn>, unknown, unknown, unknown, unknown>;
     readonly destroyOnClose: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeOnClickModal: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
     readonly closeOnPressEscape: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
@@ -241,6 +210,7 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
     readonly modalClass: StringConstructor;
     readonly width: import("element-plus/es/utils").BuildPropReturn<readonly [StringConstructor, NumberConstructor], unknown, unknown, unknown, unknown>;
     readonly zIndex: import("element-plus/es/utils").BuildPropReturn<NumberConstructor, unknown, unknown, unknown, unknown>;
+    readonly trapFocus: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly center: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeIcon: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, "", unknown, unknown, unknown>;
     readonly customClass: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
@@ -250,8 +220,8 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
     readonly title: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
 }>> & {
     onClose?: (() => any) | undefined;
-    onOpen?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
+    onOpen?: (() => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
     onOpenAutoFocus?: (() => any) | undefined;
@@ -259,9 +229,9 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
 }, {
     zIndex: number;
     top: string;
+    width: import("element-plus/es/utils").BuildPropType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     title: string;
     center: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
-    width: import("element-plus/es/utils").BuildPropType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     draggable: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     openDelay: number;
     showClose: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
@@ -269,13 +239,14 @@ export declare const ElDialog: import("element-plus/es/utils").SFCWithInstall<im
     customClass: string;
     fullscreen: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     appendToBody: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
-    beforeClose: (...args: any[]) => void;
+    beforeClose: import("./src/dialog").DialogBeforeCloseFn;
     destroyOnClose: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     closeOnClickModal: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     closeOnPressEscape: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     lockScroll: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     modal: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
     closeDelay: number;
+    trapFocus: import("element-plus/es/utils").BuildPropType<BooleanConstructor, unknown, unknown>;
 }>> & Record<string, any>;
 export default ElDialog;
 export * from './src/use-dialog';

package/es/components/dialog/src/dialog-content.vue.d.ts

@@ -8,8 +8,8 @@ declare const _default: import("vue").DefineComponent<{
     readonly title: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
 }, {
     Close: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-    dialogRef: import("vue").Ref<HTMLElement | null>;
-    headerRef: import("vue").Ref<HTMLElement | null>;
+    dialogRef: import("vue").Ref<HTMLElement | undefined>;
+    headerRef: import("vue").Ref<HTMLElement | undefined>;
     ns: {
         namespace: import("vue").ComputedRef<string>;
         b: (blockSuffix?: string) => string;
@@ -25,9 +25,6 @@ declare const _default: import("vue").DefineComponent<{
         };
     };
     style: import("vue").ComputedRef<import("vue").CSSProperties>;
-    focusTrapRef: import("vue").Ref<HTMLElement | null>;
-    onKeydown: (e: KeyboardEvent) => void;
-    composedDialogRef: (el: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | Element | null) => void;
     ElIcon: import("element-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
         readonly size: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | number>, unknown, unknown, unknown, unknown>;
         readonly color: import("element-plus/es/utils").BuildPropReturn<StringConstructor, unknown, unknown, unknown, unknown>;

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

@@ -1,12 +1,10 @@
-import { defineComponent, inject, openBlock, createElementBlock, unref, normalizeClass, normalizeStyle, withModifiers, createElementVNode, renderSlot, toDisplayString, createCommentVNode, createVNode, withCtx, createBlock, resolveDynamicComponent } from 'vue';
+import { defineComponent, inject, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, withModifiers, createElementVNode, renderSlot, toDisplayString, createCommentVNode, createVNode, withCtx, createBlock, resolveDynamicComponent } from 'vue';
 import { ElIcon } from '../../icon/index.mjs';
-import '../../focus-trap/index.mjs';
 import '../../../utils/index.mjs';
+import '../../../tokens/index.mjs';
 import { dialogContentProps, dialogContentEmits } from './dialog-content.mjs';
-import { elDialogInjectionKey } from './token.mjs';
 import { CloseComponents } from '../../../utils/vue/icon.mjs';
-import { FOCUS_TRAP_INJECTION_KEY } from '../../focus-trap/src/tokens.mjs';
-import { composeRefs } from '../../../utils/vue/refs.mjs';
+import { dialogInjectionKey } from '../../../tokens/dialog.mjs';
 
 const _hoisted_1 = ["aria-label"];
 const __default__ = { name: "ElDialogContent" };
@@ -16,12 +14,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: dialogContentEmits,
   setup(__props) {
     const { Close } = CloseComponents;
-    const { dialogRef, headerRef, ns, style } = inject(elDialogInjectionKey);
-    const { focusTrapRef, onKeydown } = inject(FOCUS_TRAP_INJECTION_KEY);
-    const composedDialogRef = composeRefs(focusTrapRef, dialogRef);
+    const { dialogRef, headerRef, ns, style } = inject(dialogInjectionKey);
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        ref: unref(composedDialogRef),
+        ref_key: "dialogRef",
+        ref: dialogRef,
         class: normalizeClass([
           unref(ns).b(),
           unref(ns).is("fullscreen", _ctx.fullscreen),
@@ -34,8 +31,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "aria-label": _ctx.title || "dialog",
         style: normalizeStyle(unref(style)),
         onClick: _cache[1] || (_cache[1] = withModifiers(() => {
-        }, ["stop"])),
-        onKeydown: _cache[2] || (_cache[2] = (...args) => unref(onKeydown) && unref(onKeydown)(...args))
+        }, ["stop"]))
       }, [
         createElementVNode("div", {
           ref_key: "headerRef",
@@ -75,7 +71,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }, 8, ["class"])
         ], 2)) : createCommentVNode("v-if", true)
-      ], 46, _hoisted_1);
+      ], 14, _hoisted_1);
     };
   }
 });

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

@@ -1 +1 @@
-{"version":3,"file":"dialog-content2.mjs","sources":["../../../../../../packages/components/dialog/src/dialog-content.vue"],"sourcesContent":["<template>\n  <div\n    :ref=\"composedDialogRef\"\n    :class=\"[\n      ns.b(),\n      ns.is('fullscreen', fullscreen),\n      ns.is('draggable', draggable),\n      { [ns.m('center')]: center },\n      customClass,\n    ]\"\n    aria-modal=\"true\"\n    role=\"dialog\"\n    :aria-label=\"title || 'dialog'\"\n    :style=\"style\"\n    @click.stop\n    @keydown=\"onKeydown\"\n  >\n    <div ref=\"headerRef\" :class=\"ns.e('header')\">\n      <slot name=\"title\">\n        <span :class=\"ns.e('title')\">\n          {{ title }}\n        </span>\n      </slot>\n    </div>\n    <div :class=\"ns.e('body')\">\n      <slot></slot>\n    </div>\n    <div v-if=\"$slots.footer\" :class=\"ns.e('footer')\">\n      <slot name=\"footer\"></slot>\n    </div>\n    <button\n      v-if=\"showClose\"\n      aria-label=\"close\"\n      :class=\"ns.e('headerbtn')\"\n      type=\"button\"\n      @click=\"$emit('close')\"\n    >\n      <el-icon :class=\"ns.e('close')\">\n        <component :is=\"closeIcon || Close\" />\n      </el-icon>\n    </button>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { FOCUS_TRAP_INJECTION_KEY } from '@element-plus/components/focus-trap'\nimport { CloseComponents, composeRefs } from '@element-plus/utils'\nimport { dialogContentProps, dialogContentEmits } from './dialog-content'\n\nimport { elDialogInjectionKey } from './token'\n\nconst { Close } = CloseComponents\n\ndefineOptions({ name: 'ElDialogContent' })\ndefineProps(dialogContentProps)\ndefineEmits(dialogContentEmits)\n\nconst { dialogRef, headerRef, ns, style } = inject(elDialogInjectionKey)!\nconst { focusTrapRef, onKeydown } = inject(FOCUS_TRAP_INJECTION_KEY)!\n\nconst composedDialogRef = composeRefs(focusTrapRef, dialogRef)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAqDA;AAMA;AACA;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"dialog-content2.mjs","sources":["../../../../../../packages/components/dialog/src/dialog-content.vue"],"sourcesContent":["<template>\n  <div\n    ref=\"dialogRef\"\n    :class=\"[\n      ns.b(),\n      ns.is('fullscreen', fullscreen),\n      ns.is('draggable', draggable),\n      { [ns.m('center')]: center },\n      customClass,\n    ]\"\n    aria-modal=\"true\"\n    role=\"dialog\"\n    :aria-label=\"title || 'dialog'\"\n    :style=\"style\"\n    @click.stop\n  >\n    <div ref=\"headerRef\" :class=\"ns.e('header')\">\n      <slot name=\"title\">\n        <span :class=\"ns.e('title')\">\n          {{ title }}\n        </span>\n      </slot>\n    </div>\n    <div :class=\"ns.e('body')\">\n      <slot></slot>\n    </div>\n    <div v-if=\"$slots.footer\" :class=\"ns.e('footer')\">\n      <slot name=\"footer\"></slot>\n    </div>\n    <button\n      v-if=\"showClose\"\n      aria-label=\"close\"\n      :class=\"ns.e('headerbtn')\"\n      type=\"button\"\n      @click=\"$emit('close')\"\n    >\n      <el-icon :class=\"ns.e('close')\">\n        <component :is=\"closeIcon || Close\" />\n      </el-icon>\n    </button>\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { inject } from 'vue'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { CloseComponents } from '@element-plus/utils'\nimport { dialogInjectionKey } from '@element-plus/tokens'\nimport { dialogContentProps, dialogContentEmits } from './dialog-content'\n\nconst { Close } = CloseComponents\n\ndefineOptions({ name: 'ElDialogContent' })\ndefineProps(dialogContentProps)\ndefineEmits(dialogContentEmits)\n\nconst { dialogRef, headerRef, ns, style } = inject(dialogInjectionKey)!\n// const { focusTrapRef, onKeydown } = inject(FOCUS_TRAP_INJECTION_KEY)!\n\n// const composedDialogRef = composeRefs(focusTrapRef, dialogRef)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;AAkDA;AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/dialog/src/dialog.d.ts

@@ -1,7 +1,9 @@
 import type { ExtractPropTypes } from 'vue';
+declare type DoneFn = (cancel: boolean) => void;
+export declare type DialogBeforeCloseFn = (done: DoneFn) => void;
 export declare const dialogProps: {
     readonly appendToBody: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
-    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<(...args: any[]) => void>, unknown, unknown, unknown, unknown>;
+    readonly beforeClose: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<DialogBeforeCloseFn>, unknown, unknown, unknown, unknown>;
     readonly destroyOnClose: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeOnClickModal: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
     readonly closeOnPressEscape: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
@@ -14,6 +16,7 @@ export declare const dialogProps: {
     readonly modalClass: StringConstructor;
     readonly width: import("element-plus/es/utils").BuildPropReturn<readonly [StringConstructor, NumberConstructor], unknown, unknown, unknown, unknown>;
     readonly zIndex: import("element-plus/es/utils").BuildPropReturn<NumberConstructor, unknown, unknown, unknown, unknown>;
+    readonly trapFocus: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly center: import("element-plus/es/utils").BuildPropReturn<BooleanConstructor, false, unknown, unknown, unknown>;
     readonly closeIcon: import("element-plus/es/utils").BuildPropReturn<import("element-plus/es/utils").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, "", unknown, unknown, unknown>;
     readonly customClass: import("element-plus/es/utils").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
@@ -33,3 +36,4 @@ export declare const dialogEmits: {
     closeAutoFocus: () => boolean;
 };
 export declare type DialogEmits = typeof dialogEmits;
+export {};

package/es/components/dialog/src/dialog.mjs

@@ -3,6 +3,7 @@ import '../../../constants/index.mjs';
 import { dialogContentProps } from './dialog-content.mjs';
 import { buildProps, definePropType } from '../../../utils/vue/props.mjs';
 import { UPDATE_MODEL_EVENT } from '../../../constants/event.mjs';
+import { isBoolean } from '@vueuse/core';
 
 const dialogProps = buildProps({
   ...dialogContentProps,
@@ -54,6 +55,10 @@ const dialogProps = buildProps({
   },
   zIndex: {
     type: Number
+  },
+  trapFocus: {
+    type: Boolean,
+    default: false
   }
 });
 const dialogEmits = {
@@ -61,7 +66,7 @@ const dialogEmits = {
   opened: () => true,
   close: () => true,
   closed: () => true,
-  [UPDATE_MODEL_EVENT]: (value) => typeof value === "boolean",
+  [UPDATE_MODEL_EVENT]: (value) => isBoolean(value),
   openAutoFocus: () => true,
   closeAutoFocus: () => true
 };

package/es/components/dialog/src/dialog.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dialog.mjs","sources":["../../../../../../packages/components/dialog/src/dialog.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-plus/utils'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { dialogContentProps } from './dialog-content'\n\nimport type { ExtractPropTypes } from 'vue'\n\nexport const dialogProps = buildProps({\n  ...dialogContentProps,\n  appendToBody: {\n    type: Boolean,\n    default: false,\n  },\n  beforeClose: {\n    type: definePropType<(...args: any[]) => void>(Function),\n  },\n  destroyOnClose: {\n    type: Boolean,\n    default: false,\n  },\n  closeOnClickModal: {\n    type: Boolean,\n    default: true,\n  },\n  closeOnPressEscape: {\n    type: Boolean,\n    default: true,\n  },\n  lockScroll: {\n    type: Boolean,\n    default: true,\n  },\n  modal: {\n    type: Boolean,\n    default: true,\n  },\n  openDelay: {\n    type: Number,\n    default: 0,\n  },\n  closeDelay: {\n    type: Number,\n    default: 0,\n  },\n  top: {\n    type: String,\n  },\n  modelValue: {\n    type: Boolean,\n    required: true,\n  },\n  modalClass: String,\n  width: {\n    type: [String, Number],\n  },\n  zIndex: {\n    type: Number,\n  },\n} as const)\n\nexport type DialogProps = ExtractPropTypes<typeof dialogProps>\n\nexport const dialogEmits = {\n  open: () => true,\n  opened: () => true,\n  close: () => true,\n  closed: () => true,\n  [UPDATE_MODEL_EVENT]: (value: boolean) => typeof value === 'boolean',\n  openAutoFocus: () => true,\n  closeAutoFocus: () => true,\n}\nexport type DialogEmits = typeof dialogEmits\n"],"names":[],"mappings":";;;;;;AAGY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,GAAG,kBAAkB;AACvB,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,cAAc,EAAE;AAClB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,kBAAkB,EAAE;AACtB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,QAAQ,EAAE,IAAI;AAClB,GAAG;AACH,EAAE,UAAU,EAAE,MAAM;AACpB,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,WAAW,GAAG;AAC3B,EAAE,IAAI,EAAE,MAAM,IAAI;AAClB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,KAAK,EAAE,MAAM,IAAI;AACnB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,OAAO,KAAK,KAAK,SAAS;AAC7D,EAAE,aAAa,EAAE,MAAM,IAAI;AAC3B,EAAE,cAAc,EAAE,MAAM,IAAI;AAC5B;;;;"}
+{"version":3,"file":"dialog.mjs","sources":["../../../../../../packages/components/dialog/src/dialog.ts"],"sourcesContent":["import { buildProps, definePropType, isBoolean } from '@element-plus/utils'\nimport { UPDATE_MODEL_EVENT } from '@element-plus/constants'\nimport { dialogContentProps } from './dialog-content'\n\nimport type { ExtractPropTypes } from 'vue'\n\ntype DoneFn = (cancel: boolean) => void\nexport type DialogBeforeCloseFn = (done: DoneFn) => void\n\nexport const dialogProps = buildProps({\n  ...dialogContentProps,\n  appendToBody: {\n    type: Boolean,\n    default: false,\n  },\n  beforeClose: {\n    type: definePropType<DialogBeforeCloseFn>(Function),\n  },\n  destroyOnClose: {\n    type: Boolean,\n    default: false,\n  },\n  closeOnClickModal: {\n    type: Boolean,\n    default: true,\n  },\n  closeOnPressEscape: {\n    type: Boolean,\n    default: true,\n  },\n  lockScroll: {\n    type: Boolean,\n    default: true,\n  },\n  modal: {\n    type: Boolean,\n    default: true,\n  },\n  openDelay: {\n    type: Number,\n    default: 0,\n  },\n  closeDelay: {\n    type: Number,\n    default: 0,\n  },\n  top: {\n    type: String,\n  },\n  modelValue: {\n    type: Boolean,\n    required: true,\n  },\n  modalClass: String,\n  width: {\n    type: [String, Number],\n  },\n  zIndex: {\n    type: Number,\n  },\n  trapFocus: {\n    type: Boolean,\n    default: false,\n  },\n} as const)\n\nexport type DialogProps = ExtractPropTypes<typeof dialogProps>\n\nexport const dialogEmits = {\n  open: () => true,\n  opened: () => true,\n  close: () => true,\n  closed: () => true,\n  [UPDATE_MODEL_EVENT]: (value: boolean) => isBoolean(value),\n  openAutoFocus: () => true,\n  closeAutoFocus: () => true,\n}\nexport type DialogEmits = typeof dialogEmits\n"],"names":[],"mappings":";;;;;;;AAGY,MAAC,WAAW,GAAG,UAAU,CAAC;AACtC,EAAE,GAAG,kBAAkB;AACvB,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,cAAc,EAAE;AAClB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,kBAAkB,EAAE;AACtB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,QAAQ,EAAE,IAAI;AAClB,GAAG;AACH,EAAE,UAAU,EAAE,MAAM;AACpB,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,WAAW,GAAG;AAC3B,EAAE,IAAI,EAAE,MAAM,IAAI;AAClB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,KAAK,EAAE,MAAM,IAAI;AACnB,EAAE,MAAM,EAAE,MAAM,IAAI;AACpB,EAAE,CAAC,kBAAkB,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,KAAK,CAAC;AACnD,EAAE,aAAa,EAAE,MAAM,IAAI;AAC3B,EAAE,cAAc,EAAE,MAAM,IAAI;AAC5B;;;;"}