Skip to content

chore(deps): replace clsx with @patternfly/react-styles #743

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
nicolethoen merged 1 commit into from
May 29, 2025
Merged

chore(deps): replace clsx with @patternfly/react-styles #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions cypress/component/MultiContentCard.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from '@patternfly/react-core';
import { ArrowRightIcon, BellIcon, CogIcon, LockIcon } from '@patternfly/react-icons';
import { createUseStyles } from 'react-jss';
import clsx from 'clsx';
import { css } from '@patternfly/react-styles';

const useStyles = createUseStyles({
action: {
Expand All @@ -35,7 +35,7 @@ export const MultiContentCardExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Getting Started</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<CogIcon />
</Icon>
Expand All @@ -47,7 +47,7 @@ export const MultiContentCardExample: FunctionComponent = () => {
</Content>
</CardBody>
<CardFooter>
<List className={clsx(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<List className={css(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<ListItem>
<Button variant="link" isInline>
First link
Expand All @@ -68,7 +68,7 @@ export const MultiContentCardExample: FunctionComponent = () => {
</Card>,
<Card isFullHeight isPlain key="card-2">
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<LockIcon />
</Icon>
Expand Down Expand Up @@ -101,7 +101,7 @@ export const MultiContentCardExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Next Steps</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<BellIcon />
</Icon>
Expand Down
91 changes: 52 additions & 39 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 packages/module/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"dependencies": {
"@patternfly/react-core": "^6.0.0",
"@patternfly/react-icons": "^6.0.0",
"@patternfly/react-styles": "^6.0.0",
"@patternfly/react-table": "^6.0.0",
"react-jss": "^10.10.0",
"clsx": "^2.1.1"
"react-jss": "^10.10.0"
},
"peerDependencies": {
"react": "^17 || ^18 || ^19",
Expand Down
2 changes: 1 addition & 1 deletion ...ntent/extensions/component-groups/examples/MultiContentCard/MultiContentCard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ sourceLink: https://github.com/patternfly/react-component-groups/blob/main/packa
import MultiContentCard, { MultiContentCardDividerVariant } from "@patternfly/react-component-groups/dist/dynamic/MultiContentCard";
import { ArrowRightIcon, BellIcon, CogIcon, EllipsisVIcon, LockIcon } from '@patternfly/react-icons';
import { createUseStyles } from 'react-jss';
import clsx from 'clsx';
import { css } from '@patternfly/react-styles';
import { FunctionComponent, useState } from 'react';

A **multi-content card** component allows to display multiple card components in a single layout. To further customize this layout, you can also utilize all properties of the [card component](/components/card), with the exception of `children` and `title`.
Expand Down
10 changes: 5 additions & 5 deletions ...content/extensions/component-groups/examples/MultiContentCard/MultiContentCardExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from '@patternfly/react-core';
import { ArrowRightIcon, BellIcon, CogIcon, LockIcon } from '@patternfly/react-icons';
import { createUseStyles } from 'react-jss';
import clsx from 'clsx';
import { css } from '@patternfly/react-styles';

const useStyles = createUseStyles({
action: {
Expand All @@ -37,7 +37,7 @@ export const BasicExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Getting Started</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<CogIcon className={classes.actionIcon} />
</Icon>
Expand All @@ -49,7 +49,7 @@ export const BasicExample: FunctionComponent = () => {
</Content>
</CardBody>
<CardFooter>
<List className={clsx(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<List className={css(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<ListItem>
<Button variant="link" isInline>
First link
Expand All @@ -71,7 +71,7 @@ export const BasicExample: FunctionComponent = () => {
<Card isFullHeight isPlain key="card-2">
<CardHeader style={{ visibility: 'hidden' }}>-</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<LockIcon className={classes.actionIcon} />
</Icon>
Expand Down Expand Up @@ -104,7 +104,7 @@ export const BasicExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Next Steps</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<BellIcon className={classes.actionIcon} />
</Icon>
Expand Down
4 changes: 2 additions & 2 deletions ...s/component-groups/examples/MultiContentCard/MultiContentCardExpandableActionsExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
} from '@patternfly/react-core';
import { ArrowRightIcon, BellIcon, CogIcon, LockIcon } from '@patternfly/react-icons';
import { createUseStyles } from 'react-jss';
import clsx from 'clsx';
import { css } from '@patternfly/react-styles';

const useStyles = createUseStyles({
bulletPoints: {
Expand All @@ -49,7 +49,7 @@ export const BasicExample: FunctionComponent = () => {
</Content>
</CardBody>
<CardFooter>
<List className={clsx(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<List className={css(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<ListItem>
<Button variant="link" isInline>
First link
Expand Down
10 changes: 5 additions & 5 deletions ...s/component-groups/examples/MultiContentCard/MultiContentCardExpandableDividerExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from '@patternfly/react-core';
import { ArrowRightIcon, BellIcon, CogIcon, LockIcon } from '@patternfly/react-icons';
import { createUseStyles } from 'react-jss';
import clsx from 'clsx';
import { css } from '@patternfly/react-styles';

const useStyles = createUseStyles({
action: {
Expand All @@ -38,7 +38,7 @@ export const BasicExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Getting Started</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<CogIcon className={classes.actionIcon} />
</Icon>
Expand All @@ -50,7 +50,7 @@ export const BasicExample: FunctionComponent = () => {
</Content>
</CardBody>
<CardFooter>
<List className={clsx(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<List className={css(classes.bulletPoints, 'pf-v6-u-font-size-sm', 'pf-v6-u-ml-0')}>
<ListItem>
<Button variant="link" isInline>
First link
Expand All @@ -74,7 +74,7 @@ export const BasicExample: FunctionComponent = () => {
-
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<LockIcon className={classes.actionIcon} />
</Icon>
Expand Down Expand Up @@ -107,7 +107,7 @@ export const BasicExample: FunctionComponent = () => {
<Content component={ContentVariants.h4}>Next Steps</Content>
</CardHeader>
<CardBody>
<Content className={clsx(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Content className={css(classes.action, 'pf-v6-u-font-weight-bold', 'pf-v6-u-mb-sm')}>
<Icon size="md" className="pf-v6-u-pl-sm pf-v6-u-pr-md">
<BellIcon className={classes.actionIcon} />
</Icon>
Expand Down
Loading
Loading