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

fix(CounterLabel): update styles to work with sx overrides #5111

Merged
merged 2 commits into from
Oct 14, 2024
Merged

fix(CounterLabel): update styles to work with sx overrides #5111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb73451
fix(CounterLabel): update styles to work with sx overrides
joshblack Oct 11, 2024
e8951fc
test: update snapshots
joshblack Oct 11, 2024
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/spicy-pants-breathe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

Update CSS styles for CounterLabel to allow overrides for color, background color
6 changes: 3 additions & 3 deletions packages/react/src/CounterLabel/CounterLabel.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
/* stylelint-disable-next-line primer/borders */
border-radius: 20px;

&[data-scheme='primary'] {
&:where([data-scheme='primary']) {
color: var(--fgColor-onEmphasis);
background-color: var(--bgColor-neutral-emphasis);
}

&[data-scheme='secondary'] {
&:where([data-scheme='secondary']) {
color: var(--fgColor-default);
background-color: var(--bgColor-neutral-muted);
}

&:empty {
&:where(:empty) {
display: none;
}
}
11 changes: 7 additions & 4 deletions packages/react/src/CounterLabel/CounterLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,24 @@ const StyledCounterLabel = styled.span`
border-radius: 20px;
border: var(--borderWidth-thin, max(1px, 0.0625rem)) solid var(--counter-borderColor, var(--color-counter-border));

&[data-scheme='primary'] {
&:where([data-scheme='primary']) {
background-color: ${get('colors.neutral.emphasis')};
color: ${get('colors.fg.onEmphasis')};
}

&[data-scheme='secondary'] {
&:where([data-scheme='secondary']) {
background-color: ${get('colors.neutral.muted')};
color: ${get('colors.fg.default')};
}

&:empty {
&:where(:empty) {
display: none;
}

${sx}
/* Place the sx prop styles after previously inserted styles so that it will win out in specificity */
& {
${sx}
}
`

CounterLabel.displayName = 'CounterLabel'
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/CounterLabel/__snapshots__/CounterLabel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`CounterLabel renders with secondary scheme when no "scheme" prop is pro
border: var(--borderWidth-thin,max(1px,0.0625rem)) solid var(--counter-borderColor,var(--color-counter-border));
}

.c0:empty {
.c0:where(:empty) {
display: none;
}

Expand Down Expand Up @@ -64,7 +64,7 @@ exports[`CounterLabel respects the primary "scheme" prop 1`] = `
border: var(--borderWidth-thin,max(1px,0.0625rem)) solid var(--counter-borderColor,var(--color-counter-border));
}

.c0:empty {
.c0:where(:empty) {
display: none;
}

Expand Down
Loading