diff --git a/packages/demo-app-ts/src/App.tsx b/packages/demo-app-ts/src/App.tsx index 9306f5a7..bd532734 100755 --- a/packages/demo-app-ts/src/App.tsx +++ b/packages/demo-app-ts/src/App.tsx @@ -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'; @@ -165,7 +165,7 @@ class App extends Component<{}, AppState> { isSidebarOpen={isNavOpen} onSidebarToggle={() => this.setState({ isNavOpen: !isNavOpen })} > - + diff --git a/packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx b/packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx index b3f7aeeb..d21fb405 100644 --- a/packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx +++ b/packages/demo-app-ts/src/demos/pipelinesDemo/DemoTaskNode.tsx @@ -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'; @@ -32,9 +32,9 @@ const DEMO_TIP_TEXT = const getLeadIcon = (taskJobType: string) => { switch (taskJobType) { case 'cubes': - return ; + return ; case 'link': - return ; + return ; default: return null; } diff --git a/packages/demo-app-ts/src/demos/statusConnectorsDemo/StatusConnectorNode.tsx b/packages/demo-app-ts/src/demos/statusConnectorsDemo/StatusConnectorNode.tsx index 03b40e75..c5982fc2 100644 --- a/packages/demo-app-ts/src/demos/statusConnectorsDemo/StatusConnectorNode.tsx +++ b/packages/demo-app-ts/src/demos/statusConnectorsDemo/StatusConnectorNode.tsx @@ -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'; @@ -101,7 +101,7 @@ const StatusConnectorNode: React.FunctionComponent = ( style={{ fontSize: `${iconRadius * 2}px` }} > - + @@ -121,7 +121,7 @@ const StatusConnectorNode: React.FunctionComponent = ( style={{ fontSize: `${iconRadius * 2}px` }} > - + diff --git a/packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx b/packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx index a2d0f995..f9db8d2e 100644 --- a/packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx +++ b/packages/demo-app-ts/src/demos/stylesDemo/StyleGroup.tsx @@ -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; @@ -47,9 +47,9 @@ const StyleGroup: React.FunctionComponent = ({ const getTypeIcon = (dataType?: DataTypes): any => { switch (dataType) { case DataTypes.Alternate: - return AlternateIcon; + return RhUiRegionsIcon; default: - return DefaultIcon; + return RhUiCubesIcon; } }; diff --git a/packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx b/packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx index 09af4cc1..471467e5 100644 --- a/packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx +++ b/packages/demo-app-ts/src/demos/stylesDemo/StyleNode.tsx @@ -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 { @@ -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; } }; @@ -111,11 +111,11 @@ const renderDecorators = ( return ( <> {!nodeStatus || nodeStatus === NodeStatus.default - ? renderDecorator(element, TopologyQuadrant.upperLeft, , getShapeDecoratorCenter) + ? renderDecorator(element, TopologyQuadrant.upperLeft, , getShapeDecoratorCenter) : null} - {renderDecorator(element, TopologyQuadrant.upperRight, , getShapeDecoratorCenter)} - {renderDecorator(element, TopologyQuadrant.lowerLeft, , getShapeDecoratorCenter)} - {renderDecorator(element, TopologyQuadrant.lowerRight, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.upperRight, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.lowerLeft, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.lowerRight, , getShapeDecoratorCenter)} ); }; diff --git a/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoGroup.tsx b/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoGroup.tsx index 0599bd6d..b2659a00 100644 --- a/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoGroup.tsx +++ b/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoGroup.tsx @@ -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'; @@ -31,9 +31,9 @@ const DemoGroup: React.FunctionComponent = ({ element, onContext const getTypeIcon = (dataType?: DataTypes): any => { switch (dataType) { case DataTypes.Alternate: - return AlternateIcon; + return RhUiRegionsIcon; default: - return DefaultIcon; + return RhUiCubesIcon; } }; diff --git a/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx b/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx index aa834ea6..4aee5002 100644 --- a/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx +++ b/packages/demo-app-ts/src/demos/topologyPackageDemo/DemoNode.tsx @@ -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'; @@ -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; } }; @@ -115,11 +115,11 @@ const renderDecorators = ( return ( <> {!options.showStatus || data.status === NodeStatus.default - ? renderDecorator(element, TopologyQuadrant.upperLeft, , getShapeDecoratorCenter) + ? renderDecorator(element, TopologyQuadrant.upperLeft, , getShapeDecoratorCenter) : null} - {renderDecorator(element, TopologyQuadrant.upperRight, , getShapeDecoratorCenter)} - {renderDecorator(element, TopologyQuadrant.lowerLeft, , getShapeDecoratorCenter)} - {renderDecorator(element, TopologyQuadrant.lowerRight, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.upperRight, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.lowerLeft, , getShapeDecoratorCenter)} + {renderDecorator(element, TopologyQuadrant.lowerRight, , getShapeDecoratorCenter)} ); }; diff --git a/packages/module/package.json b/packages/module/package.json index a40b99f9..30f354d7 100644 --- a/packages/module/package.json +++ b/packages/module/package.json @@ -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", @@ -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", diff --git a/packages/module/patternfly-docs/content/examples/AboutTopology.md b/packages/module/patternfly-docs/content/examples/AboutTopology.md index aa8391eb..f49c3aa4 100644 --- a/packages/module/patternfly-docs/content/examples/AboutTopology.md +++ b/packages/module/patternfly-docs/content/examples/AboutTopology.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyContextMenu.md b/packages/module/patternfly-docs/content/examples/TopologyContextMenu.md index 8e5e8a87..d2073b5f 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyContextMenu.md +++ b/packages/module/patternfly-docs/content/examples/TopologyContextMenu.md @@ -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 diff --git a/packages/module/patternfly-docs/content/examples/TopologyControlBar.md b/packages/module/patternfly-docs/content/examples/TopologyControlBar.md index 217eef91..444a0fce 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyControlBar.md +++ b/packages/module/patternfly-docs/content/examples/TopologyControlBar.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyCustomEdges.md b/packages/module/patternfly-docs/content/examples/TopologyCustomEdges.md index 60e999da..5222ef43 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyCustomEdges.md +++ b/packages/module/patternfly-docs/content/examples/TopologyCustomEdges.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyCustomNodes.md b/packages/module/patternfly-docs/content/examples/TopologyCustomNodes.md index 48c6ca67..1e6786f3 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyCustomNodes.md +++ b/packages/module/patternfly-docs/content/examples/TopologyCustomNodes.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyDragDropDemo.md b/packages/module/patternfly-docs/content/examples/TopologyDragDropDemo.md index 0ffce6df..f738d9ea 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyDragDropDemo.md +++ b/packages/module/patternfly-docs/content/examples/TopologyDragDropDemo.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyLayouts.md b/packages/module/patternfly-docs/content/examples/TopologyLayouts.md index 7b422902..9d8434a5 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyLayouts.md +++ b/packages/module/patternfly-docs/content/examples/TopologyLayouts.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyPanZoom.md b/packages/module/patternfly-docs/content/examples/TopologyPanZoom.md index 3d28c124..cda74280 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyPanZoom.md +++ b/packages/module/patternfly-docs/content/examples/TopologyPanZoom.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologySelectable.md b/packages/module/patternfly-docs/content/examples/TopologySelectable.md index a9946c8b..a1d90059 100644 --- a/packages/module/patternfly-docs/content/examples/TopologySelectable.md +++ b/packages/module/patternfly-docs/content/examples/TopologySelectable.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologySidebar.md b/packages/module/patternfly-docs/content/examples/TopologySidebar.md index e8cc3e23..1b7329c3 100644 --- a/packages/module/patternfly-docs/content/examples/TopologySidebar.md +++ b/packages/module/patternfly-docs/content/examples/TopologySidebar.md @@ -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'; diff --git a/packages/module/patternfly-docs/content/examples/TopologyToolbar.md b/packages/module/patternfly-docs/content/examples/TopologyToolbar.md index fb5ea606..e0d3dcd1 100644 --- a/packages/module/patternfly-docs/content/examples/TopologyToolbar.md +++ b/packages/module/patternfly-docs/content/examples/TopologyToolbar.md @@ -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'; diff --git a/packages/module/src/components/DefaultCreateConnector.tsx b/packages/module/src/components/DefaultCreateConnector.tsx index a3565b6d..2d969f2f 100644 --- a/packages/module/src/components/DefaultCreateConnector.tsx +++ b/packages/module/src/components/DefaultCreateConnector.tsx @@ -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'; @@ -65,14 +65,14 @@ const DefaultCreateConnector: React.FunctionComponent - ) : ( - diff --git a/packages/module/src/components/DefaultRemoveConnector.tsx b/packages/module/src/components/DefaultRemoveConnector.tsx index e35e4b24..c4e06f62 100644 --- a/packages/module/src/components/DefaultRemoveConnector.tsx +++ b/packages/module/src/components/DefaultRemoveConnector.tsx @@ -1,6 +1,6 @@ import { useRef } from 'react'; import { Tooltip, TooltipPosition } from '@patternfly/react-core'; -import TrashIcon from '@patternfly/react-icons/dist/esm/icons/trash-icon'; +import RhUiTrashIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-trash-icon'; import Point from '../geom/Point'; interface DefaultRemoveConnectorProps { @@ -50,7 +50,7 @@ const DefaultRemoveConnector: React.FunctionComponent - + diff --git a/packages/module/src/components/TopologyControlBar/TopologyControlBar.tsx b/packages/module/src/components/TopologyControlBar/TopologyControlBar.tsx index d1fa02a9..b668bf70 100644 --- a/packages/module/src/components/TopologyControlBar/TopologyControlBar.tsx +++ b/packages/module/src/components/TopologyControlBar/TopologyControlBar.tsx @@ -7,12 +7,12 @@ import { GenerateId, Tooltip } from '@patternfly/react-core'; -import ExpandIcon from '@patternfly/react-icons/dist/esm/icons/expand-icon'; -import ExpandArrowsAltIcon from '@patternfly/react-icons/dist/esm/icons/expand-arrows-alt-icon'; -import SearchPlusIcon from '@patternfly/react-icons/dist/esm/icons/search-plus-icon'; -import SearchMinusIcon from '@patternfly/react-icons/dist/esm/icons/search-minus-icon'; -import CollapseIcon from '@patternfly/react-icons/dist/esm/icons/compress-alt-icon'; -import ExpandAltIcon from '@patternfly/react-icons/dist/esm/icons/expand-alt-icon'; +import RhUiExpandIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-expand-icon'; +import RhUiExpandArrowsIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-expand-arrows-icon'; +import RhUiZoomInIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-zoom-in-icon'; +import RhUiZoomOutIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-zoom-out-icon'; +import RhUiArrowDownLeftUpRightToCenterIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-arrow-down-left-up-right-to-center-icon'; +import RhUiArrowUpRightDownLeftFromCenterIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-arrow-up-right-down-left-from-center-icon'; import '../../css/topology-controlbar'; @@ -100,7 +100,7 @@ export interface TopologyControlButtonsOptions { /* Default options for creating control buttons */ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { zoomIn: true, - zoomInIcon: , + zoomInIcon: , zoomInTip: 'Zoom In', zoomInAriaLabel: 'Zoom In', zoomInCallback: null, @@ -108,7 +108,7 @@ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { zoomInHidden: false, zoomOut: true, - zoomOutIcon: , + zoomOutIcon: , zoomOutTip: 'Zoom Out', zoomOutAriaLabel: 'Zoom Out', zoomOutCallback: null, @@ -116,7 +116,7 @@ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { zoomOutHidden: false, fitToScreen: true, - fitToScreenIcon: , + fitToScreenIcon: , fitToScreenTip: 'Fit to Screen', fitToScreenAriaLabel: 'Fit to Screen', fitToScreenCallback: null, @@ -124,7 +124,7 @@ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { fitToScreenHidden: false, resetView: true, - resetViewIcon: , + resetViewIcon: , resetViewTip: 'Reset View', resetViewAriaLabel: 'Reset View', resetViewCallback: null, @@ -132,7 +132,7 @@ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { resetViewHidden: false, expandAll: false, - expandAllIcon: , + expandAllIcon: , expandAllTip: 'Expand All', expandAllAriaLabel: 'Expand All', expandAllCallback: null, @@ -140,7 +140,7 @@ export const defaultControlButtonsOptions: TopologyControlButtonsOptions = { expandAllHidden: false, collapseAll: false, - collapseAllIcon: , + collapseAllIcon: , collapseAllTip: 'Collapse All', collapseAllAriaLabel: 'Collapse All', collapseAllCallback: null, diff --git a/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap b/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap index 3998afe5..463c5cec 100644 --- a/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap +++ b/packages/module/src/components/TopologyControlBar/__tests__/__snapshots__/TopologyControlBar.test.tsx.snap @@ -4,10 +4,10 @@ exports[`TopologyControlBar should accept button options correctly 1`] = `