Skip to content

Commit 7637fb0

Browse files
Revert "(TreeNode): improve a11y"
This reverts commit aa717e4.
1 parent 4589d04 commit 7637fb0

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

src/scripts/TreeNode.tsx

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export type TreeNodeProps = {
2828
leaf?: boolean;
2929
loading?: boolean;
3030
level?: number;
31-
disabled?: boolean;
3231
children?: ReactNode;
3332
onClick?: (e: React.MouseEvent) => void;
3433
onLabelClick?: (e: React.MouseEvent) => void;
@@ -86,20 +85,18 @@ const TreeNodeItem: FC<TreeNodeProps & { icon?: string }> = (props) => {
8685
<Button
8786
className='slds-m-right_small'
8887
aria-controls=''
89-
aria-hidden='true'
90-
tabIndex={-1}
9188
type='icon-bare'
9289
icon={icon}
9390
iconSize='small'
9491
onClick={onToggle}
95-
title={typeof label === 'string' ? `Expand ${label}` : undefined}
9692
// Prevent focus loss during loading by keeping the toggle button in the DOM with opacity set to 0.
9793
style={loading ? { opacity: 0, pointerEvents: 'none' } : undefined}
9894
/>
9995
) : null}
10096
<a
10197
className='slds-truncate'
10298
tabIndex={-1}
99+
role='presentation'
103100
onClick={onLabelClick}
104101
>
105102
{ItemRender ? <ItemRender {...props} /> : label}
@@ -117,8 +114,6 @@ export const TreeNode: FC<TreeNodeProps> = (props) => {
117114
defaultOpened,
118115
opened: opened_,
119116
leaf,
120-
selected,
121-
disabled,
122117
children,
123118
onClick: onClick_,
124119
onToggle: onToggle_,
@@ -158,31 +153,15 @@ export const TreeNode: FC<TreeNodeProps> = (props) => {
158153
'slds-show': opened,
159154
'slds-hide': !opened,
160155
});
161-
const labelText =
162-
typeof rprops.label === 'string' ? rprops.label : 'Tree Branch';
163-
const ariaLabel = !leaf ? labelText : undefined;
164156
return (
165157
<li
166158
role='treeitem'
167159
aria-level={level}
168-
aria-expanded={!leaf ? opened : undefined}
169-
aria-label={ariaLabel}
170-
aria-selected={selected || undefined}
171-
aria-disabled={disabled || undefined}
160+
{...(leaf ? {} : { 'aria-expanded': opened })}
172161
>
173162
<TreeNodeItem
174163
{...rprops}
175-
{...{
176-
leaf,
177-
opened,
178-
level,
179-
selected,
180-
disabled,
181-
children,
182-
onClick,
183-
onLabelClick,
184-
onToggle,
185-
}}
164+
{...{ leaf, opened, level, children, onClick, onLabelClick, onToggle }}
186165
/>
187166
{!leaf ? (
188167
<ul className={grpClassNames} role='group'>

0 commit comments

Comments
 (0)