Skip to content

TreeView: Use correct design tokens and icons #2446

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 6 commits into from
Oct 18, 2022
Merged

TreeView: Use correct design tokens and icons #2446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86e2669
Update primitives and octicons
colebemis Oct 17, 2022
0518670
use new primitives and octicons
colebemis Oct 17, 2022
27cf213
Create large-rabbits-hug.md
colebemis Oct 17, 2022
2fac726
Update snapshot test
colebemis Oct 18, 2022
3b63e20
Merge remote-tracking branch 'origin/main' into treeview-tokens-icons
colebemis Oct 18, 2022
0646e39
Use loose version for @primer/octicons-react
colebemis Oct 18, 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/large-rabbits-hug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

TreeView: Use correct design tokens and icons
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@github/paste-markdown": "^1.4.0",
"@primer/behaviors": "^1.1.1",
"@primer/octicons-react": "^17.7.0",
"@primer/primitives": "7.9.0",
"@primer/primitives": "7.10.0",
"@react-aria/ssr": "^3.1.0",
"@styled-system/css": "^5.1.5",
"@styled-system/props": "^5.1.5",
Expand Down Expand Up @@ -124,8 +124,8 @@
"@storybook/addon-essentials": "6.5.12",
"@storybook/addon-interactions": "6.5.12",
"@storybook/addon-links": "6.5.12",
"@storybook/builder-webpack5": "6.5.12",
"@storybook/addon-storysource": "6.5.12",
"@storybook/builder-webpack5": "6.5.12",
"@storybook/jest": "0.0.10",
"@storybook/manager-webpack5": "6.5.12",
"@storybook/react": "6.5.12",
Expand Down
5 changes: 2 additions & 3 deletions src/TreeView/TreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ const Item = React.forwardRef<HTMLElement, TreeViewItemProps>(
borderTopLeftRadius: level === 1 ? 2 : 0,
borderBottomLeftRadius: level === 1 ? 2 : 0,
'&:hover': {
backgroundColor: onSelect ? 'actionListItem.default.hoverBg' : null
backgroundColor: onSelect ? 'treeViewItem.chevron.hoverBg' : null
}
}}
>
Expand Down Expand Up @@ -555,8 +555,7 @@ TrailingVisual.displayName = 'TreeView.TrailingVisual'
const DirectoryIcon = () => {
const {isExpanded} = React.useContext(ItemContext)
const icon = isExpanded ? FileDirectoryOpenFillIcon : FileDirectoryFillIcon
// TODO: Use correct color
return <StyledOcticon icon={icon} />
return <StyledOcticon icon={icon} color="treeViewItem.directory.fill" />
}

// ----------------------------------------------------------------------------
Expand Down
84 changes: 78 additions & 6 deletions src/__tests__/__snapshots__/themePreval.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`snapshot theme-preval.js 1`] = `

// this file was prevaled
// This file needs to be a JavaScript file using CommonJS to be compatible with preval
// Cache bust: 2022-07-25 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)
// Cache bust: 2022-10-17 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)
var themePreval = {
"animation": {
"easeOutCubic": "cubic-bezier(0.33, 1, 0.68, 1)"
Expand Down Expand Up @@ -384,6 +384,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(208,215,222,0.32)"
},
"directory": {
"fill": "#54aeff"
}
},
"fg": {
"default": "#24292f",
"muted": "#57606a",
Expand Down Expand Up @@ -879,6 +887,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "#ced5dc"
},
"directory": {
"fill": "#368cf9"
}
},
"fg": {
"default": "#0e1116",
"muted": "#0e1116",
Expand Down Expand Up @@ -1374,6 +1390,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(208,215,222,0.32)"
},
"directory": {
"fill": "#54aeff"
}
},
"fg": {
"default": "#24292f",
"muted": "#57606a",
Expand Down Expand Up @@ -1869,6 +1893,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(208,215,222,0.32)"
},
"directory": {
"fill": "#54aeff"
}
},
"fg": {
"default": "#24292f",
"muted": "#57606a",
Expand Down Expand Up @@ -2364,6 +2396,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(177,186,196,0.12)"
},
"directory": {
"fill": "#8b949e"
}
},
"fg": {
"default": "#c9d1d9",
"muted": "#8b949e",
Expand Down Expand Up @@ -2457,7 +2497,7 @@ var themePreval = {
},
"shadows": {
"checks": {
"inputShadow": "0 0 0 1px (obj) => get_1.default(obj, path)"
"inputShadow": "0 0 0 1px (obj) => (0, get_1.default)(obj, path)"
},
"mktg": {
"btn": {
Expand Down Expand Up @@ -2862,6 +2902,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(144,157,171,0.12)"
},
"directory": {
"fill": "#768390"
}
},
"fg": {
"default": "#adbac7",
"muted": "#768390",
Expand Down Expand Up @@ -2955,7 +3003,7 @@ var themePreval = {
},
"shadows": {
"checks": {
"inputShadow": "0 0 0 1px (obj) => get_1.default(obj, path)"
"inputShadow": "0 0 0 1px (obj) => (0, get_1.default)(obj, path)"
},
"mktg": {
"btn": {
Expand Down Expand Up @@ -3360,6 +3408,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "#525964"
},
"directory": {
"fill": "#f0f3f6"
}
},
"fg": {
"default": "#f0f3f6",
"muted": "#f0f3f6",
Expand Down Expand Up @@ -3453,7 +3509,7 @@ var themePreval = {
},
"shadows": {
"checks": {
"inputShadow": "0 0 0 1px (obj) => get_1.default(obj, path)"
"inputShadow": "0 0 0 1px (obj) => (0, get_1.default)(obj, path)"
},
"mktg": {
"btn": {
Expand Down Expand Up @@ -3858,6 +3914,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(177,186,196,0.12)"
},
"directory": {
"fill": "#8b949e"
}
},
"fg": {
"default": "#c9d1d9",
"muted": "#8b949e",
Expand Down Expand Up @@ -3951,7 +4015,7 @@ var themePreval = {
},
"shadows": {
"checks": {
"inputShadow": "0 0 0 1px (obj) => get_1.default(obj, path)"
"inputShadow": "0 0 0 1px (obj) => (0, get_1.default)(obj, path)"
},
"mktg": {
"btn": {
Expand Down Expand Up @@ -4356,6 +4420,14 @@ var themePreval = {
}
}
},
"treeViewItem": {
"chevron": {
"hoverBg": "rgba(177,186,196,0.12)"
},
"directory": {
"fill": "#8b949e"
}
},
"fg": {
"default": "#c9d1d9",
"muted": "#8b949e",
Expand Down Expand Up @@ -4449,7 +4521,7 @@ var themePreval = {
},
"shadows": {
"checks": {
"inputShadow": "0 0 0 1px (obj) => get_1.default(obj, path)"
"inputShadow": "0 0 0 1px (obj) => (0, get_1.default)(obj, path)"
},
"mktg": {
"btn": {
Expand Down
2 changes: 1 addition & 1 deletion src/theme-preval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @preval
// This file needs to be a JavaScript file using CommonJS to be compatible with preval
// Cache bust: 2022-07-25 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)
// Cache bust: 2022-10-17 12:00:00 GMT (This file is cached by our deployment tooling, update this timestamp to rebuild this file)

const {default: primitives} = require('@primer/primitives')
const {partitionColors, fontStack, omitScale} = require('./utils/theme')
Expand Down