@element-plus/nightly 0.0.20220208 → 0.0.20220209

package/es/components/dropdown/index.mjs

@@ -1,7 +1,8 @@
-import { withInstall, withNoopInstall } from '../../utils/with-install.mjs';
+import '../../utils-v2/index.mjs';
 import Dropdown from './src/dropdown2.mjs';
 import DropdownItem from './src/dropdown-item.mjs';
 import DropdownMenu from './src/dropdown-menu.mjs';
+import { withInstall, withNoopInstall } from '../../utils-v2/vue/install.mjs';
 
 const ElDropdown = withInstall(Dropdown, {
   DropdownItem,

package/es/components/dropdown/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sources":["../../../../../packages/components/dropdown/index.ts"],"sourcesContent":["import { withInstall, withNoopInstall } from '@element-plus/utils/with-install'\n\nimport Dropdown from './src/dropdown.vue'\nimport DropdownItem from './src/dropdown-item.vue'\nimport DropdownMenu from './src/dropdown-menu.vue'\n\nexport const ElDropdown = withInstall(Dropdown, {\n  DropdownItem,\n  DropdownMenu,\n})\nexport default ElDropdown\nexport const ElDropdownItem = withNoopInstall(DropdownItem)\nexport const ElDropdownMenu = withNoopInstall(DropdownMenu)\n"],"names":[],"mappings":";;;;;AAIY,MAAC,UAAU,GAAG,WAAW,CAAC,QAAQ,EAAE;AAChD,EAAE,YAAY;AACd,EAAE,YAAY;AACd,CAAC,EAAE;AAES,MAAC,cAAc,GAAG,eAAe,CAAC,YAAY,EAAE;AAChD,MAAC,cAAc,GAAG,eAAe,CAAC,YAAY;;;;"}
+{"version":3,"file":"index.mjs","sources":["../../../../../packages/components/dropdown/index.ts"],"sourcesContent":["import { withInstall, withNoopInstall } from '@element-plus/utils-v2'\n\nimport Dropdown from './src/dropdown.vue'\nimport DropdownItem from './src/dropdown-item.vue'\nimport DropdownMenu from './src/dropdown-menu.vue'\n\nexport const ElDropdown = withInstall(Dropdown, {\n  DropdownItem,\n  DropdownMenu,\n})\nexport default ElDropdown\nexport const ElDropdownItem = withNoopInstall(DropdownItem)\nexport const ElDropdownMenu = withNoopInstall(DropdownMenu)\n"],"names":[],"mappings":";;;;;;AAIY,MAAC,UAAU,GAAG,WAAW,CAAC,QAAQ,EAAE;AAChD,EAAE,YAAY;AACd,EAAE,YAAY;AACd,CAAC,EAAE;AAES,MAAC,cAAc,GAAG,eAAe,CAAC,YAAY,EAAE;AAChD,MAAC,cAAc,GAAG,eAAe,CAAC,YAAY;;;;"}

package/es/components/dropdown/src/dropdown-item-impl.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, inject, resolveComponent, openBlock, createElementBlock, Fragment, createCommentVNode, createElementVNode, mergeProps, createBlock, withCtx, resolveDynamicComponent, renderSlot } from 'vue';
+import { defineComponent, inject, resolveComponent, openBlock, createElementBlock, Fragment, mergeProps, createCommentVNode, createElementVNode, createBlock, withCtx, resolveDynamicComponent, renderSlot } from 'vue';
 import '../../roving-focus-group/index.mjs';
 import '../../collection/index.mjs';
 import { ElIcon } from '../../icon/index.mjs';
@@ -49,16 +49,15 @@ const _sfc_main = defineComponent({
     };
   }
 });
-const _hoisted_1 = {
-  key: 0,
-  class: "el-dropdown-menu__item--divided"
-};
-const _hoisted_2 = ["aria-disabled", "tabindex"];
+const _hoisted_1 = ["aria-disabled", "tabindex"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_icon = resolveComponent("el-icon");
   return openBlock(), createElementBlock(Fragment, null, [
-    _ctx.divided ? (openBlock(), createElementBlock("div", _hoisted_1)) : createCommentVNode("v-if", true),
-    createElementVNode("div", mergeProps({ ref: _ctx.itemRef }, _ctx.dataset, {
+    _ctx.divided ? (openBlock(), createElementBlock("div", mergeProps({
+      key: 0,
+      class: "el-dropdown-menu__item--divided"
+    }, _ctx.$attrs), null, 16)) : createCommentVNode("v-if", true),
+    createElementVNode("div", mergeProps({ ref: _ctx.itemRef }, { ..._ctx.dataset, ..._ctx.$attrs }, {
       "aria-disabled": _ctx.disabled,
       class: {
         "el-dropdown-menu__item": true,
@@ -80,7 +79,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         _: 1
       })) : createCommentVNode("v-if", true),
       renderSlot(_ctx.$slots, "default")
-    ], 16, _hoisted_2)
+    ], 16, _hoisted_1)
   ], 64);
 }
 var ElDropdownItemImpl = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/es/components/dropdown/src/dropdown-item-impl.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dropdown-item-impl.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown-item-impl.vue"],"sourcesContent":["<template>\n  <div v-if=\"divided\" class=\"el-dropdown-menu__item--divided\"></div>\n  <div\n    :ref=\"itemRef\"\n    v-bind=\"dataset\"\n    :aria-disabled=\"disabled\"\n    :class=\"{\n      'el-dropdown-menu__item': true,\n      'is-disabled': disabled,\n    }\"\n    :tabindex=\"tabIndex\"\n    role=\"menuitem\"\n    @click=\"(e) => $emit('click', e)\"\n    @focus=\"handleFocus\"\n    @keydown=\"handleKeydown\"\n    @mousedown=\"handleMousedown\"\n    @pointermove=\"(e) => $emit('pointermove', e)\"\n    @pointerleave=\"(e) => $emit('pointerleave', e)\"\n  >\n    <el-icon v-if=\"icon\"><component :is=\"icon\" /></el-icon>\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent, inject } from 'vue'\nimport {\n  ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY,\n  ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n} from '@element-plus/components/roving-focus-group'\nimport { COLLECTION_ITEM_SIGN } from '@element-plus/components/collection'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { EVENT_CODE } from '@element-plus/utils/aria'\nimport { composeEventHandlers, composeRefs } from '@element-plus/utils/dom'\nimport {\n  DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n  dropdownItemProps,\n} from './dropdown'\n\nexport default defineComponent({\n  name: 'DropdownItemImpl',\n  components: {\n    ElIcon,\n  },\n  props: dropdownItemProps,\n  emits: ['pointermove', 'pointerleave', 'click'],\n  setup(_, { emit }) {\n    const { collectionItemRef: dropdownCollectionItemRef } = inject(\n      DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n      undefined\n    )!\n\n    const { collectionItemRef: rovingFocusCollectionItemRef } = inject(\n      ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n      undefined\n    )!\n\n    const {\n      rovingFocusGroupItemRef,\n      tabIndex,\n      handleFocus,\n      handleKeydown: handleItemKeydown,\n      handleMousedown,\n    } = inject(ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY, undefined)!\n\n    const itemRef = composeRefs(\n      dropdownCollectionItemRef,\n      rovingFocusCollectionItemRef,\n      rovingFocusGroupItemRef\n    )\n\n    const handleKeydown = composeEventHandlers((e: KeyboardEvent) => {\n      const { code } = e\n      if (code === EVENT_CODE.enter || code === EVENT_CODE.space) {\n        e.preventDefault()\n        e.stopImmediatePropagation()\n        emit('click', e)\n        return true\n      }\n    }, handleItemKeydown)\n\n    return {\n      itemRef,\n      dataset: {\n        [COLLECTION_ITEM_SIGN]: '',\n      },\n      tabIndex,\n      handleFocus,\n      handleKeydown,\n      handleMousedown,\n    }\n  },\n})\n</script>\n"],"names":["DROPDOWN_COLLECTION_ITEM_INJECTION_KEY","ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY","_openBlock","_createElementBlock","_createCommentVNode"],"mappings":";;;;;;;;;;;;AAuCA,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,YAAY;AAAA,IACV;AAAA;AAAA,EAEF,OAAO;AAAA,EACP,OAAO,CAAC,eAAe,gBAAgB;AAAA,EACvC,MAAM,GAAG,EAAE,QAAQ;AACjB,UAAM,EAAE,mBAAmB,8BAA8B,OACvDA,+BACA;AAGF,UAAM,EAAE,mBAAmB,iCAAiC,OAC1DC,iCACA;AAGF,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,MACf;AAAA,QACE,OAAO,uCAAuC;AAElD,UAAM,UAAU,YACd,2BACA,8BACA;AAGF,UAAM,gBAAgB,qBAAqB,CAAC,MAAqB;AAC/D,YAAM,EAAE,SAAS;AACjB,UAAI,SAAS,WAAW,SAAS,SAAS,WAAW,OAAO;AAC1D,UAAE;AACF,UAAE;AACF,aAAK,SAAS;AACd,eAAO;AAAA;AAAA,OAER;AAEH,WAAO;AAAA,MACL;AAAA,MACA,SAAS;AAAA,SACN,uBAAuB;AAAA;AAAA,MAE1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA;;EAxFgB,KAAK;AAAA;;;;;SAAdC,aAAOC;AAAA,0EAClBC,mBAmBM,QAnBN;AAAA,uBAGkB,kBAAQ;AAAA,MACvB,iBAAK;AAAA;kCAA+D;AAAA;;MAKrE,UAAK;AAAA,MACJ;AAAA,MACA,SAAK,4CAAE;AAAA,MACP,SAAO,4CAAE;AAAA,MACT,WAAS,4CAAE;AAAA,MACX,aAAW,8BAAI,SAAK,KAAK,mBAAiB;AAAA,MAC1C,eAAY,iCAAI,KAAK,MAAK;AAAA;QAEZ;AAAA,4CAA8B;AAAA,yBAAxB;AAAA;;;YACrBA,mBAAQ;AAAA;;;;;;;;"}
+{"version":3,"file":"dropdown-item-impl.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown-item-impl.vue"],"sourcesContent":["<template>\n  <div\n    v-if=\"divided\"\n    class=\"el-dropdown-menu__item--divided\"\n    v-bind=\"$attrs\"\n  ></div>\n  <div\n    :ref=\"itemRef\"\n    v-bind=\"{ ...dataset, ...$attrs }\"\n    :aria-disabled=\"disabled\"\n    :class=\"{\n      'el-dropdown-menu__item': true,\n      'is-disabled': disabled,\n    }\"\n    :tabindex=\"tabIndex\"\n    role=\"menuitem\"\n    @click=\"(e) => $emit('click', e)\"\n    @focus=\"handleFocus\"\n    @keydown=\"handleKeydown\"\n    @mousedown=\"handleMousedown\"\n    @pointermove=\"(e) => $emit('pointermove', e)\"\n    @pointerleave=\"(e) => $emit('pointerleave', e)\"\n  >\n    <el-icon v-if=\"icon\"><component :is=\"icon\" /></el-icon>\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\">\nimport { defineComponent, inject } from 'vue'\nimport {\n  ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY,\n  ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n} from '@element-plus/components/roving-focus-group'\nimport { COLLECTION_ITEM_SIGN } from '@element-plus/components/collection'\nimport { ElIcon } from '@element-plus/components/icon'\nimport { EVENT_CODE } from '@element-plus/utils/aria'\nimport { composeEventHandlers, composeRefs } from '@element-plus/utils/dom'\nimport {\n  DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n  dropdownItemProps,\n} from './dropdown'\n\nexport default defineComponent({\n  name: 'DropdownItemImpl',\n  components: {\n    ElIcon,\n  },\n  props: dropdownItemProps,\n  emits: ['pointermove', 'pointerleave', 'click'],\n  setup(_, { emit }) {\n    const { collectionItemRef: dropdownCollectionItemRef } = inject(\n      DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n      undefined\n    )!\n\n    const { collectionItemRef: rovingFocusCollectionItemRef } = inject(\n      ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY,\n      undefined\n    )!\n\n    const {\n      rovingFocusGroupItemRef,\n      tabIndex,\n      handleFocus,\n      handleKeydown: handleItemKeydown,\n      handleMousedown,\n    } = inject(ROVING_FOCUS_GROUP_ITEM_INJECTION_KEY, undefined)!\n\n    const itemRef = composeRefs(\n      dropdownCollectionItemRef,\n      rovingFocusCollectionItemRef,\n      rovingFocusGroupItemRef\n    )\n\n    const handleKeydown = composeEventHandlers((e: KeyboardEvent) => {\n      const { code } = e\n      if (code === EVENT_CODE.enter || code === EVENT_CODE.space) {\n        e.preventDefault()\n        e.stopImmediatePropagation()\n        emit('click', e)\n        return true\n      }\n    }, handleItemKeydown)\n\n    return {\n      itemRef,\n      dataset: {\n        [COLLECTION_ITEM_SIGN]: '',\n      },\n      tabIndex,\n      handleFocus,\n      handleKeydown,\n      handleMousedown,\n    }\n  },\n})\n</script>\n"],"names":["DROPDOWN_COLLECTION_ITEM_INJECTION_KEY","ROVING_FOCUS_ITEM_COLLECTION_INJECTION_KEY","_openBlock","_createElementBlock","_createCommentVNode"],"mappings":";;;;;;;;;;;;AA2CA,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,YAAY;AAAA,IACV;AAAA;AAAA,EAEF,OAAO;AAAA,EACP,OAAO,CAAC,eAAe,gBAAgB;AAAA,EACvC,MAAM,GAAG,EAAE,QAAQ;AACjB,UAAM,EAAE,mBAAmB,8BAA8B,OACvDA,+BACA;AAGF,UAAM,EAAE,mBAAmB,iCAAiC,OAC1DC,iCACA;AAGF,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA,eAAe;AAAA,MACf;AAAA,QACE,OAAO,uCAAuC;AAElD,UAAM,UAAU,YACd,2BACA,8BACA;AAGF,UAAM,gBAAgB,qBAAqB,CAAC,MAAqB;AAC/D,YAAM,EAAE,SAAS;AACjB,UAAI,SAAS,WAAW,SAAS,SAAS,WAAW,OAAO;AAC1D,UAAE;AACF,UAAE;AACF,aAAK,SAAS;AACd,eAAO;AAAA;AAAA,OAER;AAEH,WAAO;AAAA,MACL;AAAA,MACA,SAAS;AAAA,SACN,uBAAuB;AAAA;AAAA,MAE1B;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA;AAAA;;;;SA3FIC,aAAOC;AAAA;MACb,KAAK;AAAA,aACG;AAAA,kCAEVC,mBAmBM,QAnBN;AAAA,uBAGkB,kBAAQ;AAAA,MACvB,iBAAK;AAAA;kCAA+D;AAAA;;MAKrE,UAAK;AAAA,MACJ;AAAA,MACA,SAAK,4CAAE;AAAA,MACP,SAAO,4CAAE;AAAA,MACT,WAAS,4CAAE;AAAA,MACX,aAAW,8BAAI,SAAK,KAAK,mBAAiB;AAAA,MAC1C,eAAY,iCAAI,KAAK,MAAK;AAAA;QAEZ;AAAA,4CAA8B;AAAA,yBAAxB;AAAA;;;YACrBA,mBAAQ;AAAA;;;;;;;;"}

package/es/components/dropdown/src/dropdown-item-impl.vue.d.ts

@@ -1,9 +1,9 @@
 declare const _default: import("vue").DefineComponent<{
-    readonly command: import("../../../utils/props").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
+    readonly command: import("../../../utils-v2").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly divided: BooleanConstructor;
     readonly textValue: StringConstructor;
-    readonly icon: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
+    readonly icon: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
 }, {
     itemRef: (el: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>> | Element | null) => void;
     dataset: {
@@ -14,19 +14,19 @@ declare const _default: import("vue").DefineComponent<{
     handleKeydown: (event: KeyboardEvent) => void;
     handleMousedown: (e: Event) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "pointerleave" | "pointermove")[], "click" | "pointerleave" | "pointermove", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly command: import("../../../utils/props").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
+    readonly command: import("../../../utils-v2").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly divided: BooleanConstructor;
     readonly textValue: StringConstructor;
-    readonly icon: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
+    readonly icon: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
 }>> & {
     onClick?: ((...args: any[]) => any) | undefined;
     onPointermove?: ((...args: any[]) => any) | undefined;
     onPointerleave?: ((...args: any[]) => any) | undefined;
 }, {
-    icon: import("../../../utils/props").BuildPropType<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown>;
+    icon: import("../../../utils-v2").BuildPropType<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown>;
     disabled: boolean;
-    command: import("../../../utils/props").BuildPropType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown>;
+    command: import("../../../utils-v2").BuildPropType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown>;
     divided: boolean;
 }>;
 export default _default;

package/es/components/dropdown/src/dropdown-item.mjs

@@ -15,9 +15,10 @@ const _sfc_main = defineComponent({
     ElRovingFocusItem,
     ElDropdownItemImpl
   },
+  inheritAttrs: false,
   props: dropdownItemProps,
   emits: ["pointermove", "pointerleave", "click"],
-  setup(props, { emit }) {
+  setup(props, { emit, attrs }) {
     const { elDropdown } = useDropdown();
     const _instance = getCurrentInstance();
     const itemRef = ref(null);
@@ -61,11 +62,15 @@ const _sfc_main = defineComponent({
       }
       (_c = elDropdown.commandHandler) == null ? void 0 : _c.call(elDropdown, props.command, _instance, e);
     });
+    const propsAndAttrs = computed(() => {
+      return { ...props, ...attrs };
+    });
     return {
       handleClick,
       handlePointerMove,
       handlePointerLeave,
-      textContent
+      textContent,
+      propsAndAttrs
     };
   }
 });
@@ -83,7 +88,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         focusable: !_ctx.disabled
       }, {
         default: withCtx(() => [
-          createVNode(_component_el_dropdown_item_impl, mergeProps(_ctx.$props, {
+          createVNode(_component_el_dropdown_item_impl, mergeProps(_ctx.propsAndAttrs, {
             onPointerleave: _ctx.handlePointerLeave,
             onPointermove: _ctx.handlePointerMove,
             onClick: _ctx.handleClick

package/es/components/dropdown/src/dropdown-item.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dropdown-item.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown-item.vue"],"sourcesContent":["<template>\n  <el-dropdown-collection-item\n    :disabled=\"disabled\"\n    :text-value=\"textValue ?? textContent\"\n  >\n    <el-roving-focus-item :focusable=\"!disabled\">\n      <el-dropdown-item-impl\n        v-bind=\"$props\"\n        @pointerleave=\"handlePointerLeave\"\n        @pointermove=\"handlePointerMove\"\n        @click=\"handleClick\"\n      >\n        <slot />\n      </el-dropdown-item-impl>\n    </el-roving-focus-item>\n  </el-dropdown-collection-item>\n</template>\n<script lang=\"ts\">\nimport {\n  computed,\n  defineComponent,\n  getCurrentInstance,\n  inject,\n  ref,\n  unref,\n} from 'vue'\nimport { ElRovingFocusItem } from '@element-plus/components/roving-focus-group'\nimport { composeEventHandlers, whenMouse } from '@element-plus/utils/dom'\nimport ElDropdownItemImpl from './dropdown-item-impl.vue'\nimport { useDropdown } from './useDropdown'\nimport {\n  ElCollectionItem as ElDropdownCollectionItem,\n  dropdownItemProps,\n} from './dropdown'\nimport { DROPDOWN_INJECTION_KEY } from './tokens'\n\nexport default defineComponent({\n  name: 'ElDropdownItem',\n  components: {\n    ElDropdownCollectionItem,\n    ElRovingFocusItem,\n    ElDropdownItemImpl,\n  },\n  props: dropdownItemProps,\n  emits: ['pointermove', 'pointerleave', 'click'],\n  setup(props, { emit }) {\n    const { elDropdown } = useDropdown()\n    const _instance = getCurrentInstance()\n    const itemRef = ref<HTMLElement | null>(null)\n    const textContent = computed(() => unref(itemRef)?.textContent ?? '')\n    const { onItemEnter, onItemLeave } = inject(\n      DROPDOWN_INJECTION_KEY,\n      undefined\n    )!\n\n    const handlePointerMove = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('pointermove', e)\n        return e.defaultPrevented\n      },\n      whenMouse((e) => {\n        if (props.disabled) {\n          onItemLeave(e)\n        } else {\n          onItemEnter(e)\n          if (!e.defaultPrevented) {\n            ;(e.currentTarget as HTMLElement)?.focus()\n          }\n        }\n      })\n    )\n\n    const handlePointerLeave = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('pointerleave', e)\n        return e.defaultPrevented\n      },\n      whenMouse((e) => {\n        onItemLeave(e)\n      })\n    )\n\n    const handleClick = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('click', e)\n        return e.defaultPrevented\n      },\n      (e) => {\n        if (props.disabled) {\n          e.stopImmediatePropagation()\n          return\n        }\n        if (elDropdown?.hideOnClick?.value) {\n          elDropdown.handleClick?.()\n        }\n        elDropdown.commandHandler?.(props.command, _instance, e)\n      }\n    )\n\n    return {\n      handleClick,\n      handlePointerMove,\n      handlePointerLeave,\n      textContent,\n    }\n  },\n})\n</script>\n"],"names":["ElDropdownCollectionItem"],"mappings":";;;;;;;;;;AAoCA,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,YAAY;AAAA,8BACVA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,EAEF,OAAO;AAAA,EACP,OAAO,CAAC,eAAe,gBAAgB;AAAA,EACvC,MAAM,OAAO,EAAE,QAAQ;AACrB,UAAM,EAAE,eAAe;AACvB,UAAM,YAAY;AAClB,UAAM,UAAU,IAAwB;AACxC,UAAM,cAAc,SAAS,MAAM;AACnC,UAAM,EAAE;AAKR,8BAA0B,qBACxB;AACE;AACA;AAAS;AAGT,UAAI,gBAAgB;AAClB;AAAY;AAEZ;AACA,eAAO;AACL;AAAC;AAAkC;AAAA;AAAA;AAM3C,UAAM,qBAAqB,qBACzB;AACE;AACA;AAAS,OAEX;AACE;AAAY;AAIhB;AAEI;AACA;AAAS,OAEX,CAAC;AACC,UAAI;AACF,UAAE;AACF;AAAA;AAEF,UAAI;AACF;AAAW;AAEb;AAAsD;AAI1D,WAAO;AAAA;AACL;AACA,MACA;AAAA,MACA;AAAA;AAAA;AAAA;;;;;;AArGiB;AACN;;;AAWU;AAToB;;;AAQjB;AALW,2BACnB;AAAA;AACN;;;AAEA;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"dropdown-item.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown-item.vue"],"sourcesContent":["<template>\n  <el-dropdown-collection-item\n    :disabled=\"disabled\"\n    :text-value=\"textValue ?? textContent\"\n  >\n    <el-roving-focus-item :focusable=\"!disabled\">\n      <el-dropdown-item-impl\n        v-bind=\"propsAndAttrs\"\n        @pointerleave=\"handlePointerLeave\"\n        @pointermove=\"handlePointerMove\"\n        @click=\"handleClick\"\n      >\n        <slot />\n      </el-dropdown-item-impl>\n    </el-roving-focus-item>\n  </el-dropdown-collection-item>\n</template>\n<script lang=\"ts\">\nimport {\n  computed,\n  defineComponent,\n  getCurrentInstance,\n  inject,\n  ref,\n  unref,\n} from 'vue'\nimport { ElRovingFocusItem } from '@element-plus/components/roving-focus-group'\nimport { composeEventHandlers, whenMouse } from '@element-plus/utils/dom'\nimport ElDropdownItemImpl from './dropdown-item-impl.vue'\nimport { useDropdown } from './useDropdown'\nimport {\n  ElCollectionItem as ElDropdownCollectionItem,\n  dropdownItemProps,\n} from './dropdown'\nimport { DROPDOWN_INJECTION_KEY } from './tokens'\n\nexport default defineComponent({\n  name: 'ElDropdownItem',\n  components: {\n    ElDropdownCollectionItem,\n    ElRovingFocusItem,\n    ElDropdownItemImpl,\n  },\n  inheritAttrs: false,\n  props: dropdownItemProps,\n  emits: ['pointermove', 'pointerleave', 'click'],\n  setup(props, { emit, attrs }) {\n    const { elDropdown } = useDropdown()\n    const _instance = getCurrentInstance()\n    const itemRef = ref<HTMLElement | null>(null)\n    const textContent = computed(() => unref(itemRef)?.textContent ?? '')\n    const { onItemEnter, onItemLeave } = inject(\n      DROPDOWN_INJECTION_KEY,\n      undefined\n    )!\n\n    const handlePointerMove = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('pointermove', e)\n        return e.defaultPrevented\n      },\n      whenMouse((e) => {\n        if (props.disabled) {\n          onItemLeave(e)\n        } else {\n          onItemEnter(e)\n          if (!e.defaultPrevented) {\n            ;(e.currentTarget as HTMLElement)?.focus()\n          }\n        }\n      })\n    )\n\n    const handlePointerLeave = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('pointerleave', e)\n        return e.defaultPrevented\n      },\n      whenMouse((e) => {\n        onItemLeave(e)\n      })\n    )\n\n    const handleClick = composeEventHandlers(\n      (e: PointerEvent) => {\n        emit('click', e)\n        return e.defaultPrevented\n      },\n      (e) => {\n        if (props.disabled) {\n          e.stopImmediatePropagation()\n          return\n        }\n        if (elDropdown?.hideOnClick?.value) {\n          elDropdown.handleClick?.()\n        }\n        elDropdown.commandHandler?.(props.command, _instance, e)\n      }\n    )\n\n    // direct usage of v-bind={ ...$props, ...$attrs } causes type errors\n    const propsAndAttrs = computed(() => {\n      return { ...props, ...attrs }\n    })\n\n    return {\n      handleClick,\n      handlePointerMove,\n      handlePointerLeave,\n      textContent,\n      propsAndAttrs,\n    }\n  },\n})\n</script>\n"],"names":["ElDropdownCollectionItem"],"mappings":";;;;;;;;;;AAoCA,MAAK,YAAa,gBAAa;AAAA,EAC7B,MAAM;AAAA,EACN,YAAY;AAAA,8BACVA;AAAA,IACA;AAAA,IACA;AAAA;AAAA,EAEF,cAAc;AAAA,EACd,OAAO;AAAA,EACP,OAAO,CAAC,eAAe,gBAAgB;AAAA,EACvC,MAAM,OAAO,EAAE,MAAM,SAAS;AAC5B,UAAM,EAAE,eAAe;AACvB,UAAM,YAAY;AAClB,UAAM,UAAU,IAAwB;AACxC,UAAM,cAAc,SAAS,MAAM;AACnC,UAAM,EAAE;AAKR,8BAA0B,qBACxB;AACE;AACA;AAAS;AAGT,UAAI,gBAAgB;AAClB;AAAY;AAEZ;AACA,eAAO;AACL;AAAC;AAAkC;AAAA;AAAA;AAM3C,UAAM,qBAAqB,qBACzB;AACE;AACA;AAAS,OAEX;AACE;AAAY;AAIhB;AAEI;AACA;AAAS,OAEX,CAAC;AACC,UAAI;AACF,UAAE;AACF;AAAA;AAEF,UAAI;AACF;AAAW;AAEb;AAAsD;AAK1D,UAAM,gBAAgB;AACpB;AAAsB;AAGxB;AAAO,MACL;AAAA;AACA,MACA;AAAA,MACA;AAAA;AACA;AAAA;AAAA;;;;;;AA5GiB;AACN;;;AAWU;AAToB;;;AAQjB;AALW,2BACnB;AAAA;AACN;;;AAEA;;;;;;;;;;;;;;;;;;;;;"}

package/es/components/dropdown/src/dropdown-item.vue.d.ts

@@ -1,28 +1,38 @@
 declare const _default: import("vue").DefineComponent<{
-    readonly command: import("../../../utils/props").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
+    readonly command: import("../../../utils-v2").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly divided: BooleanConstructor;
     readonly textValue: StringConstructor;
-    readonly icon: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
+    readonly icon: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
 }, {
     handleClick: (event: PointerEvent) => void;
     handlePointerMove: (event: PointerEvent) => void;
     handlePointerLeave: (event: PointerEvent) => void;
     textContent: import("vue").ComputedRef<string>;
+    propsAndAttrs: import("vue").ComputedRef<{
+        icon: import("../../../utils-v2").BuildPropType<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown> | undefined;
+        disabled: boolean;
+        onClick: ((...args: any[]) => any) | undefined;
+        onPointermove: ((...args: any[]) => any) | undefined;
+        onPointerleave: ((...args: any[]) => any) | undefined;
+        command: import("../../../utils-v2").BuildPropType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown>;
+        divided: boolean;
+        textValue: string | undefined;
+    }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "pointerleave" | "pointermove")[], "click" | "pointerleave" | "pointermove", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly command: import("../../../utils/props").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
+    readonly command: import("../../../utils-v2").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly divided: BooleanConstructor;
     readonly textValue: StringConstructor;
-    readonly icon: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
+    readonly icon: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
 }>> & {
     onClick?: ((...args: any[]) => any) | undefined;
     onPointermove?: ((...args: any[]) => any) | undefined;
     onPointerleave?: ((...args: any[]) => any) | undefined;
 }, {
-    icon: import("../../../utils/props").BuildPropType<import("../../../utils/props").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown>;
+    icon: import("../../../utils-v2").BuildPropType<import("../../../utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown>;
     disabled: boolean;
-    command: import("../../../utils/props").BuildPropType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown>;
+    command: import("../../../utils-v2").BuildPropType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown>;
     divided: boolean;
 }>;
 export default _default;

package/es/components/dropdown/src/dropdown-menu.vue.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{
-    onKeydown: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
+    onKeydown: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
 }, {
     size: import("vue").ComputedRef<string> | undefined;
     rovingFocusGroupRootStyle: import("vue").Ref<import("vue").StyleValue>;
@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
     onFocus: (e: FocusEvent) => void;
     onMousedown: (e: Event) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    onKeydown: import("../../../utils/props").BuildPropReturn<import("../../../utils/props").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
+    onKeydown: import("../../../utils-v2").BuildPropReturn<import("../../../utils-v2").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
 }>>, {
     onKeydown: (e: KeyboardEvent) => void;
 }>;

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

@@ -1,6 +1,6 @@
 import type { Options } from '@popperjs/core';
 import type { Placement } from 'element-plus/es/components/popper';
-import type { ComponentInternalInstance, Component, ComputedRef } from 'vue';
+import type { ComponentInternalInstance, ComputedRef } from 'vue';
 import type { Nullable } from 'element-plus/es/utils/types';
 export interface IElDropdownInstance {
     instance?: ComponentInternalInstance;
@@ -14,18 +14,18 @@ export interface IElDropdownInstance {
     triggerElm?: ComputedRef<Nullable<HTMLButtonElement>>;
 }
 export declare const dropdownProps: {
-    readonly type: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<import("element-plus/es/utils/props").BuildPropType<StringConstructor, "" | "default" | "primary" | "success" | "warning" | "info" | "danger" | "text", unknown>>, unknown, unknown, unknown, unknown>;
-    readonly placement: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<Placement>, "bottom", unknown, unknown, unknown>;
-    readonly popperOptions: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<Partial<Options>>, () => {}, unknown, unknown, unknown>;
-    readonly size: import("element-plus/es/utils/props").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
+    readonly type: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<import("element-plus/es/utils-v2").BuildPropType<StringConstructor, "" | "default" | "primary" | "success" | "warning" | "info" | "danger" | "text", unknown>>, unknown, unknown, unknown, unknown>;
+    readonly placement: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<Placement>, "bottom", unknown, unknown, unknown>;
+    readonly popperOptions: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<Partial<Options>>, () => {}, unknown, unknown, unknown>;
+    readonly size: import("element-plus/es/utils-v2").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
     readonly splitButton: BooleanConstructor;
-    readonly hideOnClick: import("element-plus/es/utils/props").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
-    readonly loop: import("element-plus/es/utils/props").BuildPropReturn<BooleanConstructor, unknown, unknown, unknown, unknown>;
-    readonly showTimeout: import("element-plus/es/utils/props").BuildPropReturn<NumberConstructor, 150, unknown, unknown, unknown>;
-    readonly hideTimeout: import("element-plus/es/utils/props").BuildPropReturn<NumberConstructor, 150, unknown, unknown, unknown>;
-    readonly tabindex: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<string | number>, 0, unknown, unknown, unknown>;
-    readonly maxHeight: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<string | number>, "", unknown, unknown, unknown>;
-    readonly popperClass: import("element-plus/es/utils/props").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
+    readonly hideOnClick: import("element-plus/es/utils-v2").BuildPropReturn<BooleanConstructor, true, unknown, unknown, unknown>;
+    readonly loop: import("element-plus/es/utils-v2").BuildPropReturn<BooleanConstructor, unknown, unknown, unknown, unknown>;
+    readonly showTimeout: import("element-plus/es/utils-v2").BuildPropReturn<NumberConstructor, 150, unknown, unknown, unknown>;
+    readonly hideTimeout: import("element-plus/es/utils-v2").BuildPropReturn<NumberConstructor, 150, unknown, unknown, unknown>;
+    readonly tabindex: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<string | number>, 0, unknown, unknown, unknown>;
+    readonly maxHeight: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<string | number>, "", unknown, unknown, unknown>;
+    readonly popperClass: import("element-plus/es/utils-v2").BuildPropReturn<StringConstructor, "", unknown, unknown, unknown>;
     readonly trigger: {
         type: import("vue").PropType<"click" | "contextmenu" | "focus" | "hover" | ("click" | "contextmenu" | "focus" | "hover")[]>;
         default: string;
@@ -39,14 +39,14 @@ export declare const dropdownProps: {
     };
 };
 export declare const dropdownItemProps: {
-    readonly command: import("element-plus/es/utils/props").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
+    readonly command: import("element-plus/es/utils-v2").BuildPropReturn<readonly [ObjectConstructor, StringConstructor, NumberConstructor], () => {}, unknown, unknown, unknown>;
     readonly disabled: BooleanConstructor;
     readonly divided: BooleanConstructor;
     readonly textValue: StringConstructor;
-    readonly icon: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<string | Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
+    readonly icon: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>, unknown, unknown, unknown, unknown>;
 };
 export declare const dropdownMenuProps: {
-    onKeydown: import("element-plus/es/utils/props").BuildPropReturn<import("element-plus/es/utils/props").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
+    onKeydown: import("element-plus/es/utils-v2").BuildPropReturn<import("element-plus/es/utils-v2").PropWrapper<(e: KeyboardEvent) => void>, unknown, unknown, unknown, unknown>;
 };
 export declare const FIRST_KEYS: string[];
 export declare const LAST_KEYS: string[];
@@ -59,7 +59,7 @@ declare const ElCollection: {
     __isSuspense?: undefined;
     template?: string | object | undefined;
     render?: Function | undefined;
-    components?: Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>> | undefined;
+    components?: Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>> | undefined;
     directives?: Record<string, import("vue").Directive<any, any>> | undefined;
     inheritAttrs?: boolean | undefined;
     emits?: (import("vue").EmitsOptions & ThisType<void>) | undefined;
@@ -69,7 +69,7 @@ declare const ElCollection: {
     call: (<T, A extends any[]>(this: new (...args: A) => T, thisArg: T, ...args: A) => void) & ((this: unknown, ...args: unknown[]) => never);
     __defaults?: {} | undefined;
     compatConfig?: (Partial<Record<import("vue").DeprecationTypes, boolean | "suppress-warning">> & {
-        MODE?: 2 | 3 | ((comp: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | null) => 2 | 3) | undefined;
+        MODE?: 3 | 2 | ((comp: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | null) => 3 | 2) | undefined;
     }) | undefined;
     data?: ((this: import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, Readonly<import("vue").ExtractPropTypes<{}>>, {}, false, {
         P: {};
@@ -187,7 +187,7 @@ declare const ElCollection: {
     __isSuspense?: undefined;
     template?: string | object | undefined;
     render?: Function | undefined;
-    components?: Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>> | undefined;
+    components?: Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>> | undefined;
     directives?: Record<string, import("vue").Directive<any, any>> | undefined;
     inheritAttrs?: boolean | undefined;
     emits?: (import("vue").EmitsOptions & ThisType<void>) | undefined;
@@ -197,7 +197,7 @@ declare const ElCollection: {
     call: (<T, A extends any[]>(this: new (...args: A) => T, thisArg: T, ...args: A) => void) & ((this: unknown, ...args: unknown[]) => never);
     __defaults?: {} | undefined;
     compatConfig?: (Partial<Record<import("vue").DeprecationTypes, boolean | "suppress-warning">> & {
-        MODE?: 2 | 3 | ((comp: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | null) => 2 | 3) | undefined;
+        MODE?: 3 | 2 | ((comp: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | null) => 3 | 2) | undefined;
     }) | undefined;
     data?: ((this: import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}, {}, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, Readonly<import("vue").ExtractPropTypes<{}>>, {}, false, {
         P: {};

package/es/components/dropdown/src/dropdown.mjs

@@ -1,8 +1,10 @@
 import { EVENT_CODE } from '../../../utils/aria.mjs';
-import { buildProps, definePropType } from '../../../utils/props.mjs';
+import '../../../utils-v2/index.mjs';
 import '../../collection/index.mjs';
 import '../../tooltip/index.mjs';
 import { useTooltipTriggerProps, useTooltipContentProps } from '../../tooltip/src/tooltip.mjs';
+import { buildProps, definePropType } from '../../../utils-v2/vue/prop.mjs';
+import { iconPropType } from '../../../utils-v2/vue/icon.mjs';
 import { createCollectionWithScope } from '../../collection/src/collection.mjs';
 
 const dropdownProps = {
@@ -66,7 +68,7 @@ const dropdownItemProps = buildProps({
   divided: Boolean,
   textValue: String,
   icon: {
-    type: definePropType([String, Object])
+    type: iconPropType
   }
 });
 const dropdownMenuProps = buildProps({

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

@@ -1 +1 @@
-{"version":3,"file":"dropdown.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown.ts"],"sourcesContent":["import { EVENT_CODE } from '@element-plus/utils/aria'\nimport { buildProps, definePropType } from '@element-plus/utils/props'\nimport { createCollectionWithScope } from '@element-plus/components/collection'\nimport {\n  useTooltipTriggerProps,\n  useTooltipContentProps,\n} from '@element-plus/components/tooltip'\nimport type { Options } from '@popperjs/core'\n\nimport type { ButtonType } from '@element-plus/components/button'\nimport type { Placement } from '@element-plus/components/popper'\nimport type { ComponentInternalInstance, Component, ComputedRef } from 'vue'\nimport type { Nullable } from '@element-plus/utils/types'\n\nexport interface IElDropdownInstance {\n  instance?: ComponentInternalInstance\n  dropdownSize?: ComputedRef<string>\n  handleClick?: () => void\n  commandHandler?: (...arg) => void\n  show?: () => void\n  hide?: () => void\n  trigger?: ComputedRef<string>\n  hideOnClick?: ComputedRef<boolean>\n  triggerElm?: ComputedRef<Nullable<HTMLButtonElement>>\n}\n\nexport const dropdownProps = {\n  trigger: useTooltipTriggerProps.trigger,\n\n  effect: {\n    ...useTooltipContentProps.effect,\n    default: 'light',\n  },\n  ...buildProps({\n    type: {\n      type: definePropType<ButtonType>(String),\n    },\n    placement: {\n      type: definePropType<Placement>(String),\n      default: 'bottom',\n    },\n    popperOptions: {\n      type: definePropType<Partial<Options>>(Object),\n      default: () => ({}),\n    },\n    size: {\n      type: String,\n      default: '',\n    },\n    splitButton: Boolean,\n    hideOnClick: {\n      type: Boolean,\n      default: true,\n    },\n    loop: {\n      type: Boolean,\n    },\n    showTimeout: {\n      type: Number,\n      default: 150,\n    },\n    hideTimeout: {\n      type: Number,\n      default: 150,\n    },\n    tabindex: {\n      type: definePropType<number | string>([Number, String]),\n      default: 0,\n    },\n    maxHeight: {\n      type: definePropType<number | string>([Number, String]),\n      default: '',\n    },\n    popperClass: {\n      type: String,\n      default: '',\n    },\n  } as const),\n} as const\n\nexport const dropdownItemProps = buildProps({\n  command: {\n    type: [Object, String, Number],\n    default: () => ({}),\n  },\n  disabled: Boolean,\n  divided: Boolean,\n  textValue: String,\n  icon: {\n    type: definePropType<string | Component>([String, Object]),\n  },\n} as const)\n\nexport const dropdownMenuProps = buildProps({\n  onKeydown: { type: definePropType<(e: KeyboardEvent) => void>(Function) },\n})\n\nexport const FIRST_KEYS = [\n  EVENT_CODE.down,\n  EVENT_CODE.pageDown,\n  EVENT_CODE.home,\n]\n\nexport const LAST_KEYS = [EVENT_CODE.up, EVENT_CODE.pageUp, EVENT_CODE.end]\n\nexport const FIRST_LAST_KEYS = [...FIRST_KEYS, ...LAST_KEYS]\n\nconst {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY,\n} = createCollectionWithScope('Dropdown')\n\nexport {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY as DROPDOWN_COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY as DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n}\n"],"names":[],"mappings":";;;;;;;AAOY,MAAC,aAAa,GAAG;AAC7B,EAAE,OAAO,EAAE,sBAAsB,CAAC,OAAO;AACzC,EAAE,MAAM,EAAE;AACV,IAAI,GAAG,sBAAsB,CAAC,MAAM;AACpC,IAAI,OAAO,EAAE,OAAO;AACpB,GAAG;AACH,EAAE,GAAG,UAAU,CAAC;AAChB,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,KAAK;AACL,IAAI,SAAS,EAAE;AACf,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,MAAM,OAAO,EAAE,QAAQ;AACvB,KAAK;AACL,IAAI,aAAa,EAAE;AACnB,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,MAAM,OAAO,EAAE,OAAO,EAAE,CAAC;AACzB,KAAK;AACL,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,IAAI,WAAW,EAAE,OAAO;AACxB,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,OAAO;AACnB,MAAM,OAAO,EAAE,IAAI;AACnB,KAAK;AACL,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,OAAO;AACnB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,GAAG;AAClB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,GAAG;AAClB,KAAK;AACL,IAAI,QAAQ,EAAE;AACd,MAAM,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5C,MAAM,OAAO,EAAE,CAAC;AAChB,KAAK;AACL,IAAI,SAAS,EAAE;AACf,MAAM,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5C,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,GAAG,CAAC;AACJ,EAAE;AACU,MAAC,iBAAiB,GAAG,UAAU,CAAC;AAC5C,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;AAClC,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,OAAO,EAAE,OAAO;AAClB,EAAE,SAAS,EAAE,MAAM;AACnB,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1C,GAAG;AACH,CAAC,EAAE;AACS,MAAC,iBAAiB,GAAG,UAAU,CAAC;AAC5C,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE;AAC/C,CAAC,EAAE;AACS,MAAC,UAAU,GAAG;AAC1B,EAAE,UAAU,CAAC,IAAI;AACjB,EAAE,UAAU,CAAC,QAAQ;AACrB,EAAE,UAAU,CAAC,IAAI;AACjB,EAAE;AACU,MAAC,SAAS,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE;AAChE,MAAC,eAAe,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,EAAE;AACxD,MAAC;AACN,EAAE,YAAY;AACd,EAAE,gBAAgB;AAClB,EAAE,wBAAwB;AAC1B,EAAE,6BAA6B;AAC/B,CAAC,GAAG,yBAAyB,CAAC,UAAU;;;;"}
+{"version":3,"file":"dropdown.mjs","sources":["../../../../../../packages/components/dropdown/src/dropdown.ts"],"sourcesContent":["import { EVENT_CODE } from '@element-plus/utils/aria'\nimport {\n  buildProps,\n  definePropType,\n  iconPropType,\n} from '@element-plus/utils-v2'\nimport { createCollectionWithScope } from '@element-plus/components/collection'\nimport {\n  useTooltipTriggerProps,\n  useTooltipContentProps,\n} from '@element-plus/components/tooltip'\nimport type { Options } from '@popperjs/core'\n\nimport type { ButtonType } from '@element-plus/components/button'\nimport type { Placement } from '@element-plus/components/popper'\nimport type { ComponentInternalInstance, ComputedRef } from 'vue'\nimport type { Nullable } from '@element-plus/utils/types'\n\nexport interface IElDropdownInstance {\n  instance?: ComponentInternalInstance\n  dropdownSize?: ComputedRef<string>\n  handleClick?: () => void\n  commandHandler?: (...arg) => void\n  show?: () => void\n  hide?: () => void\n  trigger?: ComputedRef<string>\n  hideOnClick?: ComputedRef<boolean>\n  triggerElm?: ComputedRef<Nullable<HTMLButtonElement>>\n}\n\nexport const dropdownProps = {\n  trigger: useTooltipTriggerProps.trigger,\n\n  effect: {\n    ...useTooltipContentProps.effect,\n    default: 'light',\n  },\n  ...buildProps({\n    type: {\n      type: definePropType<ButtonType>(String),\n    },\n    placement: {\n      type: definePropType<Placement>(String),\n      default: 'bottom',\n    },\n    popperOptions: {\n      type: definePropType<Partial<Options>>(Object),\n      default: () => ({}),\n    },\n    size: {\n      type: String,\n      default: '',\n    },\n    splitButton: Boolean,\n    hideOnClick: {\n      type: Boolean,\n      default: true,\n    },\n    loop: {\n      type: Boolean,\n    },\n    showTimeout: {\n      type: Number,\n      default: 150,\n    },\n    hideTimeout: {\n      type: Number,\n      default: 150,\n    },\n    tabindex: {\n      type: definePropType<number | string>([Number, String]),\n      default: 0,\n    },\n    maxHeight: {\n      type: definePropType<number | string>([Number, String]),\n      default: '',\n    },\n    popperClass: {\n      type: String,\n      default: '',\n    },\n  } as const),\n} as const\n\nexport const dropdownItemProps = buildProps({\n  command: {\n    type: [Object, String, Number],\n    default: () => ({}),\n  },\n  disabled: Boolean,\n  divided: Boolean,\n  textValue: String,\n  icon: {\n    type: iconPropType,\n  },\n} as const)\n\nexport const dropdownMenuProps = buildProps({\n  onKeydown: { type: definePropType<(e: KeyboardEvent) => void>(Function) },\n})\n\nexport const FIRST_KEYS = [\n  EVENT_CODE.down,\n  EVENT_CODE.pageDown,\n  EVENT_CODE.home,\n]\n\nexport const LAST_KEYS = [EVENT_CODE.up, EVENT_CODE.pageUp, EVENT_CODE.end]\n\nexport const FIRST_LAST_KEYS = [...FIRST_KEYS, ...LAST_KEYS]\n\nconst {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY,\n} = createCollectionWithScope('Dropdown')\n\nexport {\n  ElCollection,\n  ElCollectionItem,\n  COLLECTION_INJECTION_KEY as DROPDOWN_COLLECTION_INJECTION_KEY,\n  COLLECTION_ITEM_INJECTION_KEY as DROPDOWN_COLLECTION_ITEM_INJECTION_KEY,\n}\n"],"names":[],"mappings":";;;;;;;;;AAWY,MAAC,aAAa,GAAG;AAC7B,EAAE,OAAO,EAAE,sBAAsB,CAAC,OAAO;AACzC,EAAE,MAAM,EAAE;AACV,IAAI,GAAG,sBAAsB,CAAC,MAAM;AACpC,IAAI,OAAO,EAAE,OAAO;AACpB,GAAG;AACH,EAAE,GAAG,UAAU,CAAC;AAChB,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,KAAK;AACL,IAAI,SAAS,EAAE;AACf,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,MAAM,OAAO,EAAE,QAAQ;AACvB,KAAK;AACL,IAAI,aAAa,EAAE;AACnB,MAAM,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC;AAClC,MAAM,OAAO,EAAE,OAAO,EAAE,CAAC;AACzB,KAAK;AACL,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,IAAI,WAAW,EAAE,OAAO;AACxB,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,OAAO;AACnB,MAAM,OAAO,EAAE,IAAI;AACnB,KAAK;AACL,IAAI,IAAI,EAAE;AACV,MAAM,IAAI,EAAE,OAAO;AACnB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,GAAG;AAClB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,GAAG;AAClB,KAAK;AACL,IAAI,QAAQ,EAAE;AACd,MAAM,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5C,MAAM,OAAO,EAAE,CAAC;AAChB,KAAK;AACL,IAAI,SAAS,EAAE;AACf,MAAM,IAAI,EAAE,cAAc,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC5C,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,IAAI,WAAW,EAAE;AACjB,MAAM,IAAI,EAAE,MAAM;AAClB,MAAM,OAAO,EAAE,EAAE;AACjB,KAAK;AACL,GAAG,CAAC;AACJ,EAAE;AACU,MAAC,iBAAiB,GAAG,UAAU,CAAC;AAC5C,EAAE,OAAO,EAAE;AACX,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;AAClC,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;AACvB,GAAG;AACH,EAAE,QAAQ,EAAE,OAAO;AACnB,EAAE,OAAO,EAAE,OAAO;AAClB,EAAE,SAAS,EAAE,MAAM;AACnB,EAAE,IAAI,EAAE;AACR,IAAI,IAAI,EAAE,YAAY;AACtB,GAAG;AACH,CAAC,EAAE;AACS,MAAC,iBAAiB,GAAG,UAAU,CAAC;AAC5C,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE;AAC/C,CAAC,EAAE;AACS,MAAC,UAAU,GAAG;AAC1B,EAAE,UAAU,CAAC,IAAI;AACjB,EAAE,UAAU,CAAC,QAAQ;AACrB,EAAE,UAAU,CAAC,IAAI;AACjB,EAAE;AACU,MAAC,SAAS,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE;AAChE,MAAC,eAAe,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,SAAS,EAAE;AACxD,MAAC;AACN,EAAE,YAAY;AACd,EAAE,gBAAgB;AAClB,EAAE,wBAAwB;AAC1B,EAAE,6BAA6B;AAC/B,CAAC,GAAG,yBAAyB,CAAC,UAAU;;;;"}