Skip to content

Commit 57be2d5

Browse files
authored
[Bug] TreeView animation and padding fix (#2019)
* restore deleted logic * fix stories * Create fuzzy-pants-decide.md * missing closed scenario
1 parent 3c6d30f commit 57be2d5

7 files changed

+43
-375
lines changed

.changeset/fuzzy-pants-decide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/css": patch
3+
---
4+
5+
[Bug] TreeView animation and padding fix

docs/src/stories/ui-patterns/ActionList/ActionListItem.stories.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ export const ListItemTemplate = ({
297297
<>
298298
<a
299299
href={href}
300-
role={
301-
href && !listSemantic && !treeitem ? 'menuitem' : undefined || (href && treeitem) ? 'treeitem' : undefined
302-
}
300+
role={href && !listSemantic && !treeitem ? 'menuitem' : undefined}
303301
aria-current={ariaCurrent}
304302
className={clsx(
305303
text && 'ActionList-content',

docs/src/stories/ui-patterns/ActionList/ActionListItemCollapsible.stories.jsx

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@ export default {
131131
table: {
132132
category: 'HTML'
133133
}
134+
},
135+
ariaLevel: {
136+
name: 'ariaLevel',
137+
type: 'string',
138+
description: 'number - nested subgroup',
139+
table: {
140+
category: 'HTML'
141+
}
134142
}
135143
}
136144
}
@@ -149,11 +157,20 @@ export const ActionListItemCollapsibleTemplate = ({
149157
containsActiveSubItem,
150158
truncateItem,
151159
collapsePosition,
152-
ariaControlsId
160+
ariaControlsId,
161+
ariaLevel
153162
}) => {
154163
const [isCollapsed, itemIsCollapsed] = useToggle()
164+
const itemStyle = {
165+
'--ActionList-tree-depth': `${ariaLevel}`
166+
}
155167
return (
156-
<li className={clsx('ActionList-item', containsSubItem && `ActionList-item--hasSubItem`)}>
168+
<li
169+
className={clsx('ActionList-item', containsSubItem && `ActionList-item--hasSubItem`)}
170+
style={ariaLevel && itemStyle}
171+
aria-level={ariaLevel ? `${ariaLevel}` : undefined}
172+
role={ariaLevel ? 'treeitem' : undefined}
173+
>
157174
<button
158175
onClick={itemIsCollapsed}
159176
aria-expanded={isCollapsed ? 'false' : 'true'}

docs/src/stories/ui-patterns/ActionList/ActionListTree.stories.jsx

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import {ListTemplate} from './ActionList.stories'
33
import {ListItemTemplate} from './ActionListItem.stories'
4-
import {TreeViewListItemCollapsibleTemplate} from './TreeViewListItemCollapsible.stories'
4+
import {ActionListItemCollapsibleTemplate} from '../../ui-patterns/ActionList/ActionListItemCollapsible.stories.jsx'
55

66
export default {
77
title: 'UI Patterns/ActionList/ActionTreeView',
@@ -53,22 +53,17 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
5353
<ListItemTemplate
5454
truncateItem={truncateItem}
5555
ariaLevel="1"
56-
ariaSetSize="1"
57-
ariaPosInset="1"
5856
treeitem
5957
text={text}
60-
href="/"
6158
leadingVisual={showSubItemIcon && file}
6259
trailingVisual={trailingVisual}
6360
treeItemSingleton
6461
/>
65-
<TreeViewListItemCollapsibleTemplate
62+
<ActionListItemCollapsibleTemplate
6663
text="level 1"
6764
leadingVisual={showGroupIcon && folder}
6865
truncateItem={truncateItem}
6966
ariaLevel="1"
70-
ariaSetSize="2"
71-
ariaPosInset="2"
7267
collapsePosition={0}
7368
containsSubItem
7469
containsActiveSubItem
@@ -77,32 +72,25 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
7772
<ListItemTemplate
7873
truncateItem={truncateItem}
7974
ariaLevel="2"
80-
ariaSetSize="2"
81-
ariaPosInset="1"
8275
treeitem
8376
subItem
8477
text={text}
85-
href="/"
8678
ariaCurrent="page"
8779
leadingVisual={showSubItemIcon && file}
8880
trailingVisual={trailingVisual}
8981
/>
90-
<TreeViewListItemCollapsibleTemplate
82+
<ActionListItemCollapsibleTemplate
9183
text="level 2"
9284
leadingVisual={showGroupIcon && folder}
9385
truncateItem={truncateItem}
9486
ariaLevel="2"
95-
ariaSetSize="2"
96-
ariaPosInset="2"
9787
collapsePosition={0}
9888
containsSubItem
9989
>
10090
<ListTemplate listType="nested">
101-
<TreeViewListItemCollapsibleTemplate
91+
<ActionListItemCollapsibleTemplate
10292
text="level 3"
10393
ariaLevel="3"
104-
ariaSetSize="2"
105-
ariaPosInset="1"
10694
leadingVisual={showGroupIcon && folder}
10795
truncateItem={truncateItem}
10896
collapsePosition={0}
@@ -112,65 +100,50 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
112100
<ListItemTemplate
113101
truncateItem={truncateItem}
114102
ariaLevel="4"
115-
ariaSetSize="4"
116-
ariaPosInset="1"
117103
treeitem
118104
subItem
119105
text={text}
120-
href=""
121106
leadingVisual={showSubItemIcon && file}
122107
trailingVisual={trailingVisual}
123108
/>
124109
<ListItemTemplate
125110
truncateItem={truncateItem}
126111
ariaLevel="4"
127-
ariaSetSize="4"
128-
ariaPosInset="2"
129112
treeitem
130113
subItem
131114
text={text}
132-
href=""
133115
leadingVisual={showSubItemIcon && file}
134116
trailingVisual={trailingVisual}
135117
/>
136118
<ListItemTemplate
137119
truncateItem={truncateItem}
138120
ariaLevel="4"
139-
ariaSetSize="4"
140-
ariaPosInset="3"
141121
treeitem
142122
subItem
143123
text={text}
144-
href=""
145124
leadingVisual={showSubItemIcon && file}
146125
trailingVisual={trailingVisual}
147126
/>
148127
</ListTemplate>
149-
</TreeViewListItemCollapsibleTemplate>
128+
</ActionListItemCollapsibleTemplate>
150129
<ListItemTemplate
151130
truncateItem={truncateItem}
152131
ariaLevel="3"
153-
ariaSetSize="2"
154-
ariaPosInset="2"
155132
treeitem
156133
subItem
157134
text={text}
158-
href=""
159135
leadingVisual={showSubItemIcon && file}
160136
trailingVisual={trailingVisual}
161137
/>
162138
</ListTemplate>
163-
</TreeViewListItemCollapsibleTemplate>
139+
</ActionListItemCollapsibleTemplate>
164140
</ListTemplate>
165-
</TreeViewListItemCollapsibleTemplate>
141+
</ActionListItemCollapsibleTemplate>
166142
<ListItemTemplate
167143
truncateItem={truncateItem}
168144
ariaLevel="1"
169-
ariaSetSize="1"
170-
ariaPosInset="1"
171145
treeitem
172146
text={text}
173-
href="/"
174147
leadingVisual={showSubItemIcon && file}
175148
trailingVisual={trailingVisual}
176149
treeItemSingleton

0 commit comments

Comments
 (0)