mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-11-21 01:13:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(menu): resolve overflow issue with n-menu root-indent (#5616) (#5618)

Browse Source 
* fix(menu): resolve overflow issue with `n-menu` `root-indent` (#5616)

* chore: add comment

* Update src/menu/demos/zhCN/indent.demo.vue

---------

Co-authored-by: 07akioni <07akioni2@gmail.com>
This commit is contained in:
Kirk Lin 2024-01-23 18:54:26 +08:00 committed by GitHub
parent fce7b64ead
commit 558c4b4101
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.en-US.md
View File

@ -5,6 +5,7 @@
### Fixes ### Fixes
- Fix `n-tree`'s `override-default-node-click-behavior` prop may conflict with default switcher click or checkbox click behavior. - Fix `n-tree`'s `override-default-node-click-behavior` prop may conflict with default switcher click or checkbox click behavior.
- Fix overflow issue with `n-menu` `root-indent` `indent`, closes (#5616)
## 2.37.3 ## 2.37.3

1
CHANGELOG.zh-CN.md
View File

@ -5,6 +5,7 @@
### Fixes ### Fixes
- 修复 `n-tree` 的 `override-default-node-click-behavior` 属性可能覆盖掉默认展开按钮和选中按钮的行为 - 修复 `n-tree` 的 `override-default-node-click-behavior` 属性可能覆盖掉默认展开按钮和选中按钮的行为
- 修复 `n-menu` `root-indent` `indent` 下内容溢出的问题，关闭(#5616)
## 2.37.3 ## 2.37.3

7
src/menu/src/use-menu-child.ts
View File

@ -81,8 +81,11 @@ export function useMenuChild (props: UseMenuChildProps): UseMenuChild {
}) })
const paddingLeftRef = computed(() => { const paddingLeftRef = computed(() => {
if (horizontalRef.value) return undefined if (horizontalRef.value) return undefined
const { collapsedWidth, indent, rootIndent } = menuProps const { collapsedWidth, indent: propsIdent, rootIndent: propsRootIdent } = menuProps
const { root, isGroup } = props const { root, isGroup } = props
// Fix overflow issue with `n-menu` `root-indent` `indent`, closes (#5616)
const indent = propsIdent + 8
const rootIndent = propsRootIdent === undefined ? undefined : propsRootIdent + 8
const mergedRootIndent = rootIndent === undefined ? indent : rootIndent const mergedRootIndent = rootIndent === undefined ? indent : rootIndent
if (root) { if (root) {
if (mergedCollapsedRef.value) { if (mergedCollapsedRef.value) {
@ -99,7 +102,7 @@ export function useMenuChild (props: UseMenuChildProps): UseMenuChild {
if (NSubmenu && typeof NSubmenu.paddingLeftRef.value === 'number') { if (NSubmenu && typeof NSubmenu.paddingLeftRef.value === 'number') {
return (isGroup ? indent / 2 : indent) + NSubmenu.paddingLeftRef.value return (isGroup ? indent / 2 : indent) + NSubmenu.paddingLeftRef.value
} }
return 0 return 8
}) })
const iconMarginRightRef = computed(() => { const iconMarginRightRef = computed(() => {
const { collapsedWidth, indent, rootIndent } = menuProps const { collapsedWidth, indent, rootIndent } = menuProps