naive-ui 2.20.2 → 2.21.2

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

@@ -1,13 +1,12 @@
 import { PropType } from 'vue';
 import { TreeNode } from 'treemate';
-import { DropdownGroupOption, DropdownIgnoredOption, DropdownOption } from './interface';
 declare const _default: import("vue").DefineComponent<{
     clsPrefix: {
         type: StringConstructor;
         required: true;
     };
     tmNode: {
-        type: PropType<TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>>;
+        type: PropType<TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>>;
         required: true;
     };
     parentKey: {
@@ -20,7 +19,7 @@ declare const _default: import("vue").DefineComponent<{
     parentKey?: unknown;
 } & {
     clsPrefix: string;
-    tmNode: TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>;
+    tmNode: TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>;
     parentKey: string | number | null;
 } & {}>, {
     parentKey: string | number | null;

package/es/dropdown/src/DropdownGroupHeader.js

@@ -33,17 +33,17 @@ export default defineComponent({
         const { rawNode } = this.tmNode;
         return (h("div", { class: `${clsPrefix}-dropdown-option` },
             h("div", { class: `${clsPrefix}-dropdown-option-body ${clsPrefix}-dropdown-option-body--group` },
-                h("div", { "__dropdown-option": true, class: [
+                h("div", { "data-dropdown-option": true, class: [
                         `${clsPrefix}-dropdown-option-body__prefix`,
                         showIcon && `${clsPrefix}-dropdown-option-body__prefix--show-icon`
                     ] }, render(rawNode.icon)),
-                h("div", { class: `${clsPrefix}-dropdown-option-body__label`, "__dropdown-option": true }, renderLabel
+                h("div", { class: `${clsPrefix}-dropdown-option-body__label`, "data-dropdown-option": true }, renderLabel
                     ? renderLabel(rawNode)
                     : render((_a = rawNode.title) !== null && _a !== void 0 ? _a : rawNode[this.labelField])),
                 h("div", { class: [
                         `${clsPrefix}-dropdown-option-body__suffix`,
                         hasSubmenu &&
                             `${clsPrefix}-dropdown-option-body__suffix--has-submenu`
-                    ], "__dropdown-option": true }))));
+                    ], "data-dropdown-option": true }))));
     }
 });

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

@@ -1,6 +1,5 @@
 import { InjectionKey, PropType, Ref, CSSProperties } from 'vue';
 import { TreeNode } from 'treemate';
-import { DropdownGroupOption, DropdownIgnoredOption, DropdownOption } from './interface';
 export interface NDropdownMenuInjection {
     showIconRef: Ref<boolean>;
     hasSubmenuRef: Ref<boolean>;
@@ -14,7 +13,7 @@ declare const _default: import("vue").DefineComponent<{
         required: true;
     };
     tmNodes: {
-        type: PropType<TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>[]>;
+        type: PropType<TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>[]>;
         default: () => never[];
     };
     parentKey: {
@@ -31,12 +30,12 @@ declare const _default: import("vue").DefineComponent<{
     clsPrefix: string;
     showArrow: boolean;
     parentKey: string | number;
-    tmNodes: TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>[];
+    tmNodes: TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>[];
 } & {
     arrowStyle?: string | CSSProperties | undefined;
 }>, {
     showArrow: boolean;
     parentKey: string | number;
-    tmNodes: TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>[];
+    tmNodes: TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>[];
 }>;
 export default _default;

package/es/dropdown/src/DropdownMenu.js

@@ -57,16 +57,17 @@ export default defineComponent({
         const { parentKey, clsPrefix } = this;
         return (h("div", { class: `${clsPrefix}-dropdown-menu` },
             this.tmNodes.map((tmNode) => {
-                if (isRenderNode(tmNode.rawNode)) {
+                const { rawNode } = tmNode;
+                if (isRenderNode(rawNode)) {
                     return (h(NDropdownRenderOption, { tmNode: tmNode, key: tmNode.key }));
                 }
-                if (isDividerNode(tmNode.rawNode)) {
+                if (isDividerNode(rawNode)) {
                     return h(NDropdownDivider, { clsPrefix: clsPrefix, key: tmNode.key });
                 }
-                if (isGroupNode(tmNode.rawNode)) {
+                if (isGroupNode(rawNode)) {
                     return (h(NDropdownGroup, { clsPrefix: clsPrefix, tmNode: tmNode, parentKey: parentKey, key: tmNode.key }));
                 }
-                return (h(NDropdownOption, { clsPrefix: clsPrefix, tmNode: tmNode, parentKey: parentKey, key: tmNode.key, props: tmNode.rawNode.props }));
+                return (h(NDropdownOption, { clsPrefix: clsPrefix, tmNode: tmNode, parentKey: parentKey, key: tmNode.key, props: rawNode.props }));
             }),
             this.showArrow
                 ? renderArrow({

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

@@ -1,14 +1,13 @@
 import { PropType, Ref, HTMLAttributes } from 'vue';
 import { FollowerPlacement } from 'vueuc';
 import { TreeNode } from 'treemate';
-import { DropdownGroupOption, DropdownIgnoredOption, DropdownOption } from './interface';
 declare const _default: import("vue").DefineComponent<{
     clsPrefix: {
         type: StringConstructor;
         required: true;
     };
     tmNode: {
-        type: PropType<TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>>;
+        type: PropType<TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>>;
         required: true;
     };
     parentKey: {
@@ -28,7 +27,7 @@ declare const _default: import("vue").DefineComponent<{
     siblingHasSubmenu: Ref<boolean>;
     animated: Ref<boolean>;
     mergedShowSubmenu: import("vue").ComputedRef<boolean>;
-    rawNode: import("vue").ComputedRef<DropdownOption | DropdownGroupOption | DropdownIgnoredOption>;
+    rawNode: import("vue").ComputedRef<import("../..").MenuOption | import("../..").MenuGroupOption | import("../../menu/src/interface").MenuIgnoredOption>;
     hasSubmenu: import("vue").ComputedRef<boolean>;
     pending: import("vue").ComputedRef<boolean>;
     childActive: import("vue").ComputedRef<boolean>;
@@ -49,7 +48,7 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     clsPrefix: string;
     placement: FollowerPlacement;
-    tmNode: TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>;
+    tmNode: TreeNode<import("../..").MenuOption, import("../..").MenuGroupOption, import("../../menu/src/interface").MenuIgnoredOption>;
     parentKey: string | number | null;
 } & {
     props?: HTMLAttributes | undefined;

package/es/dropdown/src/DropdownOption.js

@@ -7,6 +7,7 @@ import { NIcon } from '../../icon';
 import NDropdownMenu, { dropdownMenuInjectionKey } from './DropdownMenu';
 import { dropdownInjectionKey } from './Dropdown';
 import { isSubmenuNode } from './utils';
+import { happensIn } from 'seemly';
 const dropdownOptionInjectionKey = Symbol('dropdown-option');
 export default defineComponent({
     name: 'DropdownOption',
@@ -104,7 +105,7 @@ export default defineComponent({
                 return;
             const { relatedTarget } = e;
             if (relatedTarget &&
-                !relatedTarget.hasAttribute('__dropdown-option')) {
+                !happensIn({ target: relatedTarget }, 'dropdownOption')) {
                 hoverKeyRef.value = null;
             }
         }
@@ -179,15 +180,15 @@ export default defineComponent({
         };
         return (h("div", { class: `${clsPrefix}-dropdown-option` },
             h('div', mergeProps(builtinProps, props), [
-                h("div", { "__dropdown-option": true, class: [
+                h("div", { "data-dropdown-option": true, class: [
                         `${clsPrefix}-dropdown-option-body__prefix`,
                         siblingHasIcon &&
                             `${clsPrefix}-dropdown-option-body__prefix--show-icon`
                     ] }, [renderIcon ? renderIcon(rawNode) : render(rawNode.icon)]),
-                h("div", { "__dropdown-option": true, class: `${clsPrefix}-dropdown-option-body__label` }, renderLabel
+                h("div", { "data-dropdown-option": true, class: `${clsPrefix}-dropdown-option-body__label` }, renderLabel
                     ? renderLabel(rawNode)
                     : render((_a = rawNode[this.labelField]) !== null && _a !== void 0 ? _a : rawNode.title)),
-                h("div", { "__dropdown-option": true, class: [
+                h("div", { "data-dropdown-option": true, class: [
                         `${clsPrefix}-dropdown-option-body__suffix`,
                         siblingHasSubmenu &&
                             `${clsPrefix}-dropdown-option-body__suffix--has-submenu`

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

@@ -1,14 +1,13 @@
 import { PropType } from 'vue';
 import { TreeNode } from 'treemate';
-import { DropdownRenderOption } from './interface';
 declare const _default: import("vue").DefineComponent<{
     tmNode: {
-        type: PropType<TreeNode<DropdownRenderOption, DropdownRenderOption, DropdownRenderOption>>;
+        type: PropType<TreeNode<import("../../menu/src/interface").MenuRenderOption, import("../../menu/src/interface").MenuRenderOption, import("../../menu/src/interface").MenuRenderOption>>;
         required: true;
     };
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     tmNode?: unknown;
 } & {
-    tmNode: TreeNode<DropdownRenderOption, DropdownRenderOption, DropdownRenderOption>;
+    tmNode: TreeNode<import("../../menu/src/interface").MenuRenderOption, import("../../menu/src/interface").MenuRenderOption, import("../../menu/src/interface").MenuRenderOption>;
 } & {}>, {}>;
 export default _default;

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

@@ -1,35 +1,14 @@
 import { TreeNode } from 'treemate';
-import { VNodeChild, HTMLAttributes } from 'vue';
-import { MenuOption, MenuGroupOption } from '../../menu/src/interface';
+import { VNodeChild } from 'vue';
+import { MenuOption, MenuGroupOption, MenuDividerOption, MenuIgnoredOption, MenuRenderOption } from '../../menu/src/interface';
 export declare type Key = string | number;
-export declare type DropdownOptionProps = HTMLAttributes;
-export declare type DropdownOption = MenuOption & {
-    props?: HTMLAttributes;
-};
-export declare type DropdownGroupOption = MenuGroupOption & {
-    props?: HTMLAttributes;
-};
-export interface DropdownIgnoredOption {
-    key?: Key;
-    type: 'render' | 'divider';
-    props?: HTMLAttributes;
-    render?: () => VNodeChild;
-    [key: string]: unknown;
-}
-export declare type DropdownMixedOption = DropdownOption | DropdownGroupOption | DropdownIgnoredOption;
-export declare type DropdownIntersectionOption = DropdownOption & DropdownGroupOption & DropdownIgnoredOption;
-export interface DropdownRenderOption {
-    key?: Key;
-    type: 'render';
-    props?: HTMLAttributes;
-    render?: () => VNodeChild;
-    [key: string]: unknown;
-}
-export interface DropdownDividerOption {
-    key?: Key;
-    type: 'divider';
-    [key: string]: unknown;
-}
+export declare type DropdownOption = MenuOption;
+export declare type DropdownGroupOption = MenuGroupOption;
+export declare type DropdownDividerOption = MenuDividerOption;
+export declare type DropdownRenderOption = MenuRenderOption;
+export declare type DropdownMixedOption = DropdownOption | DropdownGroupOption | DropdownDividerOption | DropdownRenderOption;
+export declare type DropdownIgnoredOption = MenuIgnoredOption;
+export declare type DropdownIntersectionOption = DropdownOption & DropdownGroupOption;
 export declare type TmNode = TreeNode<DropdownOption, DropdownGroupOption, DropdownIgnoredOption>;
 export declare type OnUpdateValue = <T extends string & number & (string | number)>(value: T, option: DropdownOption) => void;
 export declare type OnUpdateKeys = <T extends string[] & number[] & Array<string | number>>(keys: T) => void;