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

TreeView: remove bold active items + markup changes #1996

Merged
merged 7 commits into from
Apr 5, 2022
Merged

TreeView: remove bold active items + markup changes #1996

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c023f4d
remove overrides + fix bold label
langermank Mar 25, 2022
fcdb3a6
Create curvy-ways-taste.md
langermank Mar 25, 2022
ab42b6e
thank you stylelint
langermank Mar 25, 2022
69102e3
Merge branch 'treeview-followup-patch' of https://github.com/primer/c…
langermank Mar 25, 2022
7a177a2
lint
langermank Apr 4, 2022
bb55109
lint
langermank Apr 4, 2022
b07eca1
Merge branch 'main' into treeview-followup-patch
langermank Apr 5, 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/curvy-ways-taste.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/css": patch
---

TreeView: remove bold active items + markup changes
92 changes: 13 additions & 79 deletions src/actionlist/action-list-tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-max-specificity, no-duplicate-selectors, selector-max-type
// stylelint-disable max-nesting-depth, selector-max-compound-selectors, selector-max-specificity, selector-max-type, primer/spacing
// tree-view variant
// renders ActionList with default styling for tree-view
// collapse/expand icons presents as leadingActions, rotate 90deg
Expand Down Expand Up @@ -40,87 +40,15 @@
}
}

// start: copy from ActionList proper- backwards compatible for treeview with different markup structure
&[aria-expanded] {
.ActionList--subGroup {
@media screen and (prefers-reduced-motion: no-preference) {
transition: opacity 160ms cubic-bezier(0.25, 1, 0.5, 1), transform 160ms cubic-bezier(0.25, 1, 0.5, 1);
}

.ActionList-content {
padding-left: $spacer-4;
}
}

// has 16px leading visual
.ActionList-content--visual16 + .ActionList--subGroup {
.ActionList-content {
padding-left: $spacer-5;
}
}

// has 20px leading visual
.ActionList-content--visual20 + .ActionList--subGroup {
.ActionList-content {
padding-left: $spacer-2 * 4.5; // 36px
}
}

// has 24px leading visual
.ActionList-content--visual24 + .ActionList--subGroup {
.ActionList-content {
padding-left: $spacer-6;
// normal font-weight for any active item
&.ActionList-item--navActive {
&:not(.ActionList-item--subItem) {
.ActionList-item-label {
font-weight: $font-weight-normal;
}
}
}

&[aria-expanded='true'] {
.ActionList-item-collapseIcon {
transition: transform 120ms linear;
transform: scaleY(-1);
}

.ActionList--subGroup {
height: auto;
overflow: visible;
visibility: visible;
opacity: 1;
transform: translateY(0);
}
}

&[aria-expanded='false'] {
.ActionList-item-collapseIcon {
transition: transform 120ms linear;
transform: scaleY(1);
}

.ActionList--subGroup {
height: 0;
overflow: hidden;
visibility: hidden;
opacity: 0;
transform: translateY(-$spacer-3);
}

// show active indicator on parent collapse if child is active
// this class changed in ActionList proper
&.ActionList-item--hasActiveSubItem {
background: var(--color-action-list-item-default-selected-bg);

&::before,
+ .ActionList-item::before {
visibility: hidden;
}

// blue accent line
&::after {
@include activeIndicatorLine;
}
}
}
// end copy

// nesting (infinite levels)
// target items inside expanded subgroup
&[aria-expanded] {
Expand All @@ -129,7 +57,6 @@

// --ActionList-tree-depth is defined as an inline style referencing the aria-level of each item ie: aria-level="2"
.ActionList-content {
// stylelint-disable-next-line primer/spacing
padding-left: calc(#{$spacer-2} * var(--ActionList-tree-depth));
}
}
Expand All @@ -141,6 +68,13 @@
transition: transform 120ms linear;
transform: rotate(0deg);
}

// normal weight for parent folder containing active child
.ActionList-content--hasActiveSubItem {
>.ActionList-item-label {
font-weight: $font-weight-normal;
}
}
}

&[aria-expanded='false'] {
Expand Down