naive-ui 2.24.4 → 2.25.0

package/es/loading-bar/src/LoadingBarProvider.js

@@ -2,15 +2,13 @@ import { Fragment, h, ref, Teleport, defineComponent, provide, nextTick } from '
 import { useIsMounted } from 'vooks';
 import { useConfig, useTheme } from '../../_mixins';
 import NLoadingBar from './LoadingBar';
-import { createInjectionKey } from '../../_utils';
+import { loadingBarApiInjectionKey, loadingBarProviderInjectionKey } from './context';
 const loadingBarProps = Object.assign(Object.assign({}, useTheme.props), { to: {
         type: [String, Object],
         default: undefined
     }, loadingBarStyle: {
         type: Object
     } });
-export const loadingBarProviderInjectionKey = createInjectionKey('n-loading-bar');
-export const loadingBarApiInjectionKey = createInjectionKey('n-loading-bar-api');
 export default defineComponent({
     name: 'LoadingBarProvider',
     props: loadingBarProps,

package/es/loading-bar/src/context.d.ts

@@ -0,0 +1,7 @@
+import { Ref } from 'vue';
+import type { LoadingBarProviderSetupProps } from './LoadingBarProvider';
+export declare const loadingBarProviderInjectionKey: import("vue").InjectionKey<{
+    props: LoadingBarProviderSetupProps;
+    mergedClsPrefixRef: Ref<string>;
+}>;
+export declare const loadingBarApiInjectionKey: import("vue").InjectionKey<import("./LoadingBarProvider").LoadingBarInst>;

package/es/loading-bar/src/context.js

@@ -0,0 +1,3 @@
+import { createInjectionKey } from '../../_utils';
+export const loadingBarProviderInjectionKey = createInjectionKey('n-loading-bar');
+export const loadingBarApiInjectionKey = createInjectionKey('n-loading-bar-api');

package/es/loading-bar/src/use-loading-bar.js

@@ -1,5 +1,5 @@
 import { inject } from 'vue';
-import { loadingBarApiInjectionKey } from './LoadingBarProvider';
+import { loadingBarApiInjectionKey } from './context';
 import { throwError } from '../../_utils';
 export function useLoadingBar() {
     const loadingBar = inject(loadingBarApiInjectionKey, null);

package/es/locales/common/jaJP.js

@@ -1,8 +1,8 @@
 const jaJP = {
     name: 'ja-JP',
     global: {
-        undo: 'undo',
-        redo: 'redo',
+        undo: '元に戻す',
+        redo: 'やり直す',
         confirm: 'OK'
     },
     Popconfirm: {
@@ -35,9 +35,8 @@ const jaJP = {
         datePlaceholder: '日付を選択',
         datetimePlaceholder: '選択',
         monthPlaceholder: '月を選択',
-        // FIXME: translation needed
-        yearPlaceholder: 'Select Year',
-        quarterPlaceholder: 'Select Quarter',
+        yearPlaceholder: '年を選択',
+        quarterPlaceholder: '四半期を選択',
         startDatePlaceholder: '開始日',
         endDatePlaceholder: '終了日',
         startDatetimePlaceholder: '開始時間',
@@ -69,7 +68,7 @@ const jaJP = {
         now: '現在'
     },
     Pagination: {
-        goto: '',
+        goto: 'ページジャンプ',
         selectionSuffix: 'ページ'
     },
     DynamicTags: {
@@ -97,15 +96,14 @@ const jaJP = {
         export: 'エクスポート',
         restore: 'デフォルト'
     },
-    // TODO: translation
     Image: {
-        tipPrevious: 'Previous picture (←)',
-        tipNext: 'Next picture (→)',
-        tipCounterclockwise: 'Counterclockwise',
-        tipClockwise: 'Clockwise',
-        tipZoomOut: 'Zoom out',
-        tipZoomIn: 'Zoom in',
-        tipClose: 'Close (Esc)'
+        tipPrevious: '前の画像 (←)',
+        tipNext: '次の画像 (→)',
+        tipCounterclockwise: '左に回転',
+        tipClockwise: '右に回転',
+        tipZoomOut: '縮小',
+        tipZoomIn: '拡大',
+        tipClose: '閉じる (Esc)'
     }
 };
 export default jaJP;

package/es/log/index.d.ts

@@ -1,2 +1,2 @@
 export { default as NLog } from './src/Log';
-export type { LogProps } from './src/Log';
+export type { LogProps, LogInst } from './src/Log';

package/es/log/src/Log.d.ts

@@ -1,14 +1,22 @@
 /// <reference types="lodash" />
 import { PropType, Ref } from 'vue';
 import type { Hljs } from '../../_mixins';
-import { ExtractPublicPropTypes } from '../../_utils';
+import type { ExtractPublicPropTypes } from '../../_utils';
 export interface LogInjection {
     trimRef: Ref<boolean>;
     languageRef: Ref<string | undefined>;
     highlightRef: Ref<boolean>;
     mergedHljsRef: Ref<Hljs | undefined>;
 }
-export declare const logInjectionKey: import("vue").InjectionKey<LogInjection>;
+export interface LogInst {
+    scrollTo: ((options: {
+        slient?: boolean;
+        position: 'top' | 'bottom';
+    }) => void) & ((options: {
+        slient?: boolean;
+        top: number;
+    }) => void);
+}
 declare const logProps: {
     readonly loading: BooleanConstructor;
     readonly trim: BooleanConstructor;
@@ -391,16 +399,6 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     styleHeight: import("vue").ComputedRef<string>;
     mergedLines: import("vue").ComputedRef<string[]>;
-    scrollTo: {
-        (options: {
-            slient?: boolean;
-            position: 'top' | 'bottom';
-        }): void;
-        (options: {
-            slient?: boolean;
-            top: number;
-        }): void;
-    };
     scrollToTop: (slient?: boolean) => void;
     scrollToBottom: (slient?: boolean) => void;
     handleWheel: import("lodash").DebouncedFunc<(e: WheelEvent) => void>;
@@ -413,6 +411,13 @@ declare const _default: import("vue").DefineComponent<{
         '--n-loader-text-color': string;
         '--n-loading-color': string;
     }>;
+    scrollTo: ((options: {
+        slient?: boolean | undefined;
+        position: "bottom" | "top";
+    }) => void) & ((options: {
+        slient?: boolean | undefined;
+        top: number;
+    }) => 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<{
     readonly loading: BooleanConstructor;
     readonly trim: BooleanConstructor;

package/es/log/src/Log.js

@@ -1,14 +1,14 @@
 import { h, Transition, defineComponent, computed, provide, nextTick, ref, toRef } from 'vue';
 import { throttle } from 'lodash-es';
 import { useTheme, useHljs, useConfig } from '../../_mixins';
-import { createInjectionKey, warn } from '../../_utils';
+import { warn } from '../../_utils';
 import { NScrollbar } from '../../_internal';
 import { NCode } from '../../code';
 import { logLight } from '../styles';
 import NLogLoader from './LogLoader';
 import NLogLine from './LogLine';
+import { logInjectionKey } from './context';
 import style from './styles/index.cssr';
-export const logInjectionKey = createInjectionKey('n-log');
 const logProps = Object.assign(Object.assign({}, useTheme.props), { loading: Boolean, trim: Boolean, log: String, fontSize: {
         type: Number,
         default: 14
@@ -38,8 +38,7 @@ export default defineComponent({
             return props.language !== undefined;
         });
         const styleHeightRef = computed(() => {
-            const lineHeight = Math.floor(props.fontSize * props.lineHeight);
-            return `calc(${props.rows * lineHeight}px)`;
+            return `calc(${Math.round(props.rows * props.lineHeight * props.fontSize)}px)`;
         });
         const mergedLinesRef = computed(() => {
             const { log } = props;
@@ -49,7 +48,7 @@ export default defineComponent({
             return props.lines;
         });
         const scrollbarRef = ref(null);
-        const themeRef = useTheme('Log', 'Log', style, logLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Log', '-log', style, logLight, props, mergedClsPrefixRef);
         function handleScroll(e) {
             const container = e.target;
             const content = container.firstElementChild;
@@ -145,18 +144,13 @@ export default defineComponent({
             trimRef: toRef(props, 'trim'),
             highlightRef
         });
-        return {
-            mergedClsPrefix: mergedClsPrefixRef,
-            scrollbarRef,
-            mergedTheme: themeRef,
-            styleHeight: styleHeightRef,
-            mergedLines: mergedLinesRef,
-            scrollTo,
-            scrollToTop,
+        const exportedMethods = {
+            scrollTo
+        };
+        return Object.assign(Object.assign({}, exportedMethods), { mergedClsPrefix: mergedClsPrefixRef, scrollbarRef, mergedTheme: themeRef, styleHeight: styleHeightRef, mergedLines: mergedLinesRef, scrollToTop,
             scrollToBottom,
             handleWheel,
-            handleScroll,
-            cssVars: computed(() => {
+            handleScroll, cssVars: computed(() => {
                 const { self: { loaderFontSize, loaderTextColor, loaderColor, loaderBorder, loadingColor }, common: { cubicBezierEaseInOut } } = themeRef.value;
                 return {
                     '--n-bezier': cubicBezierEaseInOut,
@@ -166,8 +160,7 @@ export default defineComponent({
                     '--n-loader-text-color': loaderTextColor,
                     '--n-loading-color': loadingColor
                 };
-            })
-        };
+            }) });
     },
     render() {
         const { mergedClsPrefix, mergedTheme } = this;

package/es/log/src/LogLine.js

@@ -1,5 +1,5 @@
 import { h, defineComponent, inject, ref, onMounted, watch, toRef, computed } from 'vue';
-import { logInjectionKey } from './Log';
+import { logInjectionKey } from './context';
 export default defineComponent({
     props: {
         line: {

package/es/log/src/context.d.ts

@@ -0,0 +1,2 @@
+import type { LogInjection } from './Log';
+export declare const logInjectionKey: import("vue").InjectionKey<LogInjection>;

package/es/log/src/context.js

@@ -0,0 +1,2 @@
+import { createInjectionKey } from '../../_utils';
+export const logInjectionKey = createInjectionKey('n-log');

package/es/log/src/styles/index.cssr.js

@@ -12,10 +12,9 @@ export default cB('log', `
  position: relative;
  box-sizing: border-box;
  transition: border-color .3s var(--n-bezier);
-`, [cE('lines', `
- margin: 0;
+`, [c('pre', `
  white-space: pre-wrap;
- `), c('pre', `
+ word-break: break-word;
  margin: 0;
  `), cB('log-loader', `
  transition:

package/es/mention/src/Mention.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
 import { TreeNode } from 'treemate';
+import { FollowerPlacement } from 'vueuc';
 import { RenderLabel } from '../../_internal/select-menu/src/interface';
 import type { Size as InputSize } from '../../input/src/interface';
 import type { SelectBaseOption, SelectGroupOption, SelectIgnoredOption } from '../../select/src/interface';
@@ -46,6 +47,10 @@ declare const mentionProps: {
         readonly type: StringConstructor;
         readonly default: "";
     };
+    readonly placement: {
+        readonly type: PropType<FollowerPlacement>;
+        readonly default: "bottom-start";
+    };
     readonly size: PropType<InputSize>;
     readonly 'onUpdate:value': PropType<MaybeArray<(value: string) => void>>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -446,6 +451,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: StringConstructor;
         readonly default: "";
     };
+    readonly placement: {
+        readonly type: PropType<FollowerPlacement>;
+        readonly default: "bottom-start";
+    };
     readonly size: PropType<InputSize>;
     readonly 'onUpdate:value': PropType<MaybeArray<(value: string) => void>>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -808,6 +817,7 @@ declare const _default: import("vue").DefineComponent<{
     mergedClsPrefix: import("vue").ComputedRef<string>;
     mergedBordered: import("vue").ComputedRef<boolean>;
     mergedSize: import("vue").ComputedRef<"small" | "medium" | "large" | "tiny">;
+    mergedStatus: import("vue").ComputedRef<import("../../form/src/interface").FormValidationStatus | undefined>;
     mergedTheme: import("vue").ComputedRef<{
         common: {
             baseColor: string;
@@ -1136,6 +1146,10 @@ declare const _default: import("vue").DefineComponent<{
         readonly type: StringConstructor;
         readonly default: "";
     };
+    readonly placement: {
+        readonly type: PropType<FollowerPlacement>;
+        readonly default: "bottom-start";
+    };
     readonly size: PropType<InputSize>;
     readonly 'onUpdate:value': PropType<MaybeArray<(value: string) => void>>;
     readonly renderLabel: PropType<RenderLabel>;
@@ -1500,9 +1514,10 @@ declare const _default: import("vue").DefineComponent<{
     disabled: boolean;
     placeholder: string;
     to: string | boolean | HTMLElement;
-    loading: boolean;
-    bordered: boolean | undefined;
     options: MentionOption[];
+    bordered: boolean | undefined;
+    loading: boolean;
+    placement: FollowerPlacement;
     defaultValue: string;
     internalDebug: boolean;
 }>;

package/es/mention/src/Mention.js

@@ -38,6 +38,9 @@ const mentionProps = Object.assign(Object.assign({}, useTheme.props), { to: useA
     }, 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 });
@@ -46,7 +49,7 @@ export default defineComponent({
     props: mentionProps,
     setup(props) {
         const { namespaceRef, mergedClsPrefixRef, mergedBorderedRef } = useConfig(props);
-        const themeRef = useTheme('Mention', 'Mention', style, mentionLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Mention', '-mention', style, mentionLight, props, mergedClsPrefixRef);
         const formItem = useFormItem(props);
         const inputInstRef = ref(null);
         const cursorRef = ref(null);
@@ -279,6 +282,7 @@ export default defineComponent({
             mergedClsPrefix: mergedClsPrefixRef,
             mergedBordered: mergedBorderedRef,
             mergedSize: formItem.mergedSizeRef,
+            mergedStatus: formItem.mergedStatusRef,
             mergedTheme: themeRef,
             treeMate: treeMateRef,
             selectMenuInstRef,
@@ -308,7 +312,7 @@ export default defineComponent({
     render() {
         const { mergedTheme, mergedClsPrefix, $slots } = this;
         return (h("div", { class: `${mergedClsPrefix}-mention` },
-            h(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 }),
+            h(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 }),
             h(VBinder, null, {
                 default: () => [
                     h(VTarget, null, {
@@ -326,7 +330,7 @@ export default defineComponent({
                             return h("div", { style: style, ref: "cursorRef" });
                         }
                     }),
-                    h(VFollower, { ref: "followerRef", placement: "bottom-start", show: this.showMenu, containerClass: this.namespace, to: this.adjustedTo, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey }, {
+                    h(VFollower, { ref: "followerRef", placement: this.placement, show: this.showMenu, containerClass: this.namespace, to: this.adjustedTo, teleportDisabled: this.adjustedTo === useAdjustedTo.tdkey }, {
                         default: () => (h(Transition, { name: "fade-in-scale-up-transition", appear: this.isMounted }, {
                             default: () => {
                                 const { mergedTheme } = this;

package/es/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;
+    options: MenuMixedOption[];
     keyField: string;
     iconSize: number;
-    options: MenuMixedOption[];
     defaultValue: Key | null;
     indent: number;
     labelField: string;

package/es/menu/src/Menu.js

@@ -2,12 +2,13 @@ import { h, ref, toRef, computed, defineComponent, provide, inject, watchEffect
 import { createTreeMate } from 'treemate';
 import { useCompitable, useMergedState } from 'vooks';
 import { useConfig, useTheme } from '../../_mixins';
-import { call, createInjectionKey } from '../../_utils';
+import { call } from '../../_utils';
 import { itemRenderer } from './utils';
 import { menuLight } from '../styles';
 import style from './styles/index.cssr';
 import { layoutSiderInjectionKey } from '../../layout/src/interface';
 import { useCheckDeprecated } from './useCheckDeprecated';
+import { menuInjectionKey } from './context';
 const menuProps = Object.assign(Object.assign({}, useTheme.props), { options: {
         type: Array,
         default: () => []
@@ -52,7 +53,6 @@ const menuProps = Object.assign(Object.assign({}, useTheme.props), { options: {
     }, dropdownProps: Object, accordion: Boolean, 
     // deprecated
     items: Array, onOpenNamesChange: [Function, Array], onSelect: [Function, Array], onExpandedNamesChange: [Function, Array], expandedNames: Array, defaultExpandedNames: Array });
-export const menuInjectionKey = createInjectionKey('n-menu');
 export default defineComponent({
     name: 'Menu',
     props: menuProps,
@@ -61,7 +61,7 @@ export default defineComponent({
             useCheckDeprecated(props);
         }
         const { mergedClsPrefixRef } = useConfig(props);
-        const themeRef = useTheme('Menu', 'Menu', style, menuLight, props, mergedClsPrefixRef);
+        const themeRef = useTheme('Menu', '-menu', style, menuLight, props, mergedClsPrefixRef);
         const layoutSider = inject(layoutSiderInjectionKey, null);
         const mergedCollapsedRef = computed(() => {
             var _a;

package/es/menu/src/MenuDivider.js

@@ -1,5 +1,5 @@
 import { h, defineComponent, inject } from 'vue';
-import { menuInjectionKey } from './Menu';
+import { menuInjectionKey } from './context';
 export default defineComponent({
     name: 'MenuDivider',
     setup() {

package/es/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/es/menu/src/MenuOption.js

@@ -9,7 +9,7 @@ export const menuItemProps = Object.assign(Object.assign({}, useMenuChildProps),
         type: Object,
         required: true
     }, disabled: Boolean, icon: Function, onClick: Function });
-export default defineComponent({
+export const NMenuOption = defineComponent({
     name: 'MenuOption',
     props: menuItemProps,
     setup(props) {

package/es/menu/src/MenuOptionContent.js

@@ -2,7 +2,7 @@ import { computed, defineComponent, h, inject } from 'vue';
 import { ChevronDownFilledIcon } from '../../_internal/icons';
 import { render } from '../../_utils';
 import { NBaseIcon } from '../../_internal';
-import { menuInjectionKey } from './Menu';
+import { menuInjectionKey } from './context';
 export default defineComponent({
     name: 'MenuOptionContent',
     props: {

package/es/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/es/menu/src/MenuOptionGroup.js

@@ -1,16 +1,15 @@
 import { h, defineComponent, provide, Fragment, inject } from 'vue';
-import { createInjectionKey, render } from '../../_utils';
+import { render } from '../../_utils';
 import { useMenuChild } from './use-menu-child';
 import { useMenuChildProps } from './use-menu-child-props';
+// eslint-disable-next-line import/no-cycle
 import { itemRenderer } from './utils';
-import { submenuInjectionKey } from './Submenu';
-import { menuInjectionKey } from './Menu';
+import { submenuInjectionKey, menuInjectionKey, menuItemGroupInjectionKey } from './context';
 export const menuItemGroupProps = Object.assign(Object.assign({}, useMenuChildProps), { tmNodes: {
         type: Array,
         required: true
     } });
-export const menuItemGroupInjectionKey = createInjectionKey('n-menu-item-group');
-export default defineComponent({
+export const NMenuOptionGroup = defineComponent({
     name: 'MenuOptionGroup',
     props: menuItemGroupProps,
     setup(props) {

package/es/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/es/menu/src/Submenu.js

@@ -3,11 +3,11 @@ import { useMemo } from 'vooks';
 import { NFadeInExpandTransition } from '../../_internal';
 import { NDropdown } from '../../dropdown';
 import NMenuOptionContent from './MenuOptionContent';
+// eslint-disable-next-line import/no-cycle
 import { itemRenderer } from './utils';
 import { useMenuChild } from './use-menu-child';
 import { useMenuChildProps } from './use-menu-child-props';
-import { menuItemGroupInjectionKey } from './MenuOptionGroup';
-import { createInjectionKey } from '../../_utils';
+import { menuItemGroupInjectionKey, submenuInjectionKey } from './context';
 export const submenuProps = Object.assign(Object.assign({}, useMenuChildProps), { rawNodes: {
         type: Array,
         default: () => []
@@ -21,8 +21,7 @@ export const submenuProps = Object.assign(Object.assign({}, useMenuChildProps),
         type: Boolean,
         default: false
     }, icon: Function, onClick: Function });
-export const submenuInjectionKey = createInjectionKey('n-submenu');
-export default defineComponent({
+export const NSubmenu = defineComponent({
     name: 'Submenu',
     props: submenuProps,
     setup(props) {

package/es/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/es/menu/src/context.js

@@ -0,0 +1,4 @@
+import { createInjectionKey } from '../../_utils';
+export const menuInjectionKey = createInjectionKey('n-menu');
+export const submenuInjectionKey = createInjectionKey('n-submenu');
+export const menuItemGroupInjectionKey = createInjectionKey('n-menu-item-group');

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

@@ -1,7 +1,5 @@
 import { inject, computed } from 'vue';
-import { menuInjectionKey } from './Menu';
-import { menuItemGroupInjectionKey } from './MenuOptionGroup';
-import { submenuInjectionKey } from './Submenu';
+import { menuInjectionKey, submenuInjectionKey, menuItemGroupInjectionKey } from './context';
 const ICON_MARGIN_RIGHT = 8;
 export function useMenuChild(props) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

package/es/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/es/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/es/menu/src/utils.js

@@ -1,8 +1,10 @@
 import { h } from 'vue';
 import { keep, keysOf } from '../../_utils';
-import NMenuOptionGroup, { menuItemGroupProps } from './MenuOptionGroup';
-import NSubmenu, { submenuProps } from './Submenu';
-import NMenuOption, { menuItemProps } from './MenuOption';
+// eslint-disable-next-line import/no-cycle
+import { NMenuOptionGroup, menuItemGroupProps } from './MenuOptionGroup';
+// eslint-disable-next-line import/no-cycle
+import { NSubmenu, submenuProps } from './Submenu';
+import { NMenuOption, menuItemProps } from './MenuOption';
 import NMenuDivider from './MenuDivider';
 const groupPropKeys = keysOf(menuItemGroupProps);
 const itemPropKeys = keysOf(menuItemProps);