Skip to content

TreeView single item nesting #1937

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

Merged
merged 3 commits into from
Feb 11, 2022
Merged

TreeView single item nesting #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50bf83d
add class for singleton nesting
langermank Feb 11, 2022
90ade8f
Create cold-ducks-deny.md
langermank Feb 11, 2022
db44090
Merge branch 'main' into tree-view-followup
langermank Feb 11, 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: 5 additions & 0 deletions .changeset/cold-ducks-deny.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": minor
---

TreeView single item nesting
16 changes: 13 additions & 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 @@ -167,6 +167,13 @@ export default {
category: 'HTML'
}
},
treeItemSingleton: {
defaultValue: false,
control: {type: 'boolean'},
table: {
category: 'CSS'
}
},
ariaDisabled: {
defaultValue: false,
control: {type: 'boolean'},
Expand Down Expand Up @@ -243,7 +250,8 @@ export const ListItemTemplate = ({
treeitem,
ariaSetSize,
ariaPosInset,
menuItem
menuItem,
treeItemSingleton
}) => {
const [isChecked, itemIsChecked] = useToggle()
const itemStyle = {
Expand All @@ -256,7 +264,8 @@ export const ListItemTemplate = ({
ariaCurrent && 'ActionList-item--navActive',
subItem && `ActionList-item--subItem`,
hasSubItem && `ActionList-item--hasSubItem`,
variant && `${variant}`
variant && `${variant}`,
treeitem && treeItemSingleton && `ActionList-item--singleton`
)}
aria-level={ariaLevel ? `${ariaLevel}` : undefined}
aria-setsize={ariaSetSize ? `${ariaSetSize}` : undefined}
Expand Down Expand Up @@ -466,5 +475,6 @@ Playground.decorators = [
)
]
Playground.args = {
truncateItem: false
truncateItem: false,
treeItemSingleton: false
}
25 changes: 25 additions & 0 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
Expand Up @@ -50,6 +50,18 @@ const trailingVisual = `<svg aria-hidden="true" role="img" class="color-fg-atten
export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text, truncateItem}) => (
<ListTemplate ariaLabel="Some description" role="tree" variant="ActionList--tree">
<>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="1"
ariaSetSize="1"
ariaPosInset="1"
treeitem
text={text}
href="/"
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
treeItemSingleton
/>
<TreeViewListItemCollapsibleTemplate
text="level 1"
leadingVisual={showGroupIcon && folder}
Expand All @@ -59,6 +71,7 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
ariaPosInset="2"
collapsePosition={0}
containsSubItem
containsActiveSubItem
>
<ListTemplate listType="nested">
<ListItemTemplate
Expand Down Expand Up @@ -150,6 +163,18 @@ export const ActionListTreeViewTemplate = ({showGroupIcon, showSubItemIcon, text
</TreeViewListItemCollapsibleTemplate>
</ListTemplate>
</TreeViewListItemCollapsibleTemplate>
<ListItemTemplate
truncateItem={truncateItem}
ariaLevel="1"
ariaSetSize="1"
ariaPosInset="1"
treeitem
text={text}
href="/"
leadingVisual={showSubItemIcon && file}
trailingVisual={trailingVisual}
treeItemSingleton
/>
</>
</ListTemplate>
)
Expand Down
16 changes: 14 additions & 2 deletions docs/src/stories/ui-patterns/ActionList/TreeViewListItemCollapsible.stories.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ export default {
table: {
category: 'HTML'
}
},
containsActiveSubItem: {
defaultValue: false,
control: {type: 'boolean'},
table: {
category: 'CSS'
}
}
}
}
Expand All @@ -177,15 +184,20 @@ export const TreeViewListItemCollapsibleTemplate = ({
ariaSetSize,
ariaPosInset,
ariaLevel,
ariaDisabled
ariaDisabled,
containsActiveSubItem
}) => {
const [isCollapsed, itemIsCollapsed] = useToggle()
const itemStyle = {
'--ActionList-tree-depth': `${ariaLevel}`
}
return (
<li
className={clsx('ActionList-item', containsSubItem && `ActionList-item--hasSubItem`)}
className={clsx(
'ActionList-item',
containsSubItem && `ActionList-item--hasSubItem`,
containsActiveSubItem && `ActionList-item--hasActiveSubItem`
)}
onClick={itemIsCollapsed}
id={id}
aria-disabled={ariaDisabled ? 'true' : undefined}
Expand Down
7 changes: 7 additions & 0 deletions src/actionlist/action-list-tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@
}

.ActionList-item {
// class for single tree items not within a group
&.ActionList-item--singleton {
.ActionList-content {
padding-left: $spacer-5;
}
}

// start: copy from ActionList proper- backwards compatible for treeview with different markup structure
&[aria-expanded] {
.ActionList--subGroup {
Expand Down