From ae78a4bbecb5a4e3249df9593cf7143d90af8526 Mon Sep 17 00:00:00 2001 From: valleykid Date: Fri, 9 Mar 2018 15:04:09 +0800 Subject: [PATCH] When treeNode is disabled, its switcher is highlight and clickabled (#9539) * When treeNode is disabled, its switcher is highlight and clickabled * rc-tree@1.7.11 --- components/tree-select/style/index.less | 5 ++--- components/tree/style/index.less | 5 ++--- package.json | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/components/tree-select/style/index.less b/components/tree-select/style/index.less index 0bf9a4bd8e..8048e8086b 100644 --- a/components/tree-select/style/index.less +++ b/components/tree-select/style/index.less @@ -96,10 +96,9 @@ } } li&-treenode-disabled { - > span, + > span:not(.@{select-tree-prefix-cls}-switcher), > .@{select-tree-prefix-cls}-node-content-wrapper, - > .@{select-tree-prefix-cls}-node-content-wrapper span, - > span.@{select-tree-prefix-cls}-switcher { + > .@{select-tree-prefix-cls}-node-content-wrapper span { color: @disabled-color; cursor: not-allowed; } diff --git a/components/tree/style/index.less b/components/tree/style/index.less index 7369e063cf..90c3ef888a 100644 --- a/components/tree/style/index.less +++ b/components/tree/style/index.less @@ -152,10 +152,9 @@ } } li&-treenode-disabled { - > span, + > span:not(.@{tree-prefix-cls}-switcher), > .@{tree-prefix-cls}-node-content-wrapper, - > .@{tree-prefix-cls}-node-content-wrapper span, - > span.@{tree-prefix-cls}-switcher { + > .@{tree-prefix-cls}-node-content-wrapper span { color: @disabled-color; cursor: not-allowed; } diff --git a/package.json b/package.json index 5db541126d..f0e6c237e7 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "rc-tabs": "~9.2.0", "rc-time-picker": "~3.2.1", "rc-tooltip": "~3.7.0", - "rc-tree": "~1.7.0", + "rc-tree": "~1.7.11", "rc-tree-select": "~1.12.0", "rc-upload": "~2.4.0", "rc-util": "^4.0.4",