@v-c/menu 1.0.5 → 1.0.7

package/dist/Menu.cjs

@@ -117,7 +117,7 @@ var Menu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots, expose, att
 	});
 	const innerSelectKeys = (0, vue.ref)(props?.selectedKeys ?? props?.defaultSelectedKeys ?? EMPTY_LIST);
 	(0, vue.watch)(() => props.selectedKeys, () => {
-		if (props.selectedKeys) innerSelectKeys.value = props.selectedKeys;
+		innerSelectKeys.value = props.selectedKeys ?? EMPTY_LIST;
 	});
 	const mergedSelectKeys = (0, vue.computed)(() => {
 		const keys = innerSelectKeys.value;
@@ -133,7 +133,7 @@ var Menu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots, expose, att
 			if (props.multiple) if (exist) newSelectKeys = mergedSelectKeys.value.filter((key) => key !== targetKey);
 			else newSelectKeys = [...mergedSelectKeys.value, targetKey];
 			else newSelectKeys = [targetKey];
-			innerSelectKeys.value = newSelectKeys;
+			if (props.selectedKeys === void 0) innerSelectKeys.value = newSelectKeys;
 			const selectInfo = {
 				...info,
 				selectedKeys: newSelectKeys
@@ -255,7 +255,12 @@ var Menu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots, expose, att
 				[`${props.prefixCls || defaults.prefixCls}-rtl`]: isRtl.value
 			}, props.rootClass),
 			"style": _attrs.style,
-			"data": wrappedChildList,
+			"data": wrappedChildList
+		}, {
+			dir: props.direction,
+			role: "menu",
+			tabindex: _attrs.tabindex ?? 0
+		}, {
 			"renderRawItem": (node) => {
 				return node;
 			},

package/dist/Menu.js

@@ -109,7 +109,7 @@ var Menu_default = /* @__PURE__ */ defineComponent((props, { slots, expose, attr
 	});
 	const innerSelectKeys = ref(props?.selectedKeys ?? props?.defaultSelectedKeys ?? EMPTY_LIST);
 	watch(() => props.selectedKeys, () => {
-		if (props.selectedKeys) innerSelectKeys.value = props.selectedKeys;
+		innerSelectKeys.value = props.selectedKeys ?? EMPTY_LIST;
 	});
 	const mergedSelectKeys = computed(() => {
 		const keys = innerSelectKeys.value;
@@ -125,7 +125,7 @@ var Menu_default = /* @__PURE__ */ defineComponent((props, { slots, expose, attr
 			if (props.multiple) if (exist) newSelectKeys = mergedSelectKeys.value.filter((key) => key !== targetKey);
 			else newSelectKeys = [...mergedSelectKeys.value, targetKey];
 			else newSelectKeys = [targetKey];
-			innerSelectKeys.value = newSelectKeys;
+			if (props.selectedKeys === void 0) innerSelectKeys.value = newSelectKeys;
 			const selectInfo = {
 				...info,
 				selectedKeys: newSelectKeys
@@ -247,7 +247,12 @@ var Menu_default = /* @__PURE__ */ defineComponent((props, { slots, expose, attr
 				[`${props.prefixCls || defaults.prefixCls}-rtl`]: isRtl.value
 			}, props.rootClass),
 			"style": _attrs.style,
-			"data": wrappedChildList,
+			"data": wrappedChildList
+		}, {
+			dir: props.direction,
+			role: "menu",
+			tabindex: _attrs.tabindex ?? 0
+		}, {
 			"renderRawItem": (node) => {
 				return node;
 			},

package/dist/SubMenu/index.cjs

@@ -8,8 +8,10 @@ const require_PathContext = require("../context/PathContext.cjs");
 const require_Icon = require("../Icon.cjs");
 const require_IdContext = require("../context/IdContext.cjs");
 const require_PrivateContext = require("../context/PrivateContext.cjs");
+const require_useMemoCallback = require("../hooks/useMemoCallback.cjs");
 const require_useActive = require("../hooks/useActive.cjs");
 const require_useDirectionStyle = require("../hooks/useDirectionStyle.cjs");
+const require_warnUtil = require("../utils/warnUtil.cjs");
 const require_commonUtil = require("../utils/commonUtil.cjs");
 const require_SubMenuList = require("./SubMenuList.cjs");
 const require_InlineSubMenuList = require("./InlineSubMenuList.cjs");
@@ -48,6 +50,7 @@ var InternalSubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots,
 	const subMenuPrefixCls = (0, vue.computed)(() => `${prefixCls.value}-submenu`);
 	const mergedDisabled = (0, vue.computed)(() => !!(contextDisabled.value || props?.disabled));
 	if (process.env.NODE_ENV !== "production" && props?.warnKey) (0, _v_c_util_dist_warning.default)(false, "SubMenu should not leave undefined `key`.");
+	const mergedItemIcon = (0, vue.computed)(() => props?.itemIcon ?? menuContext?.value?.itemIcon);
 	const mergedExpandIcon = (0, vue.computed)(() => props?.expandIcon ?? contextExpandIcon.value);
 	const originOpen = (0, vue.computed)(() => {
 		const key = props?.eventKey;
@@ -96,6 +99,10 @@ var InternalSubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots,
 		});
 		if (mode.value === "inline" && key) onOpenChange(key, !originOpen.value);
 	};
+	const onMergedItemClick = require_useMemoCallback.default((info) => {
+		props?.onClick?.(require_warnUtil.warnItemProp(info));
+		menuContext?.value?.onItemClick?.(info);
+	});
 	const onPopupVisibleChange = (newVisible) => {
 		const key = props?.eventKey;
 		if (mode.value !== "inline" && key) onOpenChange(key, newVisible);
@@ -193,7 +200,14 @@ var InternalSubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots,
 			open: open.value,
 			disabled: mergedDisabled.value
 		});
-		return listNode;
+		return (0, vue.createVNode)(require_MenuContext.default, {
+			"classes": classes,
+			"styles": styles,
+			"onItemClick": onMergedItemClick,
+			"mode": mode.value === "horizontal" ? "vertical" : mode.value,
+			"itemIcon": mergedItemIcon.value,
+			"expandIcon": mergedExpandIcon.value
+		}, _isSlot(listNode) ? listNode : { default: () => [listNode] });
 	};
 }, {
 	props: {
@@ -235,11 +249,6 @@ var InternalSubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots,
 			required: false,
 			default: void 0
 		},
-		popupRender: {
-			type: Function,
-			required: false,
-			default: void 0
-		},
 		type: {
 			type: String,
 			required: false,
@@ -306,6 +315,11 @@ var InternalSubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots,
 			required: false,
 			default: void 0
 		},
+		popupRender: {
+			type: Function,
+			required: false,
+			default: void 0
+		},
 		onClick: {
 			type: Function,
 			required: false,
@@ -399,11 +413,6 @@ var SubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots }) => {
 			required: false,
 			default: void 0
 		},
-		popupRender: {
-			type: Function,
-			required: false,
-			default: void 0
-		},
 		type: {
 			type: String,
 			required: false,
@@ -470,6 +479,11 @@ var SubMenu = /* @__PURE__ */ (0, vue.defineComponent)((props, { slots }) => {
 			required: false,
 			default: void 0
 		},
+		popupRender: {
+			type: Function,
+			required: false,
+			default: void 0
+		},
 		onClick: {
 			type: Function,
 			required: false,

package/dist/SubMenu/index.d.ts

@@ -1,6 +1,6 @@
+import { SubMenuType } from '../interface';
 import { VueNode } from '@v-c/util/dist/type';
 import { CSSProperties } from 'vue';
-import { PopupRender, SubMenuType } from '../interface';
 export type SemanticName = 'list' | 'listTitle';
 export interface SubMenuProps extends Omit<SubMenuType, 'key' | 'children' | 'label'> {
     classes?: Partial<Record<SemanticName, string>>;
@@ -12,7 +12,6 @@ export interface SubMenuProps extends Omit<SubMenuType, 'key' | 'children' | 'la
     eventKey?: string;
     /** @private Do not use. Private warning empty usage */
     warnKey?: boolean;
-    popupRender?: PopupRender;
 }
 declare const SubMenu: import('vue').DefineSetupFnComponent<SubMenuProps, {}, {}, SubMenuProps & {}, import('vue').PublicProps>;
 export default SubMenu;

package/dist/SubMenu/index.js

@@ -3,8 +3,10 @@ import { PathTrackerContext, useFullPath, useMeasure, usePathUserContext } from
 import Icon_default from "../Icon.js";
 import { useMenuId } from "../context/IdContext.js";
 import { usePrivateContext } from "../context/PrivateContext.js";
+import useMemoCallback from "../hooks/useMemoCallback.js";
 import useActive from "../hooks/useActive.js";
 import useDirectionStyle from "../hooks/useDirectionStyle.js";
+import { warnItemProp } from "../utils/warnUtil.js";
 import { parseChildren } from "../utils/commonUtil.js";
 import SubMenuList_default from "./SubMenuList.js";
 import InlineSubMenuList_default from "./InlineSubMenuList.js";
@@ -41,6 +43,7 @@ var InternalSubMenu = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 	const subMenuPrefixCls = computed(() => `${prefixCls.value}-submenu`);
 	const mergedDisabled = computed(() => !!(contextDisabled.value || props?.disabled));
 	if (process.env.NODE_ENV !== "production" && props?.warnKey) warning$1(false, "SubMenu should not leave undefined `key`.");
+	const mergedItemIcon = computed(() => props?.itemIcon ?? menuContext?.value?.itemIcon);
 	const mergedExpandIcon = computed(() => props?.expandIcon ?? contextExpandIcon.value);
 	const originOpen = computed(() => {
 		const key = props?.eventKey;
@@ -89,6 +92,10 @@ var InternalSubMenu = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 		});
 		if (mode.value === "inline" && key) onOpenChange(key, !originOpen.value);
 	};
+	const onMergedItemClick = useMemoCallback((info) => {
+		props?.onClick?.(warnItemProp(info));
+		menuContext?.value?.onItemClick?.(info);
+	});
 	const onPopupVisibleChange = (newVisible) => {
 		const key = props?.eventKey;
 		if (mode.value !== "inline" && key) onOpenChange(key, newVisible);
@@ -186,7 +193,14 @@ var InternalSubMenu = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 			open: open.value,
 			disabled: mergedDisabled.value
 		});
-		return listNode;
+		return createVNode(MenuContext_default, {
+			"classes": classes,
+			"styles": styles,
+			"onItemClick": onMergedItemClick,
+			"mode": mode.value === "horizontal" ? "vertical" : mode.value,
+			"itemIcon": mergedItemIcon.value,
+			"expandIcon": mergedExpandIcon.value
+		}, _isSlot(listNode) ? listNode : { default: () => [listNode] });
 	};
 }, {
 	props: {
@@ -228,11 +242,6 @@ var InternalSubMenu = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 			required: false,
 			default: void 0
 		},
-		popupRender: {
-			type: Function,
-			required: false,
-			default: void 0
-		},
 		type: {
 			type: String,
 			required: false,
@@ -299,6 +308,11 @@ var InternalSubMenu = /* @__PURE__ */ defineComponent((props, { slots, attrs })
 			required: false,
 			default: void 0
 		},
+		popupRender: {
+			type: Function,
+			required: false,
+			default: void 0
+		},
 		onClick: {
 			type: Function,
 			required: false,
@@ -392,11 +406,6 @@ var SubMenu_default = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			required: false,
 			default: void 0
 		},
-		popupRender: {
-			type: Function,
-			required: false,
-			default: void 0
-		},
 		type: {
 			type: String,
 			required: false,
@@ -463,6 +472,11 @@ var SubMenu_default = /* @__PURE__ */ defineComponent((props, { slots }) => {
 			required: false,
 			default: void 0
 		},
+		popupRender: {
+			type: Function,
+			required: false,
+			default: void 0
+		},
 		onClick: {
 			type: Function,
 			required: false,

package/dist/context/MenuContext.cjs

@@ -11,7 +11,7 @@ function mergeProps(origin, target) {
 	const clone = { ...origin };
 	Object.keys(target).forEach((key) => {
 		const value = target[key];
-		if (value !== void 0) target[key] = value;
+		if (value !== void 0) clone[key] = value;
 	});
 	return clone;
 }

package/dist/context/MenuContext.js

@@ -5,7 +5,7 @@ function mergeProps$1(origin, target) {
 	const clone = { ...origin };
 	Object.keys(target).forEach((key) => {
 		const value = target[key];
-		if (value !== void 0) target[key] = value;
+		if (value !== void 0) clone[key] = value;
 	});
 	return clone;
 }

package/dist/interface.d.ts

@@ -19,6 +19,7 @@ export interface SubMenuType extends ItemSharedProps {
     popupClassName?: string;
     popupOffset?: number[];
     popupStyle?: CSSProperties;
+    popupRender?: PopupRender;
     onClick?: MenuClickEventHandler;
     onTitleClick?: (info: MenuTitleInfo) => void;
     onTitleMouseEnter?: MenuHoverEventHandler;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/menu",
   "type": "module",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "menu ui component for vue",
   "exports": {
     ".": {
@@ -25,9 +25,9 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@v-c/overflow": "^1.0.1",
-    "@v-c/util": "^1.0.6",
-    "@v-c/trigger": "^1.0.2"
+    "@v-c/overflow": "^1.0.3",
+    "@v-c/trigger": "^1.0.6",
+    "@v-c/util": "^1.0.9"
   },
   "scripts": {
     "build": "vite build",