Skip to content

Button counter contrast fixes #3270

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
langermank merged 12 commits into from
May 10, 2023
Merged

Button counter contrast fixes #3270

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
422f977
bump primies
langermank May 9, 2023
e12e68d
update counter colors
langermank May 9, 2023
7f0d39e
Create breezy-fireants-tickle.md
langermank May 9, 2023
d741dff
bump again
langermank May 10, 2023
45d5aa2
snaps
langermank May 10, 2023
02d2fbd
add story to e2e
langermank May 10, 2023
977b457
Merge branch 'button-counter-contrast-fixes' of https://github.com/pr…
langermank May 10, 2023
2021cde
Merge branch 'main' into button-counter-contrast-fixes
langermank May 10, 2023
ed7af85
bump
langermank May 10, 2023
58ab3af
Merge branch 'button-counter-contrast-fixes' of https://github.com/pr…
langermank May 10, 2023
35e6cf1
Merge branch 'main' into button-counter-contrast-fixes
langermank May 10, 2023
16bc5b9
snippy snaps
langermank May 10, 2023
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/breezy-fireants-tickle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Button counter contrast fixes
30 changes: 7 additions & 23 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.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"@lit-labs/react": "1.1.1",
"@primer/behaviors": "1.3.3",
"@primer/octicons-react": "^18.0.0",
"@primer/primitives": "7.11.7",
"@primer/primitives": "7.11.8",
"@react-aria/ssr": "^3.1.0",
"@styled-system/css": "^5.1.5",
"@styled-system/props": "^5.1.5",
Expand Down
48 changes: 48 additions & 0 deletions src/Button/Button.features.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,54 @@ export const TrailingCounter = () => {
)
}

export const TrailingCounterAllVariants = () => {
const [count, setCount] = useState(0)
return (
<div style={{display: 'flex', flexDirection: 'row', gap: '1rem'}}>
<Button onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button disabled onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="primary" onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="primary" disabled onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="outline" onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="outline" disabled onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="danger" onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="danger" disabled onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="invisible" onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
<Button variant="invisible" disabled onClick={() => setCount(count + 1)}>
Watch
<Button.Counter>{count}</Button.Counter>
</Button>
</div>
)
}

export const TrailingAction = () => <Button trailingAction={TriangleDownIcon}>Trailing action</Button>

export const Block = () => <Button block>Default</Button>
Expand Down
10 changes: 5 additions & 5 deletions src/Button/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
boxShadow: `${theme?.shadows.btn.danger.hoverShadow}`,
'[data-component=ButtonCounter]': {
backgroundColor: 'btn.danger.hoverCounterBg',
color: 'btn.danger.hoverText',
color: 'btn.danger.hoverCounterFg',
},
},
'&:active:not([disabled])': {
Expand All @@ -86,7 +86,7 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
backgroundColor: 'btn.danger.disabledBg',
borderColor: 'btn.danger.disabledBorder',
'[data-component=ButtonCounter]': {
color: 'inherit',
color: 'btn.danger.disabledCounterFg',
backgroundColor: 'btn.danger.disabledCounterBg',
},
},
Expand Down Expand Up @@ -156,7 +156,7 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
boxShadow: `${theme?.shadows.btn.outline.hoverShadow}`,
'[data-component=ButtonCounter]': {
backgroundColor: 'btn.outline.hoverCounterBg',
color: 'inherit',
color: 'btn.outline.hoverCounterFg',
},
},
'&:active:not([disabled])': {
Expand All @@ -172,12 +172,12 @@ export const getVariantStyles = (variant: VariantType = 'default', theme?: Theme
borderColor: 'btn.border',
'[data-component=ButtonCounter]': {
backgroundColor: 'btn.outline.disabledCounterBg',
color: 'inherit',
color: 'btn.outline.disabledCounterFg',
},
},
'[data-component=ButtonCounter]': {
backgroundColor: 'btn.outline.counterBg',
color: 'btn.outline.text',
color: 'btn.outline.counterFg',
},
'&[aria-expanded=true]': {
color: 'btn.outline.selectedText',
Expand Down