Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/demo-app-ts/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
MastheadBrand,
ToolbarContent
} from '@patternfly/react-core';
import { BarsIcon } from '@patternfly/react-icons/dist/esm/icons/bars-icon';
import { RhUiMenuBarsIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-menu-bars-icon';
import imgBrand from './assets/images/imgBrand.svg';
import imgAvatar from './assets/images/imgAvatar.svg';
import Demos from './Demos';
Expand Down Expand Up @@ -165,7 +165,7 @@ class App extends Component<{}, AppState> {
isSidebarOpen={isNavOpen}
onSidebarToggle={() => this.setState({ isNavOpen: !isNavOpen })}
>
<BarsIcon />
<RhUiMenuBarsIcon />
</PageToggleButton>
</MastheadToggle>
<MastheadBrand>
Expand Down
8 changes: 4 additions & 4 deletions packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
WithSelectionProps
} from '@patternfly/react-topology';
import { PopoverProps } from '@patternfly/react-core';
import { CubeIcon } from '@patternfly/react-icons/dist/esm/icons/cube-icon';
import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon';
import { RhUiCubesIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
import { RhUiExternalLinkIcon } from '@patternfly/react-icons/dist/esm/icons/rh-ui-external-link-icon';
import { logos } from '../../utils/logos';
import { PipelineDemoContext } from './PipelineDemoContext';

Expand All @@ -32,9 +32,9 @@ const DEMO_TIP_TEXT =
const getLeadIcon = (taskJobType: string) => {
switch (taskJobType) {
case 'cubes':
return <CubeIcon width={16} height={16} />;
return <RhUiCubesIcon width={16} height={16} />;
case 'link':
return <ExternalLinkAltIcon width={16} height={16} />;
return <RhUiExternalLinkIcon width={16} height={16} />;
default:
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { observer } from 'mobx-react';
import { css } from '@patternfly/react-styles';
import styles from '@patternfly/react-topology/dist/esm/css/topology-components';
import { AnchorEnd, GraphElement, Node, Rectangle, useCombineRefs, useSize } from '@patternfly/react-topology';
import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon';
import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon';
import { useSourceStatusAnchor } from './useSourceStatusAnchor';
import { useTargetStatusAnchor } from './useTargetStatusAnchor';

Expand Down Expand Up @@ -101,7 +101,7 @@ const StatusConnectorNode: React.FunctionComponent<StatusConnectorNodeProps> = (
style={{ fontSize: `${iconRadius * 2}px` }}
>
<g className={css(styles.topologyNodeDecoratorStatus)}>
<CheckCircleIcon className="pf-m-success" />
<RhUiCheckCircleFillIcon className="pf-m-success" />
</g>
</g>
</g>
Expand All @@ -121,7 +121,7 @@ const StatusConnectorNode: React.FunctionComponent<StatusConnectorNodeProps> = (
style={{ fontSize: `${iconRadius * 2}px` }}
>
<g className={css(styles.topologyNodeDecoratorStatus)}>
<ExclamationCircleIcon className="pf-m-danger" />
<RhUiErrorFillIcon className="pf-m-danger" />
</g>
</g>
</g>
Expand Down
8 changes: 4 additions & 4 deletions packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
WithDragNodeProps,
WithSelectionProps
} from '@patternfly/react-topology';
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';

const ICON_PADDING = 20;

Expand Down Expand Up @@ -47,9 +47,9 @@ const StyleGroup: React.FunctionComponent<StyleGroupProps> = ({
const getTypeIcon = (dataType?: DataTypes): any => {
switch (dataType) {
case DataTypes.Alternate:
return AlternateIcon;
return RhUiRegionsIcon;
default:
return DefaultIcon;
return RhUiCubesIcon;
}
};

Expand Down
24 changes: 12 additions & 12 deletions packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import {
WithDragNodeProps,
WithSelectionProps
} from '@patternfly/react-topology';
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
import PauseCircle from '@patternfly/react-icons/dist/esm/icons/pause-circle-icon';
import Thumbtack from '@patternfly/react-icons/dist/esm/icons/thumbtack-icon';
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import RhUiFolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';
import RhUiBlueprintIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-blueprint-icon';
import RhUiPauseCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-pause-circle-fill-icon';
import RhUiThumbtackIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-thumbtack-fill-icon';
import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';

export enum DataTypes {
Expand All @@ -52,9 +52,9 @@ type StyleNodeProps = {
const getTypeIcon = (dataType?: DataTypes): any => {
switch (dataType) {
case DataTypes.Alternate:
return AlternateIcon;
return RhUiRegionsIcon;
default:
return DefaultIcon;
return RhUiCubesIcon;
}
};

Expand Down Expand Up @@ -111,11 +111,11 @@ const renderDecorators = (
return (
<>
{!nodeStatus || nodeStatus === NodeStatus.default
? renderDecorator(element, TopologyQuadrant.upperLeft, <FolderOpenIcon />, getShapeDecoratorCenter)
? renderDecorator(element, TopologyQuadrant.upperLeft, <RhUiFolderOpenIcon />, getShapeDecoratorCenter)
: null}
{renderDecorator(element, TopologyQuadrant.upperRight, <BlueprintIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerLeft, <PauseCircle />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerRight, <Thumbtack />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.upperRight, <RhUiBlueprintIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerLeft, <RhUiPauseCircleIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerRight, <RhUiThumbtackIcon />, getShapeDecoratorCenter)}
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
WithDragNodeProps,
WithSelectionProps
} from '@patternfly/react-topology';
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
import { DemoContext } from './DemoContext';
import { DataTypes, DEFAULT_NODE_SIZE } from './generator';

Expand All @@ -31,9 +31,9 @@ const DemoGroup: React.FunctionComponent<DemoGroupProps> = ({ element, onContext
const getTypeIcon = (dataType?: DataTypes): any => {
switch (dataType) {
case DataTypes.Alternate:
return AlternateIcon;
return RhUiRegionsIcon;
default:
return DefaultIcon;
return RhUiCubesIcon;
}
};

Expand Down
24 changes: 12 additions & 12 deletions packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import {
WithDragNodeProps,
WithSelectionProps
} from '@patternfly/react-topology';
import DefaultIcon from '@patternfly/react-icons/dist/esm/icons/builder-image-icon';
import AlternateIcon from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import FolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon';
import PauseCircle from '@patternfly/react-icons/dist/esm/icons/pause-circle-icon';
import Thumbtack from '@patternfly/react-icons/dist/esm/icons/thumbtack-icon';
import RhUiCubesIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-cubes-icon';
import RhUiRegionsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import RhUiFolderOpenIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';
import RhUiBlueprintIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-blueprint-icon';
import RhUiPauseCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-pause-circle-fill-icon';
import RhUiThumbtackIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-thumbtack-fill-icon';
import SignOutAltIcon from '@patternfly/react-icons/dist/esm/icons/skull-icon';
import { SVGIconProps } from '@patternfly/react-icons/dist/esm/createIcon';
import { DataTypes, GeneratedNodeData, GeneratorNodeOptions } from './generator';
Expand All @@ -59,9 +59,9 @@ type DemoNodeProps = {
const getTypeIcon = (dataType?: DataTypes): any => {
switch (dataType) {
case DataTypes.Alternate:
return AlternateIcon;
return RhUiRegionsIcon;
default:
return DefaultIcon;
return RhUiCubesIcon;
}
};

Expand Down Expand Up @@ -115,11 +115,11 @@ const renderDecorators = (
return (
<>
{!options.showStatus || data.status === NodeStatus.default
? renderDecorator(element, TopologyQuadrant.upperLeft, <FolderOpenIcon />, getShapeDecoratorCenter)
? renderDecorator(element, TopologyQuadrant.upperLeft, <RhUiFolderOpenIcon />, getShapeDecoratorCenter)
: null}
{renderDecorator(element, TopologyQuadrant.upperRight, <BlueprintIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerLeft, <PauseCircle />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerRight, <Thumbtack />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.upperRight, <RhUiBlueprintIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerLeft, <RhUiPauseCircleIcon />, getShapeDecoratorCenter)}
{renderDecorator(element, TopologyQuadrant.lowerRight, <RhUiThumbtackIcon />, getShapeDecoratorCenter)}
</>
);
};
Expand Down
14 changes: 7 additions & 7 deletions packages/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
},
"dependencies": {
"@dagrejs/dagre": "1.1.2",
"@patternfly/react-core": "^6.4.0",
"@patternfly/react-icons": "^6.4.0",
"@patternfly/react-styles": "^6.4.0",
"@patternfly/react-core": "^6.5.1",
"@patternfly/react-icons": "^6.5.1",
"@patternfly/react-styles": "^6.5.1",
"@types/d3": "^7.4.0",
"@types/d3-force": "^1.2.1",
"d3": "^7.8.0",
Expand All @@ -52,11 +52,11 @@
"react-dom": "^17 || ^18 || ^19"
},
"devDependencies": {
"@patternfly/documentation-framework": "^6.24.2",
"@patternfly/patternfly": "^6.4.0",
"@patternfly/documentation-framework": "^6.44.0",
"@patternfly/patternfly": "^6.5.2",
"@patternfly/patternfly-a11y": "^4.3.1",
"@patternfly/react-code-editor": "^6.4.0",
"@patternfly/react-table": "^6.4.0",
"@patternfly/react-code-editor": "^6.5.1",
"@patternfly/react-table": "^6.5.1",
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"camel-case": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import {
VisualizationProvider,
VisualizationSurface
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
withContextMenu
} from '@patternfly/react-topology';

import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import './topology-example.css';

# Introduction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ VisualizationSurface,
withPanZoom,
withSelection
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import {
withDragNode,
withSelection
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
VisualizationProvider,
VisualizationSurface
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ withPanZoom,
withSelection,
withTargetDrag,
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import {
DropdownItem,
DropdownList,
} from '@patternfly/react-core';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
VisualizationSurface,
withPanZoom
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import {
VisualizationSurface,
withSelection
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import {
VisualizationSurface,
withSelection
} from '@patternfly/react-topology';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import {
SelectOption,
ToolbarItem
} from '@patternfly/react-core';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/folder-open-icon';
import Icon1 from '@patternfly/react-icons/dist/esm/icons/rh-ui-regions-icon';
import Icon2 from '@patternfly/react-icons/dist/esm/icons/rh-ui-folder-open-icon';

import './topology-example.css';

Expand Down
6 changes: 3 additions & 3 deletions packages/module/src/components/DefaultCreateConnector.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useRef } from 'react';
import { css } from '@patternfly/react-styles';
import styles from '../css/topology-components';
import AddCircleOIcon from '@patternfly/react-icons/dist/esm/icons/add-circle-o-icon';
import RhUiAddCircleIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-circle-icon';
import { Tooltip } from '@patternfly/react-core';
import Point from '../geom/Point';
import ConnectorArrow from './edges/terminals/ConnectorArrow';
Expand Down Expand Up @@ -65,14 +65,14 @@ const DefaultCreateConnector: React.FunctionComponent<DefaultCreateConnectorProp
exitDelay={0}
triggerRef={iconRef}
>
<AddCircleOIcon
<RhUiAddCircleIcon
className={css(styles.topologyDefaultCreateConnectorCreateCursor)}
style={{ fontSize: cursorSize }}
ref={iconRef}
/>
</Tooltip>
) : (
<AddCircleOIcon
<RhUiAddCircleIcon
className={css(styles.topologyDefaultCreateConnectorCreateCursor)}
style={{ fontSize: cursorSize }}
/>
Expand Down
Loading
Loading