naive-ui 2.24.6 → 2.25.2

package/lib/mention/src/Mention.js

@@ -43,6 +43,9 @@ const mentionProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props),
     }, placeholder: {
         type: String,
         default: ''
+    }, placement: {
+        type: String,
+        default: 'bottom-start'
     }, size: String, 'onUpdate:value': [Array, Function], renderLabel: Function, onUpdateValue: [Array, Function], onSearch: Function, onSelect: Function, onFocus: Function, onBlur: Function, 
     // private
     internalDebug: Boolean });
@@ -51,7 +54,7 @@ exports.default = (0, vue_1.defineComponent)({
     props: mentionProps,
     setup(props) {
         const { namespaceRef, mergedClsPrefixRef, mergedBorderedRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Mention', 'Mention', index_cssr_1.default, styles_1.mentionLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Mention', '-mention', index_cssr_1.default, styles_1.mentionLight, props, mergedClsPrefixRef);
         const formItem = (0, _mixins_1.useFormItem)(props);
         const inputInstRef = (0, vue_1.ref)(null);
         const cursorRef = (0, vue_1.ref)(null);
@@ -284,6 +287,7 @@ exports.default = (0, vue_1.defineComponent)({
             mergedClsPrefix: mergedClsPrefixRef,
             mergedBordered: mergedBorderedRef,
             mergedSize: formItem.mergedSizeRef,
+            mergedStatus: formItem.mergedStatusRef,
             mergedTheme: themeRef,
             treeMate: treeMateRef,
             selectMenuInstRef,
@@ -313,7 +317,7 @@ exports.default = (0, vue_1.defineComponent)({
     render() {
         const { mergedTheme, mergedClsPrefix, $slots } = this;
         return ((0, vue_1.h)("div", { class: `${mergedClsPrefix}-mention` },
-            (0, vue_1.h)(input_1.NInput, { themeOverrides: mergedTheme.peerOverrides.Input, theme: mergedTheme.peers.Input, size: this.mergedSize, autosize: this.autosize, type: this.type, ref: "inputInstRef", placeholder: this.placeholder, onMousedown: this.handleInputMouseDown, onUpdateValue: this.handleInputUpdateValue, onKeydown: this.handleInputKeyDown, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, bordered: this.mergedBordered, disabled: this.disabled, value: this.mergedValue }),
+            (0, vue_1.h)(input_1.NInput, { status: this.mergedStatus, themeOverrides: mergedTheme.peerOverrides.Input, theme: mergedTheme.peers.Input, size: this.mergedSize, autosize: this.autosize, type: this.type, ref: "inputInstRef", placeholder: this.placeholder, onMousedown: this.handleInputMouseDown, onUpdateValue: this.handleInputUpdateValue, onKeydown: this.handleInputKeyDown, onFocus: this.handleInputFocus, onBlur: this.handleInputBlur, bordered: this.mergedBordered, disabled: this.disabled, value: this.mergedValue }),
             (0, vue_1.h)(vueuc_1.VBinder, null, {
                 default: () => [
                     (0, vue_1.h)(vueuc_1.VTarget, null, {
@@ -331,7 +335,7 @@ exports.default = (0, vue_1.defineComponent)({
                             return (0, vue_1.h)("div", { style: style, ref: "cursorRef" });
                         }
                     }),
-                    (0, vue_1.h)(vueuc_1.VFollower, { ref: "followerRef", placement: "bottom-start", show: this.showMenu, containerClass: this.namespace, to: this.adjustedTo, teleportDisabled: this.adjustedTo === _utils_1.useAdjustedTo.tdkey }, {
+                    (0, vue_1.h)(vueuc_1.VFollower, { ref: "followerRef", placement: this.placement, show: this.showMenu, containerClass: this.namespace, to: this.adjustedTo, teleportDisabled: this.adjustedTo === _utils_1.useAdjustedTo.tdkey }, {
                         default: () => ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted }, {
                             default: () => {
                                 const { mergedTheme } = this;

package/lib/menu/src/Menu.d.ts

@@ -1,7 +1,6 @@
 import { PropType, ExtractPropTypes, VNodeChild } from 'vue';
 import { Key } from 'treemate';
 import type { MaybeArray } from '../../_utils';
-import { MenuInjection } from './use-menu-child';
 import { MenuOption, MenuGroupOption, MenuIgnoredOption, MenuMixedOption, OnUpdateValue, OnUpdateKeys } from './interface';
 import { FollowerPlacement } from 'vueuc';
 import { DropdownProps } from '../../dropdown';
@@ -277,7 +276,6 @@ declare const menuProps: {
 };
 export declare type MenuSetupProps = ExtractPropTypes<typeof menuProps>;
 export declare type MenuProps = Partial<MenuSetupProps>;
-export declare const menuInjectionKey: import("vue").InjectionKey<MenuInjection>;
 declare const _default: import("vue").DefineComponent<{
     readonly options: {
         readonly type: PropType<MenuMixedOption[]>;
@@ -578,7 +576,7 @@ declare const _default: import("vue").DefineComponent<{
             errorColor: string;
             errorColorHover: string;
             errorColorPressed: string;
-            errorColorSuppl: string; /** TODO: deprecate it */
+            errorColorSuppl: string;
             textColorBase: string;
             textColor1: string;
             textColor2: string;
@@ -1020,9 +1018,9 @@ declare const _default: import("vue").DefineComponent<{
 }>>, {
     mode: "horizontal" | "vertical";
     disabled: boolean;
-    keyField: string;
-    iconSize: number;
     options: MenuMixedOption[];
+    iconSize: number;
+    keyField: string;
     defaultValue: Key | null;
     indent: number;
     labelField: string;

package/lib/menu/src/Menu.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.menuInjectionKey = void 0;
 const vue_1 = require("vue");
 const treemate_1 = require("treemate");
 const vooks_1 = require("vooks");
@@ -14,6 +13,7 @@ const styles_1 = require("../styles");
 const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
 const interface_1 = require("../../layout/src/interface");
 const useCheckDeprecated_1 = require("./useCheckDeprecated");
+const context_1 = require("./context");
 const menuProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { options: {
         type: Array,
         default: () => []
@@ -58,7 +58,6 @@ const menuProps = Object.assign(Object.assign({}, _mixins_1.useTheme.props), { o
     }, dropdownProps: Object, accordion: Boolean, 
     // deprecated
     items: Array, onOpenNamesChange: [Function, Array], onSelect: [Function, Array], onExpandedNamesChange: [Function, Array], expandedNames: Array, defaultExpandedNames: Array });
-exports.menuInjectionKey = (0, _utils_1.createInjectionKey)('n-menu');
 exports.default = (0, vue_1.defineComponent)({
     name: 'Menu',
     props: menuProps,
@@ -67,7 +66,7 @@ exports.default = (0, vue_1.defineComponent)({
             (0, useCheckDeprecated_1.useCheckDeprecated)(props);
         }
         const { mergedClsPrefixRef } = (0, _mixins_1.useConfig)(props);
-        const themeRef = (0, _mixins_1.useTheme)('Menu', 'Menu', index_cssr_1.default, styles_1.menuLight, props, mergedClsPrefixRef);
+        const themeRef = (0, _mixins_1.useTheme)('Menu', '-menu', index_cssr_1.default, styles_1.menuLight, props, mergedClsPrefixRef);
         const layoutSider = (0, vue_1.inject)(interface_1.layoutSiderInjectionKey, null);
         const mergedCollapsedRef = (0, vue_1.computed)(() => {
             var _a;
@@ -132,7 +131,7 @@ exports.default = (0, vue_1.defineComponent)({
         const activePathRef = (0, vue_1.computed)(() => {
             return treeMateRef.value.getPath(mergedValueRef.value).keyPath;
         });
-        (0, vue_1.provide)(exports.menuInjectionKey, {
+        (0, vue_1.provide)(context_1.menuInjectionKey, {
             props,
             mergedCollapsedRef,
             mergedThemeRef: themeRef,

package/lib/menu/src/MenuDivider.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const vue_1 = require("vue");
-const Menu_1 = require("./Menu");
+const context_1 = require("./context");
 exports.default = (0, vue_1.defineComponent)({
     name: 'MenuDivider',
     setup() {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const NMenu = (0, vue_1.inject)(Menu_1.menuInjectionKey);
+        const NMenu = (0, vue_1.inject)(context_1.menuInjectionKey);
         const { mergedClsPrefixRef, isHorizontalRef } = NMenu;
         return () => isHorizontalRef.value ? null : ((0, vue_1.h)("div", { class: `${mergedClsPrefixRef.value}-menu-divider` }));
     }

package/lib/menu/src/MenuOption.d.ts

@@ -21,7 +21,7 @@ export declare const menuItemProps: {
     readonly title: PropType<string | (() => import("vue").VNodeChild)>;
     readonly extra: PropType<string | (() => import("vue").VNodeChild)>;
 };
-declare const _default: import("vue").DefineComponent<{
+export declare const NMenuOption: import("vue").DefineComponent<{
     readonly tmNode: {
         readonly type: PropType<TmNode>;
         readonly required: true;
@@ -268,4 +268,3 @@ declare const _default: import("vue").DefineComponent<{
     disabled: boolean;
     isGroup: boolean;
 }>;
-export default _default;

package/lib/menu/src/MenuOption.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.menuItemProps = void 0;
+exports.NMenuOption = exports.menuItemProps = void 0;
 const vue_1 = require("vue");
 const vooks_1 = require("vooks");
 const _utils_1 = require("../../_utils");
@@ -15,7 +15,7 @@ exports.menuItemProps = Object.assign(Object.assign({}, use_menu_child_props_1.u
         type: Object,
         required: true
     }, disabled: Boolean, icon: Function, onClick: Function });
-exports.default = (0, vue_1.defineComponent)({
+exports.NMenuOption = (0, vue_1.defineComponent)({
     name: 'MenuOption',
     props: exports.menuItemProps,
     setup(props) {

package/lib/menu/src/MenuOptionContent.js

@@ -4,7 +4,7 @@ const vue_1 = require("vue");
 const icons_1 = require("../../_internal/icons");
 const _utils_1 = require("../../_utils");
 const _internal_1 = require("../../_internal");
-const Menu_1 = require("./Menu");
+const context_1 = require("./context");
 exports.default = (0, vue_1.defineComponent)({
     name: 'MenuOptionContent',
     props: {
@@ -41,7 +41,7 @@ exports.default = (0, vue_1.defineComponent)({
     },
     setup(props) {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const { props: menuProps } = (0, vue_1.inject)(Menu_1.menuInjectionKey);
+        const { props: menuProps } = (0, vue_1.inject)(context_1.menuInjectionKey);
         return {
             menuProps,
             style: (0, vue_1.computed)(() => {

package/lib/menu/src/MenuOptionGroup.d.ts

@@ -1,5 +1,4 @@
 import { PropType } from 'vue';
-import type { MenuOptionGroupInjection } from './use-menu-child';
 import { TmNode } from './interface';
 export declare const menuItemGroupProps: {
     readonly tmNodes: {
@@ -19,8 +18,7 @@ export declare const menuItemGroupProps: {
     readonly title: PropType<string | (() => import("vue").VNodeChild)>;
     readonly extra: PropType<string | (() => import("vue").VNodeChild)>;
 };
-export declare const menuItemGroupInjectionKey: import("vue").InjectionKey<MenuOptionGroupInjection>;
-declare const _default: import("vue").DefineComponent<{
+export declare const NMenuOptionGroup: import("vue").DefineComponent<{
     readonly tmNodes: {
         readonly type: PropType<TmNode[]>;
         readonly required: true;
@@ -58,4 +56,3 @@ declare const _default: import("vue").DefineComponent<{
     root: boolean;
     isGroup: boolean;
 }>;
-export default _default;

package/lib/menu/src/MenuOptionGroup.js

@@ -1,29 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.menuItemGroupInjectionKey = exports.menuItemGroupProps = void 0;
+exports.NMenuOptionGroup = exports.menuItemGroupProps = void 0;
 const vue_1 = require("vue");
 const _utils_1 = require("../../_utils");
 const use_menu_child_1 = require("./use-menu-child");
 const use_menu_child_props_1 = require("./use-menu-child-props");
+// eslint-disable-next-line import/no-cycle
 const utils_1 = require("./utils");
-const Submenu_1 = require("./Submenu");
-const Menu_1 = require("./Menu");
+const context_1 = require("./context");
 exports.menuItemGroupProps = Object.assign(Object.assign({}, use_menu_child_props_1.useMenuChildProps), { tmNodes: {
         type: Array,
         required: true
     } });
-exports.menuItemGroupInjectionKey = (0, _utils_1.createInjectionKey)('n-menu-item-group');
-exports.default = (0, vue_1.defineComponent)({
+exports.NMenuOptionGroup = (0, vue_1.defineComponent)({
     name: 'MenuOptionGroup',
     props: exports.menuItemGroupProps,
     setup(props) {
-        (0, vue_1.provide)(Submenu_1.submenuInjectionKey, null);
+        (0, vue_1.provide)(context_1.submenuInjectionKey, null);
         const MenuChild = (0, use_menu_child_1.useMenuChild)(props);
-        (0, vue_1.provide)(exports.menuItemGroupInjectionKey, {
+        (0, vue_1.provide)(context_1.menuItemGroupInjectionKey, {
             paddingLeftRef: MenuChild.paddingLeft
         });
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const { mergedClsPrefixRef, props: menuProps } = (0, vue_1.inject)(Menu_1.menuInjectionKey);
+        const { mergedClsPrefixRef, props: menuProps } = (0, vue_1.inject)(context_1.menuInjectionKey);
         return function () {
             const { value: mergedClsPrefix } = mergedClsPrefixRef;
             const paddingLeft = MenuChild.paddingLeft.value;

package/lib/menu/src/Submenu.d.ts

@@ -1,5 +1,4 @@
 import { PropType, VNodeChild } from 'vue';
-import type { SubmenuInjection } from './use-menu-child';
 import { MenuMixedOption, TmNode } from './interface';
 export declare const submenuProps: {
     readonly rawNodes: {
@@ -33,8 +32,7 @@ export declare const submenuProps: {
     readonly title: PropType<string | (() => VNodeChild)>;
     readonly extra: PropType<string | (() => VNodeChild)>;
 };
-export declare const submenuInjectionKey: import("vue").InjectionKey<SubmenuInjection>;
-declare const _default: import("vue").DefineComponent<{
+export declare const NSubmenu: import("vue").DefineComponent<{
     readonly rawNodes: {
         readonly type: PropType<MenuMixedOption[]>;
         readonly default: () => never[];
@@ -122,4 +120,3 @@ declare const _default: import("vue").DefineComponent<{
     tmNodes: TmNode[];
     rawNodes: MenuMixedOption[];
 }>;
-export default _default;

package/lib/menu/src/Submenu.js

@@ -3,17 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.submenuInjectionKey = exports.submenuProps = void 0;
+exports.NSubmenu = exports.submenuProps = void 0;
 const vue_1 = require("vue");
 const vooks_1 = require("vooks");
 const _internal_1 = require("../../_internal");
 const dropdown_1 = require("../../dropdown");
 const MenuOptionContent_1 = __importDefault(require("./MenuOptionContent"));
+// eslint-disable-next-line import/no-cycle
 const utils_1 = require("./utils");
 const use_menu_child_1 = require("./use-menu-child");
 const use_menu_child_props_1 = require("./use-menu-child-props");
-const MenuOptionGroup_1 = require("./MenuOptionGroup");
-const _utils_1 = require("../../_utils");
+const context_1 = require("./context");
 exports.submenuProps = Object.assign(Object.assign({}, use_menu_child_props_1.useMenuChildProps), { rawNodes: {
         type: Array,
         default: () => []
@@ -27,8 +27,7 @@ exports.submenuProps = Object.assign(Object.assign({}, use_menu_child_props_1.us
         type: Boolean,
         default: false
     }, icon: Function, onClick: Function });
-exports.submenuInjectionKey = (0, _utils_1.createInjectionKey)('n-submenu');
-exports.default = (0, vue_1.defineComponent)({
+exports.NSubmenu = (0, vue_1.defineComponent)({
     name: 'Submenu',
     props: exports.submenuProps,
     setup(props) {
@@ -44,11 +43,11 @@ exports.default = (0, vue_1.defineComponent)({
             return disabled;
         });
         const dropdownShowRef = (0, vue_1.ref)(false);
-        (0, vue_1.provide)(exports.submenuInjectionKey, {
+        (0, vue_1.provide)(context_1.submenuInjectionKey, {
             paddingLeftRef: MenuChild.paddingLeft,
             mergedDisabledRef
         });
-        (0, vue_1.provide)(MenuOptionGroup_1.menuItemGroupInjectionKey, null);
+        (0, vue_1.provide)(context_1.menuItemGroupInjectionKey, null);
         function doClick() {
             const { onClick } = props;
             if (onClick)

package/lib/menu/src/context.d.ts

@@ -0,0 +1,4 @@
+import type { MenuInjection, MenuOptionGroupInjection, SubmenuInjection } from './use-menu-child';
+export declare const menuInjectionKey: import("vue").InjectionKey<MenuInjection>;
+export declare const submenuInjectionKey: import("vue").InjectionKey<SubmenuInjection>;
+export declare const menuItemGroupInjectionKey: import("vue").InjectionKey<MenuOptionGroupInjection>;

package/lib/menu/src/context.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.menuItemGroupInjectionKey = exports.submenuInjectionKey = exports.menuInjectionKey = void 0;
+const _utils_1 = require("../../_utils");
+exports.menuInjectionKey = (0, _utils_1.createInjectionKey)('n-menu');
+exports.submenuInjectionKey = (0, _utils_1.createInjectionKey)('n-submenu');
+exports.menuItemGroupInjectionKey = (0, _utils_1.createInjectionKey)('n-menu-item-group');

package/lib/menu/src/use-menu-child.js

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useMenuChild = void 0;
 const vue_1 = require("vue");
-const Menu_1 = require("./Menu");
-const MenuOptionGroup_1 = require("./MenuOptionGroup");
-const Submenu_1 = require("./Submenu");
+const context_1 = require("./context");
 const ICON_MARGIN_RIGHT = 8;
 function useMenuChild(props) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const NMenu = (0, vue_1.inject)(Menu_1.menuInjectionKey);
+    const NMenu = (0, vue_1.inject)(context_1.menuInjectionKey);
     const { props: menuProps, mergedCollapsedRef } = NMenu;
-    const NSubmenu = (0, vue_1.inject)(Submenu_1.submenuInjectionKey, null);
-    const NMenuOptionGroup = (0, vue_1.inject)(MenuOptionGroup_1.menuItemGroupInjectionKey, null);
+    const NSubmenu = (0, vue_1.inject)(context_1.submenuInjectionKey, null);
+    const NMenuOptionGroup = (0, vue_1.inject)(context_1.menuItemGroupInjectionKey, null);
     const horizontalRef = (0, vue_1.computed)(() => {
         return menuProps.mode === 'horizontal';
     });

package/lib/menu/src/useCheckDeprecated.d.ts

@@ -1,2 +1,2 @@
-import { MenuSetupProps } from './Menu';
+import type { MenuSetupProps } from './Menu';
 export declare function useCheckDeprecated(props: MenuSetupProps): void;

package/lib/menu/src/utils.d.ts

@@ -1,7 +1,7 @@
 import { VNode } from 'vue';
 import type { TreeNode } from 'treemate';
 import { MenuOption, MenuGroupOption, MenuIgnoredOption, MenuMixedOption } from './interface';
-import { MenuSetupProps } from './Menu';
+import type { MenuSetupProps } from './Menu';
 export declare function isIgnoredNode(rawNode: MenuMixedOption): rawNode is MenuIgnoredOption;
 export declare function isDividerNode(rawNode: MenuMixedOption): rawNode is MenuIgnoredOption;
 export declare function itemRenderer(tmNode: TreeNode<MenuOption, MenuGroupOption, MenuIgnoredOption>, menuProps: MenuSetupProps): VNode | undefined;

package/lib/menu/src/utils.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -25,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.itemRenderer = exports.isDividerNode = exports.isIgnoredNode = void 0;
 const vue_1 = require("vue");
 const _utils_1 = require("../../_utils");
-const MenuOptionGroup_1 = __importStar(require("./MenuOptionGroup"));
-const Submenu_1 = __importStar(require("./Submenu"));
-const MenuOption_1 = __importStar(require("./MenuOption"));
+// eslint-disable-next-line import/no-cycle
+const MenuOptionGroup_1 = require("./MenuOptionGroup");
+// eslint-disable-next-line import/no-cycle
+const Submenu_1 = require("./Submenu");
+const MenuOption_1 = require("./MenuOption");
 const MenuDivider_1 = __importDefault(require("./MenuDivider"));
 const groupPropKeys = (0, _utils_1.keysOf)(MenuOptionGroup_1.menuItemGroupProps);
 const itemPropKeys = (0, _utils_1.keysOf)(MenuOption_1.menuItemProps);
@@ -54,9 +37,9 @@ function itemRenderer(tmNode, menuProps) {
         level, root: level === 0, isGroup });
     if (tmNode.children) {
         if (tmNode.isGroup) {
-            return (0, vue_1.h)(MenuOptionGroup_1.default, (0, _utils_1.keep)(props, groupPropKeys, { tmNodes: tmNode.children, key }));
+            return (0, vue_1.h)(MenuOptionGroup_1.NMenuOptionGroup, (0, _utils_1.keep)(props, groupPropKeys, { tmNodes: tmNode.children, key }));
         }
-        return (0, vue_1.h)(Submenu_1.default, (0, _utils_1.keep)(props, submenuPropKeys, {
+        return (0, vue_1.h)(Submenu_1.NSubmenu, (0, _utils_1.keep)(props, submenuPropKeys, {
             key,
             rawNodes: rawNode[menuProps.childrenField],
             tmNodes: tmNode.children,
@@ -64,7 +47,7 @@ function itemRenderer(tmNode, menuProps) {
         }));
     }
     else {
-        return (0, vue_1.h)(MenuOption_1.default, (0, _utils_1.keep)(props, itemPropKeys, {
+        return (0, vue_1.h)(MenuOption_1.NMenuOption, (0, _utils_1.keep)(props, itemPropKeys, {
             key,
             tmNode
         }));

package/lib/message/src/Message.d.ts

@@ -1,4 +1,4 @@
-import { VNodeChild, CSSProperties, PropType } from 'vue';
+import { VNodeChild, PropType } from 'vue';
 import type { MessageType, MessageRenderMessage } from './types';
 declare const _default: import("vue").DefineComponent<{
     render: PropType<MessageRenderMessage>;
@@ -15,163 +15,7 @@ declare const _default: import("vue").DefineComponent<{
     onMouseleave: PropType<(e: MouseEvent) => void>;
 }, {
     mergedClsPrefix: import("vue").Ref<string>;
-    messageProviderProps: {
-        duration: number;
-        placement: "bottom" | "top" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
-        closable: boolean;
-        keepAliveOnHover: boolean;
-    } & {
-        max?: number | undefined;
-        to?: string | HTMLElement | undefined;
-        theme?: import("../../_mixins").Theme<"Message", {
-            textColorInfo: string;
-            textColorSuccess: string;
-            textColorError: string;
-            textColorWarning: string;
-            textColorLoading: string;
-            colorInfo: string;
-            colorSuccess: string;
-            colorError: string;
-            colorWarning: string;
-            colorLoading: string;
-            boxShadowInfo: string;
-            boxShadowSuccess: string;
-            boxShadowError: string;
-            boxShadowWarning: string;
-            boxShadowLoading: string;
-            iconColorInfo: string;
-            iconColorSuccess: string;
-            iconColorWarning: string;
-            iconColorError: string;
-            iconColorLoading: string;
-            closeColorInfo: string;
-            closeColorHoverInfo: string;
-            closeColorPressedInfo: string;
-            closeColorSuccess: string;
-            closeColorHoverSuccess: string;
-            closeColorPressedSuccess: string;
-            closeColorError: string;
-            closeColorHoverError: string;
-            closeColorPressedError: string;
-            closeColorWarning: string;
-            closeColorHoverWarning: string;
-            closeColorPressedWarning: string;
-            closeColorLoading: string;
-            closeColorHoverLoading: string;
-            closeColorPressedLoading: string;
-            loadingColor: string;
-            lineHeight: string;
-            borderRadius: string;
-            margin: string;
-            padding: string;
-            maxWidth: string;
-            minWidth: string;
-            iconMargin: string;
-            closeMargin: string;
-            closeSize: string;
-            iconSize: string;
-            fontSize: string;
-        }, any> | undefined;
-        themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Message", {
-            textColorInfo: string;
-            textColorSuccess: string;
-            textColorError: string;
-            textColorWarning: string;
-            textColorLoading: string;
-            colorInfo: string;
-            colorSuccess: string;
-            colorError: string;
-            colorWarning: string;
-            colorLoading: string;
-            boxShadowInfo: string;
-            boxShadowSuccess: string;
-            boxShadowError: string;
-            boxShadowWarning: string;
-            boxShadowLoading: string;
-            iconColorInfo: string;
-            iconColorSuccess: string;
-            iconColorWarning: string;
-            iconColorError: string;
-            iconColorLoading: string;
-            closeColorInfo: string;
-            closeColorHoverInfo: string;
-            closeColorPressedInfo: string;
-            closeColorSuccess: string;
-            closeColorHoverSuccess: string;
-            closeColorPressedSuccess: string;
-            closeColorError: string;
-            closeColorHoverError: string;
-            closeColorPressedError: string;
-            closeColorWarning: string;
-            closeColorHoverWarning: string;
-            closeColorPressedWarning: string;
-            closeColorLoading: string;
-            closeColorHoverLoading: string;
-            closeColorPressedLoading: string;
-            loadingColor: string;
-            lineHeight: string;
-            borderRadius: string;
-            margin: string;
-            padding: string;
-            maxWidth: string;
-            minWidth: string;
-            iconMargin: string;
-            closeMargin: string;
-            closeSize: string;
-            iconSize: string;
-            fontSize: string;
-        }, any>> | undefined;
-        builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Message", {
-            textColorInfo: string;
-            textColorSuccess: string;
-            textColorError: string;
-            textColorWarning: string;
-            textColorLoading: string;
-            colorInfo: string;
-            colorSuccess: string;
-            colorError: string;
-            colorWarning: string;
-            colorLoading: string;
-            boxShadowInfo: string;
-            boxShadowSuccess: string;
-            boxShadowError: string;
-            boxShadowWarning: string;
-            boxShadowLoading: string;
-            iconColorInfo: string;
-            iconColorSuccess: string;
-            iconColorWarning: string;
-            iconColorError: string;
-            iconColorLoading: string;
-            closeColorInfo: string;
-            closeColorHoverInfo: string;
-            closeColorPressedInfo: string;
-            closeColorSuccess: string;
-            closeColorHoverSuccess: string;
-            closeColorPressedSuccess: string;
-            closeColorError: string;
-            closeColorHoverError: string;
-            closeColorPressedError: string;
-            closeColorWarning: string;
-            closeColorHoverWarning: string;
-            closeColorPressedWarning: string;
-            closeColorLoading: string;
-            closeColorHoverLoading: string;
-            closeColorPressedLoading: string;
-            loadingColor: string;
-            lineHeight: string;
-            borderRadius: string;
-            margin: string;
-            padding: string;
-            maxWidth: string;
-            minWidth: string;
-            iconMargin: string;
-            closeMargin: string;
-            closeSize: string;
-            iconSize: string;
-            fontSize: string;
-        }, any>> | undefined;
-        containerStyle?: string | CSSProperties | undefined;
-    };
+    messageProviderProps: import("./MessageProvider").MessageProviderSetupProps;
     handleClose(): void;
     cssVars: import("vue").ComputedRef<{
         '--n-bezier': string;

package/lib/message/src/Message.js

@@ -10,7 +10,7 @@ const _utils_1 = require("../../_utils");
 const _mixins_1 = require("../../_mixins");
 const styles_1 = require("../styles");
 const message_props_1 = require("./message-props");
-const MessageProvider_1 = require("./MessageProvider");
+const context_1 = require("./context");
 const index_cssr_1 = __importDefault(require("./styles/index.cssr"));
 const iconMap = {
     info: (0, vue_1.h)(icons_1.InfoIcon, null),
@@ -24,8 +24,8 @@ exports.default = (0, vue_1.defineComponent)({
     setup(props) {
         const { props: messageProviderProps, mergedClsPrefixRef
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-         } = (0, vue_1.inject)(MessageProvider_1.messageProviderInjectionKey);
-        const themeRef = (0, _mixins_1.useTheme)('Message', 'Message', index_cssr_1.default, styles_1.messageLight, messageProviderProps, mergedClsPrefixRef);
+         } = (0, vue_1.inject)(context_1.messageProviderInjectionKey);
+        const themeRef = (0, _mixins_1.useTheme)('Message', '-message', index_cssr_1.default, styles_1.messageLight, messageProviderProps, mergedClsPrefixRef);
         return {
             mergedClsPrefix: mergedClsPrefixRef,
             messageProviderProps,