Skip to content

Fix TagCount styling #237

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
fhlavac merged 2 commits into from
Aug 6, 2024
Merged

Fix TagCount styling #237

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
4879749
fix(v6): Fix TagCount styling
fhlavac Aug 1, 2024
0dc33de
Update tokens
fhlavac Aug 6, 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
16 changes: 10 additions & 6 deletions packages/module/src/TagCount/TagCount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ import { createUseStyles } from 'react-jss'

const useStyles = createUseStyles({
buttonTagCount: {
color: 'var(--pf-v5-global--icon--Color--light)',
display: 'flex',
alignItems: 'center'
alignItems: 'center',
padding: 'var(--pf-t--global--spacer--sm) var(--pf-t--global--spacer--md)'
},

tagIcon: (isDisabled: boolean) => ({
color: `var(--pf-t--global--icon--color--${isDisabled ? '200' : '100'})`,
}),

tagText: {
marginLeft: 'var(--pf-v5-global--spacer--sm)',
fontSize: 'var(--pf-v5-global--FontSize--sm)'
marginLeft: 'var(--pf-t--global--spacer--sm)',
fontSize: 'var(--pf-t--global--font--size--sm)'
}
});

Expand All @@ -35,12 +39,12 @@ const TagCount: React.FunctionComponent<TagCountProps> = ({
ouiaId = 'TagCount',
...props
}: TagCountProps) => {
const classes = useStyles();
const classes = useStyles(!count);
const tagClasses = clsx(classes.buttonTagCount, className);
return (
<Button aria-label="Tag count" {...props} variant="plain" isDisabled={!count} className={tagClasses} ouiaId={ouiaId} {...props}>
<Icon iconSize={iconSize} data-ouia-component-id={`${ouiaId}-icon`}>
<TagIcon />
<TagIcon className={classes.tagIcon} />
</Icon>
<span className={classes.tagText} data-ouia-component-id={`${ouiaId}-text`}>{count}</span>
</Button>
Expand Down
16 changes: 8 additions & 8 deletions packages/module/src/TagCount/__snapshots__/TagCount.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v6-svg tagIcon-0-2-2 tagIcon-d0-0-2-4"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -41,7 +41,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
</span>
</span>
<span
class="tagText-0-2-2"
class="tagText-0-2-3"
data-ouia-component-id="TagCount-text"
/>
</span>
Expand Down Expand Up @@ -71,7 +71,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v6-svg tagIcon-0-2-2 tagIcon-d0-0-2-4"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -85,7 +85,7 @@ exports[`TagCount component should render a disabled tag count with no value 1`]
</span>
</span>
<span
class="tagText-0-2-2"
class="tagText-0-2-3"
data-ouia-component-id="TagCount-text"
/>
</span>
Expand Down Expand Up @@ -171,7 +171,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v6-svg tagIcon-0-2-2 tagIcon-d1-0-2-5"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -185,7 +185,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
</span>
</span>
<span
class="tagText-0-2-2"
class="tagText-0-2-3"
data-ouia-component-id="TagCount-text"
>
11
Expand Down Expand Up @@ -216,7 +216,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
>
<svg
aria-hidden="true"
class="pf-v6-svg"
class="pf-v6-svg tagIcon-0-2-2 tagIcon-d1-0-2-5"
fill="currentColor"
height="1em"
role="img"
Expand All @@ -230,7 +230,7 @@ exports[`TagCount component should render a tag count of 11 1`] = `
</span>
</span>
<span
class="tagText-0-2-2"
class="tagText-0-2-3"
data-ouia-component-id="TagCount-text"
>
11
Expand Down