From 3410434e4d942c35040d5255c00ecd95a3436549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albert=20Geant=C4=83?= Date: Sun, 11 Dec 2022 18:22:26 +0200 Subject: [PATCH] fix(menu): can't override submenu dropdown's `trigger` by `dropdown-props`(#4148) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix dropdown trigger getting overriden in NMenu * Add changelog entry Co-authored-by: Albert Geantă Co-authored-by: 07akioni <07akioni2@gmail.com> --- CHANGELOG.en-US.md | 5 +++-- CHANGELOG.zh-CN.md | 1 + src/menu/src/Submenu.tsx | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index f9a43ed6bf4..8db03ceb98b 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -9,8 +9,9 @@ ### Fixes -- Fix 'n-image' preview toolbar error, close [#4157](https://github.com/tusen-ai/naive-ui/issues/4157). -- Fix 'n-tree' cannot access 'mergedFilterRef' before initialization error, close [#4134](https://github.com/tusen-ai/naive-ui/issues/4134). +- Fix `n-image` preview toolbar error, closes [#4157](https://github.com/tusen-ai/naive-ui/issues/4157). +- Fix `n-tree` cannot access `mergedFilterRef` before initialization error, closes [#4134](https://github.com/tusen-ai/naive-ui/issues/4134). +- Fix `n-menu` can't override submenu dropdown's `trigger` by `dropdown-props`, closes [#4147](https://github.com/tusen-ai/naive-ui/issues/4147). ## 2.34.2 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index b4ced6c464e..1ff4d92c146 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -11,6 +11,7 @@ - 修复 `n-image` 的预览工具栏报错,关闭 [#4157](https://github.com/tusen-ai/naive-ui/issues/4157) - 修复 `n-tree` 的`cannot access 'mergedFilterRef' before initialization`报错,关闭 [#4134](https://github.com/tusen-ai/naive-ui/issues/4134) +- 修复 `n-menu` 无法通过 `dropdown-props` 覆盖子菜单 dropdown 的 `trigger`,关闭 [#4147](https://github.com/tusen-ai/naive-ui/issues/4147) ## 2.34.2 diff --git a/src/menu/src/Submenu.tsx b/src/menu/src/Submenu.tsx index d31f9dc2d33..10d81f4ad47 100644 --- a/src/menu/src/Submenu.tsx +++ b/src/menu/src/Submenu.tsx @@ -179,6 +179,7 @@ export const NSubmenu = defineComponent({ return this.root ? (