From f42b5a05a1bbb7cb2e33ead50be80f7e22964d78 Mon Sep 17 00:00:00 2001
From: lijiaheng <lijiaheng@semi-tech.com>
Date: Thu, 13 Jul 2023 16:45:51 +0800
Subject: [PATCH] fix(n-tree): the style of the selected node is not displayed
in the case of 'disabled
---
CHANGELOG.en-US.md | 1 +
CHANGELOG.zh-CN.md | 1 +
src/tree/src/styles/index.cssr.ts | 10 +++++-----
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 7b5965f3e9a..32e139de9ff 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -31,6 +31,7 @@
- Fix `n-grid` v-show reports errors when switching multiple times, closes [#4422](https://github.com/tusen-ai/naive-ui/issues/4422).
- Fix `n-tree`'s `TreeOption`'s `checkboxDisabled` prop doesn't work when `check-on-click` is `true`.
- Fix rapid clicks on `n-date-input`'s buttons triggering a text select for the rest of the website.
+- Fix `n-tree` The style of the selected node is not displayed in the case of 'disabled'.
### Features
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 95d3527e736..e2834ba0ba1 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -31,6 +31,7 @@
- 修复 `n-form-item-gi` v-show 多次切换报错，关闭 [#4422](https://github.com/tusen-ai/naive-ui/issues/4422)
- 修复 `n-tree` `check-on-click` 为 `true` 时，`TreeOption` `checkboxDisabled` 不生效
- 修复 `n-date-input` 的按钮快速点击时网站其余文本会被选中
+- 修复 `n-tree` 在 `disabled` 的情况下不显示选中节点的样式
### Features
diff --git a/src/tree/src/styles/index.cssr.ts b/src/tree/src/styles/index.cssr.ts
index d085aff153b..3c0017dfdea 100644
--- a/src/tree/src/styles/index.cssr.ts
+++ b/src/tree/src/styles/index.cssr.ts
@@ -97,10 +97,10 @@ export default cB('tree', `
cB('tree-node-content', `
background: var(--n-node-color-hover);
`)
- ]),
- cM('selected', [
- cB('tree-node-content', 'background: var(--n-node-color-active);')
])
+ ]),
+ cM('selected', [
+ cB('tree-node-content', 'background: var(--n-node-color-active);')
])
])
]),
@@ -115,9 +115,9 @@ export default cB('tree', `
cNotM('selected', [
c('&:active', 'background: var(--n-node-color-pressed);')
])
- ]),
- cM('selected', 'background: var(--n-node-color-active);')
+ ])
]),
+ cM('selected', 'background: var(--n-node-color-active);'),
cM('disabled', `
cursor: not-allowed;
`)