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

[Bug] TreeView animation and padding fix #2019

Merged
merged 5 commits into from
Apr 6, 2022
Merged

[Bug] TreeView animation and padding fix #2019

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
2e1a6fd
restore deleted logic
langermank Apr 5, 2022
240d4f4
fix stories
langermank Apr 5, 2022
ccd00cb
Create fuzzy-pants-decide.md
langermank Apr 5, 2022
0d1096b
missing closed scenario
langermank Apr 5, 2022
40fec07
Merge branch 'treeview-animation-patch' of https://github.com/primer/…
langermank Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fuzzy-pants-decide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": patch
---

[Bug] TreeView animation and padding fix
4 changes: 1 addition & 3 deletions docs/src/stories/ui-patterns/ActionList/ActionListItem.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,7 @@ export const ListItemTemplate = ({
<>
<a
href={href}
role={
href && !listSemantic && !treeitem ? 'menuitem' : undefined || (href && treeitem) ? 'treeitem' : undefined
}
role={href && !listSemantic && !treeitem ? 'menuitem' : undefined}
aria-current={ariaCurrent}
className={clsx(
text && 'ActionList-content',
Expand Down
21 changes: 19 additions & 2 deletions docs/src/stories/ui-patterns/ActionList/ActionListItemCollapsible.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ export default {
table: {
category: 'HTML'
}
},
ariaLevel: {
name: 'ariaLevel',
type: 'string',
description: 'number - nested subgroup',
table: {
category: 'HTML'
}
}
}
}
Expand All @@ -149,11 +157,20 @@ export const ActionListItemCollapsibleTemplate = ({
containsActiveSubItem,
truncateItem,
collapsePosition,
ariaControlsId
ariaControlsId,
ariaLevel
}) => {
const [isCollapsed, itemIsCollapsed] = useToggle()
const itemStyle = {
'--ActionList-tree-depth': `${ariaLevel}`
}
return (
<li className={clsx('ActionList-item', containsSubItem && `ActionList-item--hasSubItem`)}>
<li
className={clsx('ActionList-item', containsSubItem && `ActionList-item--hasSubItem`)}
style={ariaLevel && itemStyle}
aria-level={ariaLevel ? `${ariaLevel}` : undefined}
role={ariaLevel ? 'treeitem' : undefined}
>
<button
onClick={itemIsCollapsed}
aria-expanded={isCollapsed ? 'false' : 'true'}
Expand Down
41 changes: 7 additions & 34 deletions docs/src/stories/ui-patterns/ActionList/ActionListTree.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import {ListTemplate} from './ActionList.stories'
import {ListItemTemplate} from './ActionListItem.stories'
import {TreeViewListItemCollapsibleTemplate} from './TreeViewListItemCollapsible.stories'
import {ActionListItemCollapsibleTemplate} from '../../ui-patterns/ActionList/ActionListItemCollapsible.stories.jsx'

export default {
title: 'UI Patterns/ActionList/ActionTreeView',
Expand Down Expand Up @@ -53,22 +53,17 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="1"
ariaSetSize="1"
ariaPosInset="1"
treeitem
text={text}
href="/"
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
treeItemSingleton
/>
<TreeViewListItemCollapsibleTemplate
<ActionListItemCollapsibleTemplate
text="level 1"
leadingVisual={showGroupIcon && folder}
truncateItem={truncateItem}
ariaLevel="1"
ariaSetSize="2"
ariaPosInset="2"
collapsePosition={0}
containsSubItem
containsActiveSubItem
Expand All @@ -77,32 +72,25 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="2"
ariaSetSize="2"
ariaPosInset="1"
treeitem
subItem
text={text}
href="/"
ariaCurrent="page"
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
/>
<TreeViewListItemCollapsibleTemplate
<ActionListItemCollapsibleTemplate
text="level 2"
leadingVisual={showGroupIcon && folder}
truncateItem={truncateItem}
ariaLevel="2"
ariaSetSize="2"
ariaPosInset="2"
collapsePosition={0}
containsSubItem
>
<ListTemplate listType="nested">
<TreeViewListItemCollapsibleTemplate
<ActionListItemCollapsibleTemplate
text="level 3"
ariaLevel="3"
ariaSetSize="2"
ariaPosInset="1"
leadingVisual={showGroupIcon && folder}
truncateItem={truncateItem}
collapsePosition={0}
Expand All @@ -112,65 +100,50 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="4"
ariaSetSize="4"
ariaPosInset="1"
treeitem
subItem
text={text}
href=""
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
/>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="4"
ariaSetSize="4"
ariaPosInset="2"
treeitem
subItem
text={text}
href=""
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
/>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="4"
ariaSetSize="4"
ariaPosInset="3"
treeitem
subItem
text={text}
href=""
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
/>
</ListTemplate>
</TreeViewListItemCollapsibleTemplate>
</ActionListItemCollapsibleTemplate>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="3"
ariaSetSize="2"
ariaPosInset="2"
treeitem
subItem
text={text}
href=""
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
/>
</ListTemplate>
</TreeViewListItemCollapsibleTemplate>
</ActionListItemCollapsibleTemplate>
</ListTemplate>
</TreeViewListItemCollapsibleTemplate>
</ActionListItemCollapsibleTemplate>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="1"
ariaSetSize="1"
ariaPosInset="1"
treeitem
text={text}
href="/"
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
treeItemSingleton
Expand Down