Skip to content

Commit 5efe028

Browse files
fix(treeview): update text and color tokens to match spec (#8075)
* docs(TreeView): set treeview width * fix(treeview): update icon color token * fix(treeview): update enabled hover text tokens * fix(treeview): update selected state blue side bar token * fix(treeview): update selected and hover icon color tokens * fix(treeview): scope icon hover styles to current hovered node * fix(treeview): update disablednode pointer and focus styles Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 60cf955 commit 5efe028

File tree

3 files changed

+51
-10
lines changed

3 files changed

+51
-10
lines changed

packages/components/src/components/treeview/_treeview.scss

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,34 @@
3535
@include focus-outline('outline');
3636
}
3737

38-
.#{$prefix}--tree-node--disabled {
39-
color: $disabled-02;
40-
background-color: $disabled-01;
41-
pointer-events: none;
38+
.#{$prefix}--tree-node--disabled:focus > .#{$prefix}--tree-node__label {
39+
outline: none;
4240
}
4341

44-
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover {
42+
.#{$prefix}--tree-node--disabled,
43+
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover,
44+
.#{$prefix}--tree-node--disabled
45+
.#{$prefix}--tree-node__label:hover
46+
.#{$prefix}--tree-node__label__details {
47+
color: $disabled-02;
4548
background-color: $disabled-01;
4649
}
4750

4851
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-parent-node__toggle-icon,
49-
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon {
52+
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon,
53+
.#{$prefix}--tree-node--disabled
54+
.#{$prefix}--tree-node__label:hover
55+
.#{$prefix}--tree-parent-node__toggle-icon,
56+
.#{$prefix}--tree-node--disabled
57+
.#{$prefix}--tree-node__label:hover
58+
.#{$prefix}--tree-node__icon {
5059
fill: $disabled-02;
5160
}
5261

62+
.#{$prefix}--tree-node--disabled,
5363
.#{$prefix}--tree-node--disabled
5464
.#{$prefix}--tree-parent-node__toggle-icon:hover {
55-
cursor: default;
65+
cursor: not-allowed;
5666
}
5767

5868
.#{$prefix}--tree-node__label {
@@ -62,10 +72,21 @@
6272
min-height: rem(32px);
6373

6474
&:hover {
75+
color: $text-01;
6576
background-color: $hover-ui;
6677
}
6778
}
6879

80+
.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__label__details {
81+
color: $text-01;
82+
}
83+
84+
.#{$prefix}--tree-node__label:hover
85+
.#{$prefix}--tree-parent-node__toggle-icon,
86+
.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__icon {
87+
fill: $icon-01;
88+
}
89+
6990
.#{$prefix}--tree-leaf-node {
7091
display: flex;
7192
padding-left: $spacing-08;
@@ -101,7 +122,7 @@
101122
.#{$prefix}--tree-parent-node__toggle-icon {
102123
transform: rotate(-90deg);
103124
transition: all $duration--fast-02 motion(standard, productive);
104-
fill: $icon-01;
125+
fill: $icon-02;
105126
}
106127

107128
.#{$prefix}--tree-parent-node__toggle-icon--expanded {
@@ -110,7 +131,7 @@
110131

111132
.#{$prefix}--tree-node__icon {
112133
margin-right: $spacing-03;
113-
fill: $icon-01;
134+
fill: $icon-02;
114135
}
115136

116137
.#{$prefix}--tree-node--selected > .#{$prefix}--tree-node__label {
@@ -122,6 +143,15 @@
122143
}
123144
}
124145

146+
.#{$prefix}--tree-node--selected
147+
> .#{$prefix}--tree-node__label
148+
.#{$prefix}--tree-parent-node__toggle-icon,
149+
.#{$prefix}--tree-node--selected
150+
> .#{$prefix}--tree-node__label
151+
.#{$prefix}--tree-node__icon {
152+
fill: $icon-01;
153+
}
154+
125155
.#{$prefix}--tree-node--active > .#{$prefix}--tree-node__label {
126156
position: relative;
127157

@@ -131,7 +161,7 @@
131161
left: 0;
132162
width: rem(4px);
133163
height: 100%;
134-
background-color: $interactive-01;
164+
background-color: $interactive-04;
135165
content: '';
136166
}
137167
}

packages/react/src/components/TreeView/TreeView-story.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
} from '@storybook/addon-knobs';
1818
import { InlineNotification } from '../Notification';
1919
import TreeView, { TreeNode } from '../TreeView';
20+
import './story.scss';
2021

2122
const sizes = {
2223
default: 'default',
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Copyright IBM Corp. 2016, 2018
3+
//
4+
// This source code is licensed under the Apache-2.0 license found in the
5+
// LICENSE file in the root directory of this source tree.
6+
//
7+
8+
.bx--tree {
9+
width: 16rem;
10+
}

0 commit comments

Comments
 (0)