Skip to content

Commit a2798bd

Browse files
fix(CopyIcon): Replace CopyIcon with RhUiCopyFillIcon (#12449)
Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 7d594f4 commit a2798bd

15 files changed

Lines changed: 32 additions & 56 deletions

File tree

packages/react-code-editor/src/components/CodeEditor/CodeEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { TooltipPosition } from '@patternfly/react-core/dist/esm/components/Tool
1616
import { getResizeObserver } from '@patternfly/react-core/dist/esm/helpers/resizeObserver';
1717
import Editor, { BeforeMount, EditorProps, Monaco } from '@monaco-editor/react';
1818
import type { editor } from 'monaco-editor';
19-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
19+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
2020
import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
2121
import DownloadIcon from '@patternfly/react-icons/dist/esm/icons/download-icon';
2222
import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
@@ -517,7 +517,7 @@ export const CodeEditor = ({
517517
<CodeEditorContext.Provider value={{ code: value }}>
518518
{isCopyEnabled && (!showEmptyState || !!value) && (
519519
<CodeEditorControl
520-
icon={<CopyIcon />}
520+
icon={<RhUiCopyFillIcon />}
521521
aria-label={copyButtonAriaLabel}
522522
tooltipProps={{
523523
...tooltipProps,

packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,12 @@ exports[`Matches snapshot with control buttons enabled 1`] = `
3939
fill="currentColor"
4040
height="1em"
4141
role="img"
42+
viewBox="0 0 32 32"
4243
width="1em"
4344
>
44-
<svg
45-
class="pf-v6-icon-default"
46-
viewBox="0 0 448 512"
47-
>
48-
<path
49-
d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
50-
/>
51-
</svg>
52-
<svg
53-
class="pf-v6-icon-rh-ui"
54-
viewBox="0 0 32 32"
55-
>
56-
<path
57-
d="M28 7v22.607c0 .768-.622 1.393-1.387 1.393H10a1 1 0 1 1 0-2h16V7a1 1 0 1 1 2 0Zm-6.5 19h-16c-.827 0-1.5-.673-1.5-1.5V8a1.001 1.001 0 0 1 .294-.708l5.998-5.998A1.001 1.001 0 0 1 11 1h10.5c.827 0 1.5.673 1.5 1.5v22c0 .827-.673 1.5-1.5 1.5ZM7.414 7H10V4.414L7.414 7ZM21 3h-9v4.614C12 8.378 11.378 9 10.613 9H6v15h15V3Z"
58-
/>
59-
</svg>
45+
<path
46+
d="M28 7v22.607c0 .768-.622 1.393-1.387 1.393H10a1 1 0 1 1 0-2h16V7a1 1 0 1 1 2 0Zm-5.25 17.5v-22c0-.689-.561-1.25-1.25-1.25h-8.375v7.364c0 .833-.678 1.511-1.512 1.511H4.25V24.5c0 .689.561 1.25 1.25 1.25h16c.689 0 1.25-.561 1.25-1.25ZM10.875 1.275a.738.738 0 0 0-.405.195l-6 6a.738.738 0 0 0-.195.405h6.6v-6.6Z"
47+
/>
6048
</svg>
6149
</span>
6250
</button>

packages/react-core/src/components/Button/examples/Button.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Fragment, useState } from 'react';
1010
import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
1111
import RhUiExternalLinkFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-external-link-fill-icon';
1212
import RhUiAddCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-circle-fill-icon';
13-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
13+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
1414
import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon';
1515
import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
1616
import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';

packages/react-core/src/components/Button/examples/ButtonCircle.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Button, Flex } from '@patternfly/react-core';
22
import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
33
import RhUiAddCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-circle-fill-icon';
4-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
4+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
55
import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
66
import UploadIcon from '@patternfly/react-icons/dist/esm/icons/upload-icon';
77

@@ -48,7 +48,7 @@ export const ButtonCircle: React.FunctionComponent = () => {
4848
aria-label="Add warning circle variant example"
4949
/>
5050
<Button variant="link" isCircle icon={<RhUiAddCircleFillIcon />} aria-label="Add link circle variant example" />
51-
<Button variant="control" isCircle icon={<CopyIcon />} aria-label="Copy control circle variant example" />
51+
<Button variant="control" isCircle icon={<RhUiCopyFillIcon />} aria-label="Copy control circle variant example" />
5252
<Button variant="plain" isCircle icon={<RhMicronsCloseIcon />} aria-label="Remove plain circle variant example" />
5353
<Button
5454
variant="stateful"

packages/react-core/src/components/Button/examples/ButtonDisabled.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Button, Flex } from '@patternfly/react-core';
22
import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
33
import RhUiAddCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-circle-fill-icon';
4-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
4+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
55

66
export const ButtonDisabled: React.FunctionComponent = () => (
77
<>
@@ -41,7 +41,7 @@ export const ButtonDisabled: React.FunctionComponent = () => (
4141
<Button isDisabled variant="control">
4242
Control
4343
</Button>
44-
<Button isDisabled variant="control" aria-label="Copy" icon={<CopyIcon />} />
44+
<Button isDisabled variant="control" aria-label="Copy" icon={<RhUiCopyFillIcon />} />
4545
</Flex>
4646
</>
4747
);

packages/react-core/src/components/Button/examples/ButtonVariations.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Button, Flex } from '@patternfly/react-core';
22
import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon';
33
import RhUiExternalLinkFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-external-link-fill-icon';
44
import RhUiAddCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-add-circle-fill-icon';
5-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
5+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
66
import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
77

88
export const ButtonVariations: React.FunctionComponent = () => (
@@ -46,7 +46,7 @@ export const ButtonVariations: React.FunctionComponent = () => (
4646
<br />
4747
<Flex columnGap={{ default: 'columnGapSm' }}>
4848
<Button variant="control">Control</Button>
49-
<Button variant="control" aria-label="Copy" icon={<CopyIcon />} />
49+
<Button variant="control" aria-label="Copy" icon={<RhUiCopyFillIcon />} />
5050
</Flex>
5151
<br />
5252
<Flex columnGap={{ default: 'columnGapSm' }}>

packages/react-core/src/components/ClipboardCopy/ClipboardCopyButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createRef } from 'react';
2-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
2+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
33
import { Button } from '../Button';
44
import { Tooltip, TooltipPosition } from '../Tooltip';
55

@@ -87,7 +87,7 @@ export const ClipboardCopyButton: React.FunctionComponent<ClipboardCopyButtonPro
8787
aria-label={ariaLabel}
8888
className={className}
8989
id={id}
90-
icon={<CopyIcon />}
90+
icon={<RhUiCopyFillIcon />}
9191
{...props}
9292
ref={triggerRef}
9393
/>

packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,12 @@ exports[`Matches snapshot 1`] = `
4545
fill="currentColor"
4646
height="1em"
4747
role="img"
48+
viewBox="0 0 32 32"
4849
width="1em"
4950
>
50-
<svg
51-
class="pf-v6-icon-default"
52-
viewBox="0 0 448 512"
53-
>
54-
<path
55-
d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"
56-
/>
57-
</svg>
58-
<svg
59-
class="pf-v6-icon-rh-ui"
60-
viewBox="0 0 32 32"
61-
>
62-
<path
63-
d="M28 7v22.607c0 .768-.622 1.393-1.387 1.393H10a1 1 0 1 1 0-2h16V7a1 1 0 1 1 2 0Zm-6.5 19h-16c-.827 0-1.5-.673-1.5-1.5V8a1.001 1.001 0 0 1 .294-.708l5.998-5.998A1.001 1.001 0 0 1 11 1h10.5c.827 0 1.5.673 1.5 1.5v22c0 .827-.673 1.5-1.5 1.5ZM7.414 7H10V4.414L7.414 7ZM21 3h-9v4.614C12 8.378 11.378 9 10.613 9H6v15h15V3Z"
64-
/>
65-
</svg>
51+
<path
52+
d="M28 7v22.607c0 .768-.622 1.393-1.387 1.393H10a1 1 0 1 1 0-2h16V7a1 1 0 1 1 2 0Zm-5.25 17.5v-22c0-.689-.561-1.25-1.25-1.25h-8.375v7.364c0 .833-.678 1.511-1.512 1.511H4.25V24.5c0 .689.561 1.25 1.25 1.25h16c.689 0 1.25-.561 1.25-1.25ZM10.875 1.275a.738.738 0 0 0-.405.195l-6 6a.738.738 0 0 0-.195.405h6.6v-6.6Z"
53+
/>
6654
</svg>
6755
</span>
6856
</button>

packages/react-core/src/components/CodeBlock/examples/CodeBlock.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ propComponents: ['CodeBlock', 'CodeBlockAction', 'CodeBlockCode']
66
---
77

88
import { Fragment, useState } from 'react';
9-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
9+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
1010
import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
1111

1212
**Important note:** to format code exactly as it is, you should use String.raw\`your code here\`.

packages/react-core/src/components/ToggleGroup/examples/ToggleGroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import './toggleGroup.css';
1010
import { useRef, useState } from 'react';
1111
import { ToggleGroup, ToggleGroupItem, Button, Stack, StackItem } from '@patternfly/react-core';
1212
import UndoIcon from '@patternfly/react-icons/dist/esm/icons/undo-icon';
13-
import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon';
13+
import RhUiCopyFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-copy-fill-icon';
1414
import ShareSquareIcon from '@patternfly/react-icons/dist/esm/icons/share-square-icon';
1515

1616
## Examples

0 commit comments

Comments
 (0)