Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(TreeView): enable focus on disabled nodes #11402

Closed
wants to merge 5 commits into from
Closed

feat(TreeView): enable focus on disabled nodes #11402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49e5611
refactor(treeview): unnest styles
emyarod May 12, 2022
f6b0f95
feat(TreeView): enable focus on disabled nodes
emyarod May 12, 2022
c62729f
fix(TreeNode): prevent disabled node expansion
emyarod May 12, 2022
c09b012
fix(TreeView): prevent disabled node selection on ctrl+a
emyarod May 12, 2022
933de8e
fix(TreeView): prevent disabled node selection ctrl+shift+home/end
emyarod May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/react/src/components/TreeView/TreeNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function TreeNode({
disabled,
onTreeSelect,
selected,
tabIndex: (!node.props.disabled && -1) || null,
tabIndex: -1,
});
}
});
Expand Down Expand Up @@ -73,6 +73,9 @@ export default function TreeNode({
}
}
function handleKeyDown(event) {
if (disabled) {
return;
}
if (matches(event, [keys.ArrowLeft, keys.ArrowRight, keys.Enter])) {
event.stopPropagation();
}
Expand Down
27 changes: 18 additions & 9 deletions packages/react/src/components/TreeView/TreeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ export default function TreeView({
onNodeFocusEvent: handleFocusEvent,
onTreeSelect: handleTreeSelect,
selected,
tabIndex: (!node.props.disabled && -1) || null,
tabIndex: -1,
};
if (!focusTarget && !node.props.disabled) {
if (!focusTarget) {
sharedNodeProps.tabIndex = 0;
focusTarget = true;
}
Expand Down Expand Up @@ -127,7 +127,12 @@ export default function TreeView({
const nodeIds = [];

if (matches(event, [keys.Home, keys.End])) {
if (multiselect && event.shiftKey && event.ctrlKey) {
if (
multiselect &&
event.shiftKey &&
event.ctrlKey &&
!treeWalker.current.currentNode.getAttribute('aria-disabled')
) {
nodeIds.push(treeWalker.current.currentNode?.id);
}
while (
Expand All @@ -137,7 +142,12 @@ export default function TreeView({
) {
nextFocusNode = treeWalker.current.currentNode;

if (multiselect && event.shiftKey && event.ctrlKey) {
if (
multiselect &&
event.shiftKey &&
event.ctrlKey &&
!nextFocusNode.getAttribute('aria-disabled')
) {
nodeIds.push(nextFocusNode?.id);
}
}
Expand All @@ -146,7 +156,9 @@ export default function TreeView({
treeWalker.current.currentNode = treeWalker.current.root;

while (treeWalker.current.nextNode()) {
nodeIds.push(treeWalker.current.currentNode?.id);
if (!treeWalker.current.currentNode.getAttribute('aria-disabled')) {
nodeIds.push(treeWalker.current.currentNode?.id);
}
}
}
setSelected(selected.concat(nodeIds));
Expand All @@ -163,10 +175,7 @@ export default function TreeView({
treeWalker.current =
treeWalker.current ??
document.createTreeWalker(treeRootRef?.current, NodeFilter.SHOW_ELEMENT, {
acceptNode: function (node) {
if (node.classList.contains(`${prefix}--tree-node--disabled`)) {
return NodeFilter.FILTER_REJECT;
}
acceptNode(node) {
if (node.matches(`li.${prefix}--tree-node`)) {
return NodeFilter.FILTER_ACCEPT;
}
Expand Down
230 changes: 113 additions & 117 deletions packages/styles/scss/components/treeview/_treeview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,154 +20,150 @@
@mixin treeview {
.#{$prefix}--tree {
overflow: hidden;
}

.#{$prefix}--tree-node {
padding-left: $spacing-05;
background-color: $layer-01;
color: $text-secondary;

&:focus {
outline: none;
}
}

.#{$prefix}--tree-node:focus > .#{$prefix}--tree-node__label {
@include focus-outline('outline');
}
.#{$prefix}--tree-node {
padding-left: $spacing-05;
background-color: $layer-01;
color: $text-secondary;

.#{$prefix}--tree-node--disabled:focus > .#{$prefix}--tree-node__label {
&:focus {
outline: none;
}
}

.#{$prefix}--tree-node--disabled,
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-node__label__details {
background-color: $field-01;
color: $text-disabled;
}
.#{$prefix}--tree-node:focus > .#{$prefix}--tree-node__label {
@include focus-outline('outline');
}

.#{$prefix}--tree-node--disabled .#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-node__icon {
fill: $icon-disabled;
}
.#{$prefix}--tree-node--disabled,
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__label:hover,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-node__label__details {
background-color: $field-01;
color: $text-disabled;
}

.#{$prefix}--tree-node--disabled,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-parent-node__toggle-icon:hover {
cursor: not-allowed;
}
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--disabled .#{$prefix}--tree-node__icon,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-node__icon {
fill: $icon-disabled;
}

.#{$prefix}--tree-node__label {
@include type-style('body-compact-01');
.#{$prefix}--tree-node--disabled,
.#{$prefix}--tree-node--disabled
.#{$prefix}--tree-parent-node__toggle-icon:hover {
cursor: not-allowed;
}

display: flex;
min-height: rem(32px);
flex: 1;
align-items: center;
.#{$prefix}--tree-node__label {
@include type-style('body-compact-01');

&:hover {
background-color: $layer-hover-01;
color: $text-primary;
}
}
display: flex;
min-height: rem(32px);
flex: 1;
align-items: center;

.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__label__details {
&:hover {
background-color: $layer-hover-01;
color: $text-primary;
}
}

.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__icon {
fill: $icon-primary;
}
.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__label__details {
color: $text-primary;
}

.#{$prefix}--tree-leaf-node {
display: flex;
padding-left: $spacing-08;
}
.#{$prefix}--tree-node__label:hover
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node__label:hover .#{$prefix}--tree-node__icon {
fill: $icon-primary;
}

.#{$prefix}--tree-leaf-node.#{$prefix}--tree-node--with-icon {
padding-left: $spacing-07;
}
.#{$prefix}--tree-leaf-node {
display: flex;
padding-left: $spacing-08;
}

.#{$prefix}--tree-node__label__details {
display: flex;
align-items: center;
}
.#{$prefix}--tree-leaf-node.#{$prefix}--tree-node--with-icon {
padding-left: $spacing-07;
}

.#{$prefix}--tree-node--with-icon .#{$prefix}--tree-parent-node__toggle {
margin-right: 0;
}
.#{$prefix}--tree-node__label__details {
display: flex;
align-items: center;
}

.#{$prefix}--tree-parent-node__toggle {
padding: 0;
border: 0;
margin-right: $spacing-03;
.#{$prefix}--tree-node--with-icon .#{$prefix}--tree-parent-node__toggle {
margin-right: 0;
}

&:hover {
cursor: pointer;
}
.#{$prefix}--tree-parent-node__toggle {
padding: 0;
border: 0;
margin-right: $spacing-03;

&:focus {
outline: none;
}
&:hover {
cursor: pointer;
}

.#{$prefix}--tree-parent-node__toggle-icon {
fill: $icon-secondary;
transform: rotate(-90deg);
transition: all $duration-fast-02 motion(standard, productive);
&:focus {
outline: none;
}
}

.#{$prefix}--tree-parent-node__toggle-icon--expanded {
transform: rotate(0);
}
.#{$prefix}--tree-parent-node__toggle-icon {
fill: $icon-secondary;
transform: rotate(-90deg);
transition: all $duration-fast-02 motion(standard, productive);
}

.#{$prefix}--tree-node__icon {
min-width: 1rem;
min-height: 1rem;
margin-right: $spacing-03;
fill: $icon-secondary;
}
.#{$prefix}--tree-parent-node__toggle-icon--expanded {
transform: rotate(0);
}

.#{$prefix}--tree-node--selected > .#{$prefix}--tree-node__label {
background-color: $layer-selected-01;
color: $text-primary;
.#{$prefix}--tree-node__icon {
min-width: 1rem;
min-height: 1rem;
margin-right: $spacing-03;
fill: $icon-secondary;
}

&:hover {
background-color: $layer-selected-hover-01;
}
}
.#{$prefix}--tree-node--selected > .#{$prefix}--tree-node__label {
background-color: $layer-selected-01;
color: $text-primary;

.#{$prefix}--tree-node--selected
> .#{$prefix}--tree-node__label
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--selected
> .#{$prefix}--tree-node__label
.#{$prefix}--tree-node__icon {
fill: $icon-primary;
&:hover {
background-color: $layer-selected-hover-01;
}
}

.#{$prefix}--tree-node--selected
> .#{$prefix}--tree-node__label
.#{$prefix}--tree-parent-node__toggle-icon,
.#{$prefix}--tree-node--selected
> .#{$prefix}--tree-node__label
.#{$prefix}--tree-node__icon {
fill: $icon-primary;
}

.#{$prefix}--tree-node--active > .#{$prefix}--tree-node__label {
position: relative;

&::before {
position: absolute;
top: 0;
left: 0;
width: rem(4px);
height: 100%;
background-color: $interactive;
content: '';
}
.#{$prefix}--tree-node--active > .#{$prefix}--tree-node__label {
position: relative;

&::before {
position: absolute;
top: 0;
left: 0;
width: rem(4px);
height: 100%;
background-color: $interactive;
content: '';
}
}

Expand Down