Skip to content

Commit e795e7b

Browse files
mcokermcoker
authored
fix: update with unified tokens (#318)
1 parent f45bdac commit e795e7b

37 files changed

Lines changed: 2427 additions & 2104 deletions

‎packages/demo-app-ts/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"serve:demo-app": "node scripts/serve"
1010
},
1111
"dependencies": {
12-
"@patternfly/react-core": "^6.4.0",
13-
"@patternfly/react-icons": "^6.4.0",
14-
"@patternfly/react-styles": "^6.4.0",
12+
"@patternfly/react-core": "^6.5.1",
13+
"@patternfly/react-icons": "^6.5.1",
14+
"@patternfly/react-styles": "^6.5.1",
1515
"react": "^18",
1616
"react-dom": "^18",
1717
"react-router": "^5.3.3",

‎packages/demo-app-ts/src/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
MastheadBrand,
2525
ToolbarContent
2626
} from '@patternfly/react-core';
27-
import { BarsIcon } from '@patternfly/react-icons/dist/esm/icons/bars-icon';
27+
import { RhUiMenuBarsIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-menu-bars-icon';
2828
import imgBrand from './assets/images/imgBrand.svg';
2929
import imgAvatar from './assets/images/imgAvatar.svg';
3030
import Demos from './Demos';
@@ -165,7 +165,7 @@ class App extends Component<{}, AppState> {
165165
isSidebarOpen={isNavOpen}
166166
onSidebarToggle={() => this.setState({ isNavOpen: !isNavOpen })}
167167
>
168-
<BarsIcon />
168+
<RhUiMenuBarsIcon />
169169
</PageToggleButton>
170170
</MastheadToggle>
171171
<MastheadBrand>

‎packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {
1616
WithSelectionProps
1717
} from '@patternfly/react-topology';
1818
import { PopoverProps } from '@patternfly/react-core';
19-
import { CubeIcon } from '@patternfly/react-icons/dist/esm/icons/cube-icon';
20-
import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
19+
import { RhUiCubesIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
20+
import { RhUiExternalLinkIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-external-link-icon';
2121
import { logos } from '../../utils/logos';
2222
import { PipelineDemoContext } from './PipelineDemoContext';
2323

@@ -32,9 +32,9 @@ const DEMO_TIP_TEXT =
3232
const getLeadIcon = (taskJobType: string) => {
3333
switch (taskJobType) {
3434
case 'cubes':
35-
return <CubeIcon width={16} height={16} />;
35+
return <RhUiCubesIcon width={16} height={16} />;
3636
case 'link':
37-
return <ExternalLinkAltIcon width={16} height={16} />;
37+
return <RhUiExternalLinkIcon width={16} height={16} />;
3838
default:
3939
return null;
4040
}

‎packages/demo-app-ts/src/demos/statusConnectorsDemo/StatusConnectorNode.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { observer } from 'mobx-react';
33
import { css } from '@patternfly/react-styles';
44
import styles from '@patternfly/react-topology/dist/esm/css/topology-components';
55
import { AnchorEnd, GraphElement, Node, Rectangle, useCombineRefs, useSize } from '@patternfly/react-topology';
6-
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
7-
import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
6+
import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
7+
import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
88
import { useSourceStatusAnchor } from './useSourceStatusAnchor';
99
import { useTargetStatusAnchor } from './useTargetStatusAnchor';
1010

@@ -101,7 +101,7 @@ const StatusConnectorNode: React.FunctionComponent<StatusConnectorNodeProps> = (
101101
style={{ fontSize: `${iconRadius * 2}px` }}
102102
>
103103
<g className={css(styles.topologyNodeDecoratorStatus)}>
104-
<CheckCircleIcon className="pf-m-success" />
104+
<RhUiCheckCircleFillIcon className="pf-m-success" />
105105
</g>
106106
</g>
107107
</g>
@@ -121,7 +121,7 @@ const StatusConnectorNode: React.FunctionComponent<StatusConnectorNodeProps> = (
121121
style={{ fontSize: `${iconRadius * 2}px` }}
122122
>
123123
<g className={css(styles.topologyNodeDecoratorStatus)}>
124-
<ExclamationCircleIcon className="pf-m-danger" />
124+
<RhUiErrorFillIcon className="pf-m-danger" />
125125
</g>
126126
</g>
127127
</g>

‎packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import {
1010
WithDragNodeProps,
1111
WithSelectionProps
1212
} from '@patternfly/react-topology';
13-
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
14-
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
13+
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
14+
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
1515

1616
const ICON_PADDING = 20;
1717

@@ -47,9 +47,9 @@ const StyleGroup: React.FunctionComponent<StyleGroupProps> = ({
4747
const getTypeIcon = (dataType?: DataTypes): any => {
4848
switch (dataType) {
4949
case DataTypes.Alternate:
50-
return AlternateIcon;
50+
return RhUiRegionsIcon;
5151
default:
52-
return DefaultIcon;
52+
return RhUiCubesIcon;
5353
}
5454
};
5555

‎packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import {
2121
WithDragNodeProps,
2222
WithSelectionProps
2323
} from '@patternfly/react-topology';
24-
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
25-
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
26-
import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
27-
import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
28-
import PauseCircle from '@patternfly/react-icons/dist/esm/icons/pause-circle-icon';
29-
import Thumbtack from '@patternfly/react-icons/dist/esm/icons/thumbtack-icon';
24+
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
25+
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
26+
import RhUiFolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';
27+
import RhUiBlueprintIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-blueprint-icon';
28+
import RhUiPauseCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-pause-circle-fill-icon';
29+
import RhUiThumbtackIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-thumbtack-fill-icon';
3030
import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
3131

3232
export enum DataTypes {
@@ -52,9 +52,9 @@ type StyleNodeProps = {
5252
const getTypeIcon = (dataType?: DataTypes): any => {
5353
switch (dataType) {
5454
case DataTypes.Alternate:
55-
return AlternateIcon;
55+
return RhUiRegionsIcon;
5656
default:
57-
return DefaultIcon;
57+
return RhUiCubesIcon;
5858
}
5959
};
6060

@@ -111,11 +111,11 @@ const renderDecorators = (
111111
return (
112112
<>
113113
{!nodeStatus || nodeStatus === NodeStatus.default
114-
? renderDecorator(element, TopologyQuadrant.upperLeft, <FolderOpenIcon />, getShapeDecoratorCenter)
114+
? renderDecorator(element, TopologyQuadrant.upperLeft, <RhUiFolderOpenIcon />, getShapeDecoratorCenter)
115115
: null}
116-
{renderDecorator(element, TopologyQuadrant.upperRight, <BlueprintIcon />, getShapeDecoratorCenter)}
117-
{renderDecorator(element, TopologyQuadrant.lowerLeft, <PauseCircle />, getShapeDecoratorCenter)}
118-
{renderDecorator(element, TopologyQuadrant.lowerRight, <Thumbtack />, getShapeDecoratorCenter)}
116+
{renderDecorator(element, TopologyQuadrant.upperRight, <RhUiBlueprintIcon />, getShapeDecoratorCenter)}
117+
{renderDecorator(element, TopologyQuadrant.lowerLeft, <RhUiPauseCircleIcon />, getShapeDecoratorCenter)}
118+
{renderDecorator(element, TopologyQuadrant.lowerRight, <RhUiThumbtackIcon />, getShapeDecoratorCenter)}
119119
</>
120120
);
121121
};

‎packages/demo-app-ts/src/demos/topologyPackageDemo/DemoGroup.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {
99
WithDragNodeProps,
1010
WithSelectionProps
1111
} from '@patternfly/react-topology';
12-
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
13-
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
12+
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
13+
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
1414
import { DemoContext } from './DemoContext';
1515
import { DataTypes, DEFAULT_NODE_SIZE } from './generator';
1616

@@ -31,9 +31,9 @@ const DemoGroup: React.FunctionComponent<DemoGroupProps> = ({ element, onContext
3131
const getTypeIcon = (dataType?: DataTypes): any => {
3232
switch (dataType) {
3333
case DataTypes.Alternate:
34-
return AlternateIcon;
34+
return RhUiRegionsIcon;
3535
default:
36-
return DefaultIcon;
36+
return RhUiCubesIcon;
3737
}
3838
};
3939

‎packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import {
2828
WithDragNodeProps,
2929
WithSelectionProps
3030
} from '@patternfly/react-topology';
31-
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
32-
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
33-
import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
34-
import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
35-
import PauseCircle from '@patternfly/react-icons/dist/esm/icons/pause-circle-icon';
36-
import Thumbtack from '@patternfly/react-icons/dist/esm/icons/thumbtack-icon';
37-
import SignOutAltIcon from '@patternfly/react-icons/dist/esm/icons/skull-icon';
31+
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
32+
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
33+
import RhUiFolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';
34+
import RhUiBlueprintIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-blueprint-icon';
35+
import RhUiPauseCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-pause-circle-fill-icon';
36+
import RhUiThumbtackIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-thumbtack-fill-icon';
37+
import RhUiExperimentalIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-experimental-icon';
3838
import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
3939
import { DataTypes, GeneratedNodeData, GeneratorNodeOptions } from './generator';
4040
import { DemoContext } from './DemoContext';
@@ -59,9 +59,9 @@ type DemoNodeProps = {
5959
const getTypeIcon = (dataType?: DataTypes): any => {
6060
switch (dataType) {
6161
case DataTypes.Alternate:
62-
return AlternateIcon;
62+
return RhUiRegionsIcon;
6363
default:
64-
return DefaultIcon;
64+
return RhUiCubesIcon;
6565
}
6666
};
6767

@@ -115,11 +115,11 @@ const renderDecorators = (
115115
return (
116116
<>
117117
{!options.showStatus || data.status === NodeStatus.default
118-
? renderDecorator(element, TopologyQuadrant.upperLeft, <FolderOpenIcon />, getShapeDecoratorCenter)
118+
? renderDecorator(element, TopologyQuadrant.upperLeft, <RhUiFolderOpenIcon />, getShapeDecoratorCenter)
119119
: null}
120-
{renderDecorator(element, TopologyQuadrant.upperRight, <BlueprintIcon />, getShapeDecoratorCenter)}
121-
{renderDecorator(element, TopologyQuadrant.lowerLeft, <PauseCircle />, getShapeDecoratorCenter)}
122-
{renderDecorator(element, TopologyQuadrant.lowerRight, <Thumbtack />, getShapeDecoratorCenter)}
120+
{renderDecorator(element, TopologyQuadrant.upperRight, <RhUiBlueprintIcon />, getShapeDecoratorCenter)}
121+
{renderDecorator(element, TopologyQuadrant.lowerLeft, <RhUiPauseCircleIcon />, getShapeDecoratorCenter)}
122+
{renderDecorator(element, TopologyQuadrant.lowerRight, <RhUiThumbtackIcon />, getShapeDecoratorCenter)}
123123
</>
124124
);
125125
};
@@ -162,7 +162,7 @@ const DemoNode: React.FunctionComponent<DemoNodeProps> = observer(
162162
}, [detailsLevel, onHideCreateConnector]);
163163

164164
const labelIconClass = data.index % 2 === 0 && logos.get('icon-java');
165-
const LabelIcon = data.index % 2 === 1 ? (SignOutAltIcon as any) : undefined;
165+
const LabelIcon = data.index % 2 === 1 ? (RhUiExperimentalIcon as any) : undefined;
166166

167167
return (
168168
<Layer id={focused ? TOP_LAYER : DEFAULT_LAYER}>

‎packages/module/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
},
3535
"dependencies": {
3636
"@dagrejs/dagre": "1.1.2",
37-
"@patternfly/react-core": "^6.4.0",
38-
"@patternfly/react-icons": "^6.4.0",
39-
"@patternfly/react-styles": "^6.4.0",
37+
"@patternfly/react-core": "^6.5.1",
38+
"@patternfly/react-icons": "^6.5.1",
39+
"@patternfly/react-styles": "^6.5.1",
4040
"@types/d3": "^7.4.0",
4141
"@types/d3-force": "^1.2.1",
4242
"d3": "^7.8.0",
@@ -52,11 +52,11 @@
5252
"react-dom": "^17 || ^18 || ^19"
5353
},
5454
"devDependencies": {
55-
"@patternfly/documentation-framework": "^6.24.2",
56-
"@patternfly/patternfly": "^6.4.0",
55+
"@patternfly/documentation-framework": "^6.44.0",
56+
"@patternfly/patternfly": "^6.5.2",
5757
"@patternfly/patternfly-a11y": "^4.3.1",
58-
"@patternfly/react-code-editor": "^6.4.0",
59-
"@patternfly/react-table": "^6.4.0",
58+
"@patternfly/react-code-editor": "^6.5.1",
59+
"@patternfly/react-table": "^6.5.1",
6060
"@types/react": "^18.0.0",
6161
"@types/react-dom": "^18.0.0",
6262
"camel-case": "^3.0.0",

‎packages/module/patternfly-docs/content/examples/AboutTopology.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import {
2222
VisualizationProvider,
2323
VisualizationSurface
2424
} from '@patternfly/react-topology';
25-
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
26-
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
25+
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
26+
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';
2727

2828
import './topology-example.css';
2929

0 commit comments

Comments
 (0)