diff --git a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx index 49de0ae2b10..a5f56d87188 100644 --- a/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx +++ b/packages/react-core/src/components/AboutModal/AboutModalBoxCloseButton.tsx @@ -1,7 +1,7 @@ import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/AboutModalBox/about-modal-box'; import { Button } from '../Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export interface AboutModalBoxCloseButtonProps extends React.HTMLProps { /** A callback for when the close button is clicked */ @@ -16,7 +16,7 @@ export const AboutModalBoxCloseButton: React.FunctionComponent (
-
); AboutModalBoxCloseButton.displayName = 'AboutModalBoxCloseButton'; diff --git a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap index 108173c180c..a49f0976bb0 100644 --- a/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap +++ b/packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap @@ -22,24 +22,12 @@ exports[`AboutModalBoxCloseButton Test 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -69,24 +57,12 @@ exports[`AboutModalBoxCloseButton Test close button aria label 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -116,24 +92,12 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/ActionList/examples/ActionList.md b/packages/react-core/src/components/ActionList/examples/ActionList.md index 6c72fb22a53..bf6d0e14a3e 100644 --- a/packages/react-core/src/components/ActionList/examples/ActionList.md +++ b/packages/react-core/src/components/ActionList/examples/ActionList.md @@ -6,7 +6,7 @@ propComponents: ['ActionList', 'ActionListGroup', 'ActionListItem'] --- import { Fragment, useState } from 'react'; -import TimesIcon from '@patternfly/react-icons/dist/js/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/js/icons/rh-microns-close-icon'; import CheckIcon from '@patternfly/react-icons/dist/js/icons/check-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; diff --git a/packages/react-core/src/components/ActionList/examples/ActionListVertical.tsx b/packages/react-core/src/components/ActionList/examples/ActionListVertical.tsx index 92cdb7118d2..c2dfbadd1f9 100644 --- a/packages/react-core/src/components/ActionList/examples/ActionListVertical.tsx +++ b/packages/react-core/src/components/ActionList/examples/ActionListVertical.tsx @@ -1,6 +1,6 @@ import { ActionList, ActionListGroup, ActionListItem, Button } from '@patternfly/react-core'; import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export const ActionListVertical: React.FunctionComponent = () => ( <> @@ -27,7 +27,7 @@ export const ActionListVertical: React.FunctionComponent = () => ( - diff --git a/packages/react-core/src/components/Alert/__tests__/__snapshots__/AlertActionCloseButton.test.tsx.snap b/packages/react-core/src/components/Alert/__tests__/__snapshots__/AlertActionCloseButton.test.tsx.snap index 2568762c47f..c59f313bb6b 100644 --- a/packages/react-core/src/components/Alert/__tests__/__snapshots__/AlertActionCloseButton.test.tsx.snap +++ b/packages/react-core/src/components/Alert/__tests__/__snapshots__/AlertActionCloseButton.test.tsx.snap @@ -28,24 +28,12 @@ exports[`Matches the snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Button/examples/Button.md b/packages/react-core/src/components/Button/examples/Button.md index e0ae6ca1c20..5853cfa525a 100644 --- a/packages/react-core/src/components/Button/examples/Button.md +++ b/packages/react-core/src/components/Button/examples/Button.md @@ -7,7 +7,7 @@ ouia: true --- import { Fragment, useState } from 'react'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import ExternalLinkSquareAltIcon from '@patternfly/react-icons/dist/esm/icons/external-link-square-alt-icon'; import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon'; diff --git a/packages/react-core/src/components/Button/examples/ButtonCircle.tsx b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx index b5d4236b0e0..c01959f21a8 100644 --- a/packages/react-core/src/components/Button/examples/ButtonCircle.tsx +++ b/packages/react-core/src/components/Button/examples/ButtonCircle.tsx @@ -1,5 +1,5 @@ import { Button, Flex } from '@patternfly/react-core'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import CopyIcon from '@patternfly/react-icons/dist/esm/icons/copy-icon'; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; @@ -34,7 +34,7 @@ export const ButtonCircle: React.FunctionComponent = () => { - - @@ -154,24 +142,12 @@ exports[`Drawer has resizable callback and id 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -260,24 +236,12 @@ exports[`Drawer has resizable css and color variants 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -402,24 +366,12 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = false 1`] fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -487,24 +439,12 @@ exports[`Drawer isExpanded = true and isInline = false and isStatic = true 1`] = fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -572,24 +512,12 @@ exports[`Drawer isExpanded = true and isInline = true and isStatic = false 1`] = fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Label/Label.tsx b/packages/react-core/src/components/Label/Label.tsx index 8fd0f643188..a903ad54949 100644 --- a/packages/react-core/src/components/Label/Label.tsx +++ b/packages/react-core/src/components/Label/Label.tsx @@ -6,7 +6,7 @@ import { Tooltip, TooltipPosition } from '../Tooltip'; import { css } from '@patternfly/react-styles'; import { useIsomorphicLayoutEffect } from '../../helpers'; import cssTextMaxWidth from '@patternfly/react-tokens/dist/esm/c_label__text_MaxWidth'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon'; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; @@ -240,7 +240,7 @@ export const Label: React.FunctionComponent = ({ aria-label={closeBtnAriaLabel || `Close ${children}`} {...(isClickableDisabled && { isDisabled: true })} {...closeBtnProps} - icon={} + icon={} /> ); diff --git a/packages/react-core/src/components/Label/LabelGroup.tsx b/packages/react-core/src/components/Label/LabelGroup.tsx index b007e3b1656..9c3cf7275a3 100644 --- a/packages/react-core/src/components/Label/LabelGroup.tsx +++ b/packages/react-core/src/components/Label/LabelGroup.tsx @@ -5,7 +5,7 @@ import { css } from '@patternfly/react-styles'; import { Button } from '../Button'; import { Label } from './Label'; import { Tooltip, TooltipPosition } from '../Tooltip'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { fillTemplate } from '../../helpers'; import { GenerateId } from '../../helpers/GenerateId/GenerateId'; @@ -210,7 +210,7 @@ class LabelGroup extends Component { onClick={onClick} id={`remove_group_${id}`} aria-labelledby={`remove_group_${id} ${id}`} - icon={} + icon={} /> ); diff --git a/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap b/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap index 26fedc9f457..76d25cbf627 100644 --- a/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap +++ b/packages/react-core/src/components/Label/__tests__/__snapshots__/Label.test.tsx.snap @@ -35,24 +35,12 @@ exports[`Label editable label 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -184,24 +172,12 @@ exports[`Label label with close button 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -244,24 +220,12 @@ exports[`Label label with close button and outline variant 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap b/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap index e4ed703036d..df89d7ac90a 100644 --- a/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap +++ b/packages/react-core/src/components/Label/__tests__/__snapshots__/LabelGroup.test.tsx.snap @@ -271,24 +271,12 @@ exports[`LabelGroup label group with closable category 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md index 99cb120b0a5..41663677376 100644 --- a/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md +++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggle.md @@ -11,7 +11,7 @@ import './MenuToggle.css' import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; import imgAvatar from '@patternfly/react-core/src/components/assets/avatarImg.svg'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; ## Examples diff --git a/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx b/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx index 6358c1a6566..7c384689810 100644 --- a/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx +++ b/packages/react-core/src/components/MenuToggle/examples/MenuToggleTypeahead.tsx @@ -6,7 +6,7 @@ import { TextInputGroupUtilities, Button } from '@patternfly/react-core'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export const MenuToggleTypeahead: React.FunctionComponent = () => { const [inputValue, setInputValue] = useState(''); @@ -31,7 +31,7 @@ export const MenuToggleTypeahead: React.FunctionComponent = () => { variant="plain" onClick={() => setInputValue('')} aria-label="Clear input value" - icon={} + icon={} /> )} diff --git a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx index ec508859877..e34c412fa83 100644 --- a/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx +++ b/packages/react-core/src/components/Modal/ModalBoxCloseButton.tsx @@ -1,7 +1,7 @@ import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box'; import { Button } from '../Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { OUIAProps } from '../../helpers'; export interface ModalBoxCloseButtonProps extends OUIAProps { @@ -29,7 +29,7 @@ export const ModalBoxCloseButton: React.FunctionComponent} + icon={} /> ); diff --git a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap index 319d4c524d5..cf21acb282a 100644 --- a/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap +++ b/packages/react-core/src/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap @@ -117,24 +117,12 @@ exports[`Modal Content Test with onclose 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx index 4053858166a..ab52edf5776 100644 --- a/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx +++ b/packages/react-core/src/components/MultipleFileUpload/MultipleFileUploadStatusItem.tsx @@ -4,7 +4,7 @@ import { css } from '@patternfly/react-styles'; import { Progress } from '../Progress'; import { Button } from '../Button'; import FileIcon from '@patternfly/react-icons/dist/esm/icons/file-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; /** Automatically reads an uploaded file to render a visual representation of it, including * its name, size, and read status. This sub-component also allows custom reading of files @@ -170,7 +170,7 @@ export const MultipleFileUploadStatusItem: React.FunctionComponent
-
); diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap index 7a606dc85c2..8e906cec105 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatusItem.test.tsx.snap @@ -117,24 +117,12 @@ exports[`MultipleFileUploadStatusItem renders custom aria labels 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -257,24 +245,12 @@ exports[`MultipleFileUploadStatusItem renders custom class names 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -387,24 +363,12 @@ exports[`MultipleFileUploadStatusItem renders custom file name/size/icon/progres fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -517,24 +481,12 @@ exports[`MultipleFileUploadStatusItem renders custom function progressAriaLiveMe fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -688,24 +640,12 @@ exports[`MultipleFileUploadStatusItem renders custom progress value/variant when fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -830,24 +770,12 @@ exports[`MultipleFileUploadStatusItem renders expected values from a passed file fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -970,24 +898,12 @@ exports[`MultipleFileUploadStatusItem renders with expected class names 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -1100,24 +1016,12 @@ exports[`MultipleFileUploadStatusItem rendersdefault progressAriaLiveMessage whe fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx index e940b9763d4..157fa8e5e8b 100644 --- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx +++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerHeader.tsx @@ -1,6 +1,6 @@ import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { Button, ButtonVariant } from '../Button'; export interface NotificationDrawerHeaderProps extends React.HTMLProps { @@ -49,7 +49,7 @@ export const NotificationDrawerHeader: React.FunctionComponent onClose(event)} - icon={} + icon={} /> )} diff --git a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx index aa36b6420af..243a8baba5a 100644 --- a/packages/react-core/src/components/Popover/PopoverCloseButton.tsx +++ b/packages/react-core/src/components/Popover/PopoverCloseButton.tsx @@ -1,7 +1,7 @@ import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Popover/popover'; import { Button } from '../Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export const PopoverCloseButton: React.FunctionComponent = ({ onClose = () => undefined as void, @@ -14,7 +14,7 @@ export const PopoverCloseButton: React.FunctionComponent} + icon={} /> ); diff --git a/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap b/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap index 0868752a856..0a1af1190d4 100644 --- a/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap +++ b/packages/react-core/src/components/Popover/__tests__/Generated/__snapshots__/PopoverCloseButton.test.tsx.snap @@ -23,24 +23,12 @@ exports[`PopoverCloseButton should match snapshot (auto-generated) 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx index d61f0ff3f99..eb7bd376df3 100644 --- a/packages/react-core/src/components/SearchInput/SearchInput.tsx +++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx @@ -5,7 +5,7 @@ import { Badge } from '../Badge'; import { Icon } from '../Icon'; import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-icon'; import AngleUpIcon from '@patternfly/react-icons/dist/esm/icons/angle-up-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon'; import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon'; @@ -350,7 +350,7 @@ const SearchInputBase: React.FunctionComponent = ({ isDisabled={isDisabled} aria-label={resetButtonLabel} onClick={onClearInput} - icon={} + icon={} /> )} @@ -374,7 +374,7 @@ const SearchInputBase: React.FunctionComponent = ({ variant={ButtonVariant.plain} aria-label={toggleAriaLabel} aria-expanded={isExpanded} - icon={} + icon={} onClick={onExpandHandler} /> ); @@ -384,7 +384,7 @@ const SearchInputBase: React.FunctionComponent = ({ variant={ButtonVariant.plain} aria-label={toggleAriaLabel} aria-expanded={isExpanded} - icon={isExpanded ? : } + icon={isExpanded ? : } onClick={onExpandHandler} ref={searchInputExpandableToggleRef} /> diff --git a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap index 72da7832376..ff0ba7a35e2 100644 --- a/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap +++ b/packages/react-core/src/components/SearchInput/__tests__/__snapshots__/SearchInput.test.tsx.snap @@ -74,24 +74,12 @@ exports[`SearchInput advanced search 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -265,24 +253,12 @@ exports[`SearchInput advanced search with custom attributes 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -646,24 +622,12 @@ exports[`SearchInput renders search input in strict mode 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -914,24 +878,12 @@ exports[`SearchInput search input with hint 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -1134,24 +1086,12 @@ exports[`SearchInput simple search input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Select/examples/Select.md b/packages/react-core/src/components/Select/examples/Select.md index 71a059df260..73e7d15ff04 100644 --- a/packages/react-core/src/components/Select/examples/Select.md +++ b/packages/react-core/src/components/Select/examples/Select.md @@ -9,7 +9,7 @@ ouia: true --- import { Fragment, useEffect, useRef, useState } from 'react'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import BellIcon from '@patternfly/react-icons/dist/esm/icons/bell-icon'; ## Examples diff --git a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx index 20095710a3d..b79f206381e 100644 --- a/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx +++ b/packages/react-core/src/components/Select/examples/SelectMultiTypeahead.tsx @@ -13,7 +13,7 @@ import { LabelGroup, Button } from '@patternfly/react-core'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; const initialSelectOptions: SelectOptionProps[] = [ { value: 'Alabama', children: 'Alabama' }, @@ -226,7 +226,12 @@ export const SelectMultiTypeahead: React.FunctionComponent = () => { - @@ -217,24 +205,12 @@ exports[`Toolbar should render with custom label content 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -265,24 +241,12 @@ exports[`Toolbar should render with custom label content 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Wizard/WizardHeader.tsx b/packages/react-core/src/components/Wizard/WizardHeader.tsx index 4747174c784..e3667cb5f3b 100644 --- a/packages/react-core/src/components/Wizard/WizardHeader.tsx +++ b/packages/react-core/src/components/Wizard/WizardHeader.tsx @@ -1,7 +1,7 @@ import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; import { css } from '@patternfly/react-styles'; import { Button } from '../Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export interface WizardHeaderProps extends React.HTMLProps { /** Callback function called when the X (Close) button is clicked */ @@ -39,7 +39,7 @@ export const WizardHeader: React.FunctionComponent = ({
{!isCloseHidden && (
-
)}
diff --git a/packages/react-core/src/demos/TextInputGroupDemo.md b/packages/react-core/src/demos/TextInputGroupDemo.md index 683bfc1585c..dfccc47a90e 100644 --- a/packages/react-core/src/demos/TextInputGroupDemo.md +++ b/packages/react-core/src/demos/TextInputGroupDemo.md @@ -5,7 +5,7 @@ section: components import { useEffect, useRef, useState } from 'react'; import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; ## Demos diff --git a/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx b/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx index 962bfbd1615..1d5056ceaee 100644 --- a/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx +++ b/packages/react-core/src/demos/examples/TextInputGroup/AttributeValueFiltering.tsx @@ -14,7 +14,7 @@ import { LabelGroup } from '@patternfly/react-core'; import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export const AttributeValueFiltering: React.FunctionComponent = () => { const [inputValue, setInputValue] = useState(''); @@ -239,7 +239,7 @@ export const AttributeValueFiltering: React.FunctionComponent = () => { variant="plain" onClick={clearChipsAndInput} aria-label="Clear button and input" - icon={} + icon={} /> )} diff --git a/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx b/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx index f9944f9b986..5e8f166d307 100644 --- a/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx +++ b/packages/react-core/src/demos/examples/TextInputGroup/AutoCompleteSearch.tsx @@ -14,7 +14,7 @@ import { LabelGroup } from '@patternfly/react-core'; import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export const AutoCompleteSearch: React.FunctionComponent = () => { const [inputValue, setInputValue] = useState(''); @@ -233,7 +233,7 @@ export const AutoCompleteSearch: React.FunctionComponent = () => { variant="plain" onClick={clearChipsAndInput} aria-label="Clear button for chips and input" - icon={} + icon={} /> )} diff --git a/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap b/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap index 340a51f9135..f7a2cf39742 100644 --- a/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap +++ b/packages/react-core/src/deprecated/components/Chip/__tests__/__snapshots__/Chip.test.tsx.snap @@ -39,24 +39,12 @@ exports[`Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx b/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx index dff2ff4807c..a70f1f8fd81 100644 --- a/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx +++ b/packages/react-core/src/deprecated/components/Modal/ModalBoxCloseButton.tsx @@ -1,7 +1,7 @@ import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/ModalBox/modal-box'; import { Button } from '../../../components/Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { OUIAProps } from '../../../helpers'; export interface ModalBoxCloseButtonProps extends OUIAProps { @@ -29,7 +29,7 @@ export const ModalBoxCloseButton: React.FunctionComponent} + icon={} />
); diff --git a/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap b/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap index c5f7f0e08d3..96ccbb5cac3 100644 --- a/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap +++ b/packages/react-core/src/deprecated/components/Modal/__tests__/__snapshots__/ModalContent.test.tsx.snap @@ -38,24 +38,12 @@ exports[`Modal Content Test description 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -129,24 +117,12 @@ exports[`Modal Content Test isOpen 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -215,24 +191,12 @@ exports[`Modal Content Test only body 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -301,24 +265,12 @@ exports[`Modal Content Test with footer 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -392,24 +344,12 @@ exports[`Modal Content Test with onclose 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -483,24 +423,12 @@ exports[`Modal Content test without footer 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -569,24 +497,12 @@ exports[`Modal Test with custom footer 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -664,24 +580,12 @@ exports[`Modal Test with custom header 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx index 1b8ada8211f..507dffa0216 100644 --- a/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx +++ b/packages/react-core/src/deprecated/components/Wizard/WizardHeader.tsx @@ -1,7 +1,7 @@ import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; import { css } from '@patternfly/react-styles'; import { Button } from '../../../components/Button'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export interface WizardHeaderProps { /** Callback function called when the X (Close) button is clicked */ @@ -35,7 +35,7 @@ export const WizardHeader: React.FunctionComponent = ({
{!hideClose && (
-
)}
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap b/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap index 597005f4be3..fe76c99f513 100644 --- a/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap +++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/__snapshots__/Wizard.test.tsx.snap @@ -28,24 +28,12 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -399,24 +387,12 @@ exports[`Wizard Wizard should match snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx index 1f7444fe6ce..e9d35090b68 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/FormDemo/FormDemo.tsx @@ -27,7 +27,7 @@ import { MenuToggleElement } from '@patternfly/react-core'; import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing'; const initialSelectOptions = [ @@ -323,7 +323,7 @@ export class FormDemo extends Component { variant="plain" onClick={this.onClearButtonClick} aria-label="Clear input value" - icon={} + icon={} /> diff --git a/packages/react-table/src/components/Table/EditColumn.tsx b/packages/react-table/src/components/Table/EditColumn.tsx index cb07afc72be..ef58039c311 100644 --- a/packages/react-table/src/components/Table/EditColumn.tsx +++ b/packages/react-table/src/components/Table/EditColumn.tsx @@ -2,7 +2,7 @@ import { Fragment } from 'react'; import { Button } from '@patternfly/react-core/dist/esm/components/Button'; import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon'; import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { OnRowEdit } from './TableTypes'; import inlineStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit'; import { css } from '@patternfly/react-styles'; @@ -47,7 +47,7 @@ export const EditColumn: React.FunctionComponent = ({ {...props} onClick={(e) => onClick(e, 'cancel')} variant="plain" - icon={} + icon={} />
diff --git a/packages/react-table/src/components/Table/examples/Table.md b/packages/react-table/src/components/Table/examples/Table.md index 26229a6c796..85c2410f1ec 100644 --- a/packages/react-table/src/components/Table/examples/Table.md +++ b/packages/react-table/src/components/Table/examples/Table.md @@ -54,7 +54,7 @@ import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon'; import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Table/table'; diff --git a/packages/react-table/src/components/Table/examples/TableEditable.tsx b/packages/react-table/src/components/Table/examples/TableEditable.tsx index 03742cf87b7..deb3ff48388 100644 --- a/packages/react-table/src/components/Table/examples/TableEditable.tsx +++ b/packages/react-table/src/components/Table/examples/TableEditable.tsx @@ -3,7 +3,7 @@ import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table'; import { Button, Checkbox, Radio, TextInput, KeyTypes, getUniqueId } from '@patternfly/react-core'; import PencilAltIcon from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon'; import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import inlineEditStyles from '@patternfly/react-styles/css/components/InlineEdit/inline-edit'; import { css } from '@patternfly/react-styles'; @@ -60,7 +60,7 @@ const EditButtonsCell: React.FunctionComponent = ({ onKeyDown={(event) => onKeyDown(event, 'stopEditing')} variant="plain" > - +
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap index 0300584830b..d7414c06883 100644 --- a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap +++ b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap @@ -11153,24 +11153,12 @@ exports[`Table simple Editable table 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + @@ -11429,24 +11417,12 @@ exports[`Table simple Editable table 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - + diff --git a/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx b/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx index 2fc1e0b5364..199bd52decd 100644 --- a/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx +++ b/packages/react-templates/src/components/Select/MultiTypeaheadSelect.tsx @@ -25,7 +25,7 @@ import { TextInputGroupMain, TextInputGroupUtilities } from '@patternfly/react-core/dist/esm/components/TextInputGroup'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export interface MultiTypeaheadSelectOption extends Omit { /** Content of the select option. */ @@ -333,7 +333,7 @@ export const MultiTypeaheadSelectBase: FunctionComponent diff --git a/packages/react-templates/src/components/Select/TypeaheadSelect.tsx b/packages/react-templates/src/components/Select/TypeaheadSelect.tsx index a90bc38d7e0..2603a298647 100644 --- a/packages/react-templates/src/components/Select/TypeaheadSelect.tsx +++ b/packages/react-templates/src/components/Select/TypeaheadSelect.tsx @@ -24,7 +24,7 @@ import { TextInputGroupMain, TextInputGroupUtilities } from '@patternfly/react-core/dist/esm/components/TextInputGroup'; -import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon'; +import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; export interface TypeaheadSelectOption extends Omit { /** Content of the select option. */ @@ -371,7 +371,12 @@ export const TypeaheadSelectBase: FunctionComponent = ({ /> - diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap index 51330c1cad2..6e5766b7ce2 100644 --- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap +++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/TypeaheadSelect.test.tsx.snap @@ -48,24 +48,12 @@ exports[`Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 20 20" width="1em" > - - - - - - +