diff --git a/packages/react-core/src/components/Accordion/AccordionToggle.tsx b/packages/react-core/src/components/Accordion/AccordionToggle.tsx index 04d3467a57c..b9aa7777b69 100644 --- a/packages/react-core/src/components/Accordion/AccordionToggle.tsx +++ b/packages/react-core/src/components/Accordion/AccordionToggle.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Accordion/accordion'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { AccordionContext, AccordionItemContext } from './AccordionContext'; export interface AccordionToggleProps extends React.DetailedHTMLProps< @@ -27,7 +27,7 @@ export const AccordionToggle: React.FunctionComponent = ({ }: AccordionToggleProps) => { const renderToggleIcon = () => ( - + ); diff --git a/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx b/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx index 1a67f3deee2..c323044447a 100644 --- a/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx +++ b/packages/react-core/src/components/Accordion/__tests__/AccordionToggle.test.tsx @@ -4,7 +4,7 @@ import { AccordionToggle } from '../AccordionToggle'; import { AccordionContext, AccordionItemContext } from '../AccordionContext'; import styles from '@patternfly/react-styles/css/components/Accordion/accordion'; -jest.mock('@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon', () => () => 'Icon mock'); +jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon', () => () => 'Icon mock'); test('Renders without children', () => { render( diff --git a/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx b/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx index 2e7c7c030a7..548d2cf1549 100644 --- a/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx +++ b/packages/react-core/src/components/Alert/AlertToggleExpandButton.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { Button, ButtonProps, ButtonVariant } from '../Button'; import { AlertContext } from './AlertContext'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Alert/alert'; @@ -33,7 +33,7 @@ export const AlertToggleExpandButton: React.FunctionComponent - + } /> diff --git a/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx b/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx index a37b955f406..e3a41d251fd 100644 --- a/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx +++ b/packages/react-core/src/components/Alert/__tests__/AlertToggleExpandButton.test.tsx @@ -1,5 +1,6 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; +import '@testing-library/jest-dom'; import { AlertToggleExpandButton } from '../AlertToggleExpandButton'; import { AlertContext } from '../AlertContext'; @@ -7,7 +8,7 @@ import styles from '@patternfly/react-styles/css/components/Alert/alert'; jest.mock('../../Button'); -jest.mock('@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon', () => () => 'Icon mock'); +jest.mock('@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon', () => () => 'Icon mock'); test('Renders without children', () => { render( diff --git a/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md b/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md index 3453bf5dbb3..b868f3b9139 100644 --- a/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md +++ b/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md @@ -8,7 +8,7 @@ ouia: true import { useRef, useState } from 'react'; import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; ## Examples diff --git a/packages/react-core/src/components/Card/CardHeader.tsx b/packages/react-core/src/components/Card/CardHeader.tsx index dc0cc411511..0125817b123 100644 --- a/packages/react-core/src/components/Card/CardHeader.tsx +++ b/packages/react-core/src/components/Card/CardHeader.tsx @@ -5,7 +5,7 @@ import { CardHeaderMain } from './CardHeaderMain'; import { CardActions } from './CardActions'; import { CardSelectableActions } from './CardSelectableActions'; import { Button } from '../Button'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { Radio } from '../Radio'; import { Checkbox } from '../Checkbox'; import { useSSRSafeId } from '../../helpers'; @@ -107,7 +107,7 @@ export const CardHeader: React.FunctionComponent = ({ {...toggleButtonProps} icon={ - + } /> diff --git a/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap b/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap index 7f8cc924f81..e090e8bb337 100644 --- a/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap +++ b/packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap @@ -39,11 +39,11 @@ exports[`CardHeader onExpand adds the toggle button 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx index 50ee5b61c04..be539c23222 100644 --- a/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx +++ b/packages/react-core/src/components/ClipboardCopy/ClipboardCopyToggle.tsx @@ -1,6 +1,6 @@ import styles from '@patternfly/react-styles/css/components/ClipboardCopy/clipboard-copy'; import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { Button } from '../Button'; export interface ClipboardCopyToggleProps extends Omit< @@ -31,7 +31,7 @@ export const ClipboardCopyToggle: React.FunctionComponent - + } /> diff --git a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap index c318dccc369..2c625ee2058 100644 --- a/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap +++ b/packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap @@ -23,11 +23,11 @@ exports[`Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/DataList/DataListToggle.tsx b/packages/react-core/src/components/DataList/DataListToggle.tsx index 3b3d31f9e0e..b59210f8243 100644 --- a/packages/react-core/src/components/DataList/DataListToggle.tsx +++ b/packages/react-core/src/components/DataList/DataListToggle.tsx @@ -1,5 +1,5 @@ import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import styles from '@patternfly/react-styles/css/components/DataList/data-list'; import { Button, ButtonProps, ButtonVariant } from '../Button'; @@ -44,7 +44,7 @@ export const DataListToggle: React.FunctionComponent = ({ {...buttonProps} icon={
- +
} /> diff --git a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap index da7429404bb..d0198dbef1f 100644 --- a/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap +++ b/packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap @@ -32,11 +32,11 @@ exports[`DataListToggle should match snapshot (auto-generated) 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap b/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap index 3030121ed4f..57c3877ac62 100644 --- a/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap +++ b/packages/react-core/src/components/DataList/__tests__/__snapshots__/DataListToggle.test.tsx.snap @@ -32,11 +32,11 @@ exports[`Renders to match snapshot 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/DataList/examples/DataList.md b/packages/react-core/src/components/DataList/examples/DataList.md index 57c61e9df9a..2dcbad12ac5 100644 --- a/packages/react-core/src/components/DataList/examples/DataList.md +++ b/packages/react-core/src/components/DataList/examples/DataList.md @@ -20,7 +20,7 @@ propComponents: import { Fragment, useState } from 'react'; import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; import { css } from '@patternfly/react-styles'; diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap index 591e035d533..9eb495efe24 100644 --- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap +++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap @@ -173,24 +173,12 @@ exports[`With popover opened 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx b/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx index 71c9f800d33..bcd4cbb5e7e 100644 --- a/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx +++ b/packages/react-core/src/components/DualListSelector/DualListSelectorTreeItem.tsx @@ -3,7 +3,7 @@ import styles from '@patternfly/react-styles/css/components/DualListSelector/dua import { css } from '@patternfly/react-styles'; import { DualListSelectorTreeItemData } from './DualListSelectorTree'; import { Badge } from '../Badge'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { flattenTree } from './treeUtils'; import { DualListSelectorListContext } from './DualListSelectorContext'; import { useHasAnimations } from '../../helpers'; @@ -136,7 +136,7 @@ const DualListSelectorTreeItemBase: React.FunctionComponent - + )} diff --git a/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx b/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx index ed4e612982c..957a3fff6b3 100644 --- a/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx +++ b/packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx @@ -2,7 +2,7 @@ import { Component, createRef } from 'react'; import styles from '@patternfly/react-styles/css/components/ExpandableSection/expandable-section'; import { css } from '@patternfly/react-styles'; import lineClamp from '@patternfly/react-tokens/dist/esm/c_expandable_section_m_truncate__content_LineClamp'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { PickOptional } from '../../helpers/typeUtils'; import { debounce } from '../../helpers/util'; import { getResizeObserver } from '../../helpers/resizeObserver'; @@ -217,7 +217,7 @@ class ExpandableSection extends Component, + toggleIcon = , hasToggleIcon = true, children, isExpanded, diff --git a/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx b/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx index 2d06651d986..b7110b455f4 100644 --- a/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx +++ b/packages/react-core/src/components/ExpandableSection/ExpandableSectionToggle.tsx @@ -1,6 +1,6 @@ import styles from '@patternfly/react-styles/css/components/ExpandableSection/expandable-section'; import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { Button } from '../Button'; /** Acts as the toggle sub-component when the main expandable section component has the isDetached @@ -85,7 +85,7 @@ export const ExpandableSectionToggle: React.FunctionComponent - + ) })} diff --git a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap index 9129caa2247..12e554c6c21 100644 --- a/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap +++ b/packages/react-core/src/components/ExpandableSection/__tests__/__snapshots__/ExpandableSection.test.tsx.snap @@ -29,11 +29,11 @@ exports[`Disclosure ExpandableSection 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -82,11 +82,11 @@ exports[`ExpandableSection 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -136,11 +136,11 @@ exports[`Renders ExpandableSection expanded 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -189,11 +189,11 @@ exports[`Renders ExpandableSection indented 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -241,11 +241,11 @@ exports[`Renders Uncontrolled ExpandableSection 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx b/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx index 14808e8370c..e63b6d2605f 100644 --- a/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx +++ b/packages/react-core/src/components/Form/FormFieldGroupToggle.tsx @@ -1,6 +1,6 @@ import styles from '@patternfly/react-styles/css/components/Form/form'; import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { Button } from '../Button'; export interface FormFieldGroupToggleProps extends React.HTMLProps { @@ -38,7 +38,7 @@ export const FormFieldGroupToggle: React.FunctionComponent - + } /> diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap index 8be9e616530..5ee8aa9263a 100644 --- a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap +++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormFieldGroup.test.tsx.snap @@ -36,11 +36,11 @@ exports[`Check expandable form field group example against snapshot 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/FormSelect/FormSelect.tsx b/packages/react-core/src/components/FormSelect/FormSelect.tsx index c25b2371bcd..24e6a6316f7 100644 --- a/packages/react-core/src/components/FormSelect/FormSelect.tsx +++ b/packages/react-core/src/components/FormSelect/FormSelect.tsx @@ -6,7 +6,7 @@ import { ValidatedOptions } from '../../helpers/constants'; import { FormControlIcon } from '../FormControl/FormControlIcon'; import { getOUIAProps, OUIAProps } from '../../helpers'; import { SSRSafeIds } from '../../helpers/SSRSafeIds/SSRSafeIds'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; export interface FormSelectProps extends Omit, 'onChange' | 'onBlur' | 'onFocus' | 'disabled'>, OUIAProps { @@ -98,7 +98,7 @@ class FormSelect extends Component { {hasStatusIcon && } - + diff --git a/packages/react-core/src/components/FormSelect/__tests__/__snapshots__/FormSelect.test.tsx.snap b/packages/react-core/src/components/FormSelect/__tests__/__snapshots__/FormSelect.test.tsx.snap index 0e8e9345a4f..565202d7301 100644 --- a/packages/react-core/src/components/FormSelect/__tests__/__snapshots__/FormSelect.test.tsx.snap +++ b/packages/react-core/src/components/FormSelect/__tests__/__snapshots__/FormSelect.test.tsx.snap @@ -32,24 +32,12 @@ exports[`FormSelect Disabled FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -88,24 +76,12 @@ exports[`FormSelect FormSelect input with aria-label does not generate console e fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -145,24 +121,12 @@ exports[`FormSelect FormSelect input with id does not generate console error 1`] fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -200,24 +164,12 @@ exports[`FormSelect FormSelect input with no aria-label or id generates console fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -302,24 +254,12 @@ exports[`FormSelect Grouped FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -396,24 +336,12 @@ exports[`FormSelect Simple FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -469,24 +397,12 @@ exports[`FormSelect invalid FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -542,24 +458,12 @@ exports[`FormSelect validated success FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -615,24 +519,12 @@ exports[`FormSelect validated warning FormSelect input 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Icon/examples/Icon.md b/packages/react-core/src/components/Icon/examples/Icon.md index 2212d1535b6..b2cefb7aacb 100644 --- a/packages/react-core/src/components/Icon/examples/Icon.md +++ b/packages/react-core/src/components/Icon/examples/Icon.md @@ -8,7 +8,7 @@ propComponents: ['Icon'] import { Fragment, useState } from 'react'; import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon'; import PlusCircleIcon from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon'; diff --git a/packages/react-core/src/components/Icon/examples/IconBasic.tsx b/packages/react-core/src/components/Icon/examples/IconBasic.tsx index b99c2b7d171..0222833fa47 100644 --- a/packages/react-core/src/components/Icon/examples/IconBasic.tsx +++ b/packages/react-core/src/components/Icon/examples/IconBasic.tsx @@ -2,7 +2,7 @@ import { Fragment } from 'react'; import { Icon } from '@patternfly/react-core'; import LongArrowAltDownIcon from '@patternfly/react-icons/dist/esm/icons/long-arrow-alt-down-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon'; export const IconBasic: React.FunctionComponent = () => ( @@ -14,7 +14,7 @@ export const IconBasic: React.FunctionComponent = () => ( {' '} - + {' '} diff --git a/packages/react-core/src/components/JumpLinks/JumpLinks.tsx b/packages/react-core/src/components/JumpLinks/JumpLinks.tsx index e5613af0320..d6da3873cba 100644 --- a/packages/react-core/src/components/JumpLinks/JumpLinks.tsx +++ b/packages/react-core/src/components/JumpLinks/JumpLinks.tsx @@ -2,7 +2,7 @@ import { Children, cloneElement, Fragment, useCallback, useEffect, useRef, useSt import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/JumpLinks/jump-links'; import sidebarStyles from '@patternfly/react-styles/css/components/Sidebar/sidebar'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import cssToggleDisplayVar from '@patternfly/react-tokens/dist/esm/c_jump_links__toggle_Display'; import { Button } from '../Button'; import { JumpLinksItem, JumpLinksItemProps } from './JumpLinksItem'; @@ -277,7 +277,7 @@ export const JumpLinks: React.FunctionComponent = ({ aria-expanded={isExpanded} icon={ - + } id={id} diff --git a/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap b/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap index b51b59168f0..c5372584057 100644 --- a/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap +++ b/packages/react-core/src/components/JumpLinks/__tests__/__snapshots__/JumpLinks.test.tsx.snap @@ -36,11 +36,11 @@ exports[`expandable vertical with subsection 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Menu/examples/Menu.md b/packages/react-core/src/components/Menu/examples/Menu.md index b527ec086eb..2157649718e 100644 --- a/packages/react-core/src/components/Menu/examples/Menu.md +++ b/packages/react-core/src/components/Menu/examples/Menu.md @@ -30,7 +30,7 @@ import TableIcon from '@patternfly/react-icons/dist/esm/icons/table-icon'; import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon'; import StorageDomainIcon from '@patternfly/react-icons/dist/esm/icons/storage-domain-icon'; import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; ## Examples diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx index 36deaf41de7..7755b455c29 100644 --- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx +++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx @@ -1,7 +1,7 @@ import { Component, forwardRef, isValidElement } from 'react'; import styles from '@patternfly/react-styles/css/components/MenuToggle/menu-toggle'; import { css } from '@patternfly/react-styles'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { BadgeProps } from '../Badge'; import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon'; import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon'; @@ -154,7 +154,7 @@ class MenuToggleBase extends Component { {status !== undefined && {_statusIcon}} - + ); diff --git a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap index 5d40d191b6a..15936edafa8 100644 --- a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap +++ b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap @@ -27,24 +27,12 @@ exports[`Old Snapshot tests - remove when refactoring passes additional classes fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -79,24 +67,12 @@ exports[`Old Snapshot tests - remove when refactoring renders successfully 1`] = fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -140,24 +116,12 @@ exports[`Old Snapshot tests - remove when refactoring shows badge 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -209,24 +173,12 @@ exports[`Old Snapshot tests - remove when refactoring shows icon 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -262,24 +214,12 @@ exports[`Old Snapshot tests - remove when refactoring shows isDisabled 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -314,24 +254,12 @@ exports[`Old Snapshot tests - remove when refactoring shows isExpanded 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -409,24 +337,12 @@ exports[`Old Snapshot tests - remove when refactoring shows isPrimary 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -461,24 +377,12 @@ exports[`Old Snapshot tests - remove when refactoring shows plain text 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Modal/examples/Modal.md b/packages/react-core/src/components/Modal/examples/Modal.md index db5c1557c64..ecdcaab6c34 100644 --- a/packages/react-core/src/components/Modal/examples/Modal.md +++ b/packages/react-core/src/components/Modal/examples/Modal.md @@ -8,7 +8,7 @@ ouia: true import { Fragment, useRef, useState } from 'react'; import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon'; import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon'; import formStyles from '@patternfly/react-styles/css/components/Form/form'; diff --git a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap index 9a2d8efed57..cc5720416a1 100644 --- a/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap +++ b/packages/react-core/src/components/MultipleFileUpload/__tests__/__snapshots__/MultipleFileUploadStatus.test.tsx.snap @@ -33,11 +33,11 @@ exports[`MultipleFileUploadStatus renders custom class names 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -109,11 +109,11 @@ exports[`MultipleFileUploadStatus renders status toggle icon 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -211,11 +211,11 @@ exports[`MultipleFileUploadStatus renders status toggle text 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -289,11 +289,11 @@ exports[`MultipleFileUploadStatus renders with expected class names 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Nav/NavExpandable.tsx b/packages/react-core/src/components/Nav/NavExpandable.tsx index da1f1e9d5ee..b134cb4fd14 100644 --- a/packages/react-core/src/components/Nav/NavExpandable.tsx +++ b/packages/react-core/src/components/Nav/NavExpandable.tsx @@ -1,7 +1,7 @@ import { Component } from 'react'; import styles from '@patternfly/react-styles/css/components/Nav/nav'; import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { NavContext } from './Nav'; import { PageSidebarContext } from '../Page/PageSidebar'; import { PickOptional } from '../../helpers/typeUtils'; @@ -139,7 +139,7 @@ class NavExpandable extends Component { )} - + diff --git a/packages/react-core/src/components/Nav/__tests__/Generated/__snapshots__/NavExpandable.test.tsx.snap b/packages/react-core/src/components/Nav/__tests__/Generated/__snapshots__/NavExpandable.test.tsx.snap index 4db03db6f45..2924f0549a0 100644 --- a/packages/react-core/src/components/Nav/__tests__/Generated/__snapshots__/NavExpandable.test.tsx.snap +++ b/packages/react-core/src/components/Nav/__tests__/Generated/__snapshots__/NavExpandable.test.tsx.snap @@ -25,11 +25,11 @@ exports[`NavExpandable should match snapshot (auto-generated) 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap index 13d8b3c0156..6cb76e61fa8 100644 --- a/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap +++ b/packages/react-core/src/components/Nav/__tests__/__snapshots__/Nav.test.tsx.snap @@ -209,11 +209,11 @@ exports[`Nav Expandable Nav List - Trigger toggle 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -342,11 +342,11 @@ exports[`Nav Expandable Nav List 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -474,11 +474,11 @@ exports[`Nav Expandable Nav List with aria label 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx index 754b71056f0..ec1438594f2 100644 --- a/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx +++ b/packages/react-core/src/components/NotificationDrawer/NotificationDrawerGroup.tsx @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/NotificationDrawer/notification-drawer'; import maxLines from '@patternfly/react-tokens/dist/esm/c_notification_drawer__group_toggle_title_max_lines'; @@ -111,7 +111,7 @@ export const NotificationDrawerGroup: React.FunctionComponent - + diff --git a/packages/react-core/src/components/NotificationDrawer/__tests__/__snapshots__/NotificationDrawerGroup.test.tsx.snap b/packages/react-core/src/components/NotificationDrawer/__tests__/__snapshots__/NotificationDrawerGroup.test.tsx.snap index 4155ff262dd..163b1498969 100644 --- a/packages/react-core/src/components/NotificationDrawer/__tests__/__snapshots__/NotificationDrawerGroup.test.tsx.snap +++ b/packages/react-core/src/components/NotificationDrawer/__tests__/__snapshots__/NotificationDrawerGroup.test.tsx.snap @@ -33,11 +33,11 @@ exports[`NotificationDrawerGroup drawer group with isExpanded applied 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -80,11 +80,11 @@ exports[`NotificationDrawerGroup drawer group with isRead applied 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -127,11 +127,11 @@ exports[`NotificationDrawerGroup renders correct heading level 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -174,11 +174,11 @@ exports[`NotificationDrawerGroup renders with PatternFly Core styles 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap index 236a5f614ff..36e1aeb0867 100644 --- a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap +++ b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap @@ -39,24 +39,12 @@ exports[`PaginationOptionsMenu should match snapshot (auto-generated) 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap index ad9e0ed5945..8af7ce3b240 100644 --- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap +++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap @@ -59,24 +59,12 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -344,24 +332,12 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -629,24 +605,12 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -914,24 +878,12 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -1199,24 +1151,12 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -1484,24 +1424,12 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -1755,24 +1683,12 @@ exports[`Pagination component render custom pagination toggle 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -2044,24 +1960,12 @@ exports[`Pagination component render custom perPageOptions 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -2333,24 +2237,12 @@ exports[`Pagination component render custom start end 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -2849,24 +2741,12 @@ exports[`Pagination component render last page 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -3138,24 +3018,12 @@ exports[`Pagination component render limited number of pages 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -3418,24 +3286,12 @@ exports[`Pagination component render should render correctly bottom 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -3695,24 +3551,12 @@ exports[`Pagination component render should render correctly bottom sticky 1`] = fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -3984,24 +3828,12 @@ exports[`Pagination component render should render correctly compact 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -4274,24 +4106,12 @@ exports[`Pagination component render should render correctly disabled 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -4566,24 +4386,12 @@ exports[`Pagination component render should render correctly sticky 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -4855,24 +4663,12 @@ exports[`Pagination component render should render correctly top 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -5144,24 +4940,12 @@ exports[`Pagination component render titles 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -5433,24 +5217,12 @@ exports[`Pagination component render up drop direction 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -5722,24 +5494,12 @@ exports[`Pagination component render zero results 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/SearchInput/SearchInput.tsx b/packages/react-core/src/components/SearchInput/SearchInput.tsx index eb7bd376df3..eec793d85e1 100644 --- a/packages/react-core/src/components/SearchInput/SearchInput.tsx +++ b/packages/react-core/src/components/SearchInput/SearchInput.tsx @@ -7,7 +7,7 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico import AngleUpIcon from '@patternfly/react-icons/dist/esm/icons/angle-up-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 RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import ArrowRightIcon from '@patternfly/react-icons/dist/esm/icons/arrow-right-icon'; import { AdvancedSearchMenu } from './AdvancedSearchMenu'; import { TextInputGroup, TextInputGroupMain, TextInputGroupUtilities } from '../TextInputGroup'; @@ -465,7 +465,7 @@ const SearchInputBase: React.FunctionComponent = ({ onClick={onToggle} isDisabled={isDisabled} aria-expanded={isSearchMenuOpen} - icon={} + icon={} /> )} 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 ff0ba7a35e2..d45fe2b24d4 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 @@ -104,24 +104,12 @@ exports[`SearchInput advanced search 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -283,24 +271,12 @@ exports[`SearchInput advanced search with custom attributes 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -652,24 +628,12 @@ exports[`SearchInput renders search input in strict mode 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-core/src/components/Tabs/OverflowTab.tsx b/packages/react-core/src/components/Tabs/OverflowTab.tsx index aaa81601767..3008ed4683e 100644 --- a/packages/react-core/src/components/Tabs/OverflowTab.tsx +++ b/packages/react-core/src/components/Tabs/OverflowTab.tsx @@ -1,7 +1,7 @@ import { Fragment, useContext, useEffect, useRef, useState } from 'react'; import styles from '@patternfly/react-styles/css/components/Tabs/tabs'; import { css } from '@patternfly/react-styles'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { Popper, PopperOptions } from '../../helpers'; import { Menu, MenuContent, MenuList, MenuItem } from '../Menu'; import { TabsContext } from './TabsContext'; @@ -117,7 +117,7 @@ export const OverflowTab: React.FunctionComponent = ({ {showTabCount && tabTitle === defaultTitleText && ` (${overflowingTabs.length})`} - + diff --git a/packages/react-core/src/components/Tabs/Tabs.tsx b/packages/react-core/src/components/Tabs/Tabs.tsx index 3c510cd6076..bb1bddeafa9 100644 --- a/packages/react-core/src/components/Tabs/Tabs.tsx +++ b/packages/react-core/src/components/Tabs/Tabs.tsx @@ -4,7 +4,7 @@ import { css } from '@patternfly/react-styles'; import { PickOptional } from '../../helpers/typeUtils'; import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import PlusIcon from '@patternfly/react-icons/dist/esm/icons/plus-icon'; import { isElementInView, @@ -609,7 +609,7 @@ class Tabs extends Component { aria-labelledby={`${randomId}-text ${randomId}-button`} icon={ - + } > diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap index 8518fd7d21d..269be342c1c 100644 --- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap +++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/OverflowTab.test.tsx.snap @@ -27,11 +27,11 @@ exports[`Matches snapshot when expanded 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -112,11 +112,11 @@ exports[`Renders tabs passed via overflowingTabs when expanded in strict mode 1` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap index 9d0c6efebc6..8d8fef90fcf 100644 --- a/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap +++ b/packages/react-core/src/components/Tabs/__tests__/__snapshots__/Tabs.test.tsx.snap @@ -515,11 +515,11 @@ exports[`should render expandable vertical tabs 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx index b2125e2763e..5cecfc9eeff 100644 --- a/packages/react-core/src/components/TreeView/TreeViewListItem.tsx +++ b/packages/react-core/src/components/TreeView/TreeViewListItem.tsx @@ -1,7 +1,7 @@ import { memo, useState, useEffect, Children, isValidElement, cloneElement } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/TreeView/tree-view'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { TreeViewDataItem } from './TreeView'; import { Badge } from '../Badge'; import { useSSRSafeId } from '../../helpers'; @@ -155,7 +155,7 @@ const TreeViewListItemBase: React.FunctionComponent = ({ tabIndex={-1} > - + ); diff --git a/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeViewListItem.test.tsx.snap b/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeViewListItem.test.tsx.snap index 018e0f12858..edc242444f8 100644 --- a/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeViewListItem.test.tsx.snap +++ b/packages/react-core/src/components/TreeView/__tests__/__snapshots__/TreeViewListItem.test.tsx.snap @@ -32,11 +32,11 @@ exports[`Matches snapshot with children 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/components/Wizard/WizardNavItem.tsx b/packages/react-core/src/components/Wizard/WizardNavItem.tsx index 49745dc5954..a74b71b96ee 100644 --- a/packages/react-core/src/components/Wizard/WizardNavItem.tsx +++ b/packages/react-core/src/components/Wizard/WizardNavItem.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon'; import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon'; import RhUiWarningFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-warning-fill-icon'; @@ -121,7 +121,7 @@ export const WizardNavItem = ({ {content} - + diff --git a/packages/react-core/src/components/Wizard/WizardToggle.tsx b/packages/react-core/src/components/Wizard/WizardToggle.tsx index cd1d58a7d25..cc84d36d1ab 100644 --- a/packages/react-core/src/components/Wizard/WizardToggle.tsx +++ b/packages/react-core/src/components/Wizard/WizardToggle.tsx @@ -2,7 +2,7 @@ import { Fragment, useCallback, useEffect } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-error-fill-icon'; import RhUiCheckCircleFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-check-circle-fill-icon'; @@ -122,7 +122,7 @@ export const WizardToggle = ({ - +
diff --git a/packages/react-core/src/demos/CustomMenus/CustomMenus.md b/packages/react-core/src/demos/CustomMenus/CustomMenus.md index 62646170c72..3bbdd039ce7 100644 --- a/packages/react-core/src/demos/CustomMenus/CustomMenus.md +++ b/packages/react-core/src/demos/CustomMenus/CustomMenus.md @@ -19,7 +19,7 @@ import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh- import ThIcon from '@patternfly/react-icons/dist/esm/icons/th-icon'; import brandImg from '../assets/PF-IconLogo.svg'; import SearchIcon from '@patternfly/react-icons/dist/esm/icons/search-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhMicronsCloseIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-close-icon'; import avatarImg from '../assets/avatarImg.svg'; import { css } from '@patternfly/react-styles'; diff --git a/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx b/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx index bbc5346317c..b78cc606274 100644 --- a/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx +++ b/packages/react-core/src/demos/DataList/examples/DataListExpandableControlInToolbar.tsx @@ -29,7 +29,7 @@ import { import { DashboardWrapper } from '@patternfly/react-core/src/demos/DashboardWrapper'; import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; export const DataListExpandableControlInToolbar: React.FunctionComponent = () => { @@ -96,7 +96,7 @@ export const DataListExpandableControlInToolbar: React.FunctionComponent = () => icon={ - + } diff --git a/packages/react-core/src/demos/DataListDemo.md b/packages/react-core/src/demos/DataListDemo.md index cdd25d980a8..90d6374a030 100644 --- a/packages/react-core/src/demos/DataListDemo.md +++ b/packages/react-core/src/demos/DataListDemo.md @@ -6,7 +6,7 @@ section: components import { Fragment, useState } from 'react'; import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; import EllipsisVIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon'; import { css } from '@patternfly/react-styles'; diff --git a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx index 82bf1abaa57..5adad1dd43a 100644 --- a/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx +++ b/packages/react-core/src/deprecated/components/DualListSelector/DualListSelectorTreeItem.tsx @@ -3,7 +3,7 @@ import styles from '@patternfly/react-styles/css/components/DualListSelector/dua import { css } from '@patternfly/react-styles'; import { DualListSelectorTreeItemData } from './DualListSelectorTree'; import { Badge } from '../../../components/Badge'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { flattenTree } from './treeUtils'; import { DualListSelectorListContext } from './DualListSelectorContext'; @@ -119,7 +119,7 @@ const DualListSelectorTreeItemBase: React.FunctionComponent - +
)} diff --git a/packages/react-core/src/deprecated/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap b/packages/react-core/src/deprecated/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap index 58b3d392b5e..39e5879dbf8 100644 --- a/packages/react-core/src/deprecated/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap +++ b/packages/react-core/src/deprecated/components/DualListSelector/__tests__/__snapshots__/DualListSelector.test.tsx.snap @@ -1867,11 +1867,11 @@ exports[`DualListSelector with tree 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-core/src/deprecated/components/Modal/examples/Modal.md b/packages/react-core/src/deprecated/components/Modal/examples/Modal.md index 539303b9a6f..c85e68001e1 100644 --- a/packages/react-core/src/deprecated/components/Modal/examples/Modal.md +++ b/packages/react-core/src/deprecated/components/Modal/examples/Modal.md @@ -11,7 +11,7 @@ import { Fragment, useRef, useState } from 'react'; import { Modal as ModalDeprecated, ModalVariant as ModalVariantDeprecated } from '@patternfly/react-core/deprecated'; import WarningTriangleIcon from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import BullhornIcon from '@patternfly/react-icons/dist/esm/icons/bullhorn-icon'; import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon'; import spacing from '@patternfly/react-styles/css/utilities/Spacing/spacing'; diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx index 2c40c62ead3..cb6e3dc5fc4 100644 --- a/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx +++ b/packages/react-core/src/deprecated/components/Wizard/WizardNavItem.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { useOUIAProps, OUIAProps } from '../../../helpers'; export interface WizardNavItemProps extends OUIAProps { @@ -95,7 +95,7 @@ export const WizardNavItem: React.FunctionComponent = ({ {content} - + diff --git a/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx b/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx index 9509b9f317e..1c9ee71a223 100644 --- a/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx +++ b/packages/react-core/src/deprecated/components/Wizard/WizardToggle.tsx @@ -2,7 +2,7 @@ import { Fragment } from 'react'; import { css } from '@patternfly/react-styles'; import styles from '@patternfly/react-styles/css/components/Wizard/wizard'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { WizardStep } from './Wizard'; import { WizardBody } from './WizardBody'; @@ -97,7 +97,7 @@ export const WizardToggle: React.FunctionComponent = ({ {activeStepSubName && {activeStepSubName}} - +
diff --git a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardToggle.test.tsx.snap b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardToggle.test.tsx.snap index 8efcdcda055..49cd4000af3 100644 --- a/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardToggle.test.tsx.snap +++ b/packages/react-core/src/deprecated/components/Wizard/__tests__/Generated/__snapshots__/WizardToggle.test.tsx.snap @@ -28,24 +28,12 @@ exports[`WizardToggle should match snapshot (auto-generated) 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + 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 6098296790f..12d70909e10 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 @@ -83,24 +83,12 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -171,11 +159,11 @@ exports[`Wizard Expandable Nav Wizard should match snapshot 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -430,24 +418,12 @@ exports[`Wizard Wizard should match snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -708,24 +684,12 @@ exports[`Wizard bare wiz 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx index b6b0f331128..33fec7af459 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/BreadcrumbDemo/BreadcrumbDemo.tsx @@ -11,7 +11,7 @@ import { MenuToggle } from '@patternfly/react-core'; import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon'; -import CaretDownIcon from '@patternfly/react-icons/dist/esm/icons/caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; export class BreadcrumbDemo extends Component { static displayName = 'BreadcrumbDemo'; @@ -74,7 +74,7 @@ export class BreadcrumbDemo extends Component { {dropdownItems.length} - + diff --git a/packages/react-table/src/components/Table/CollapseColumn.tsx b/packages/react-table/src/components/Table/CollapseColumn.tsx index 3a7ec2885c3..324c87225c3 100644 --- a/packages/react-table/src/components/Table/CollapseColumn.tsx +++ b/packages/react-table/src/components/Table/CollapseColumn.tsx @@ -1,5 +1,5 @@ import { Fragment } from 'react'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import { css } from '@patternfly/react-styles'; import { Button } from '@patternfly/react-core/dist/esm/components/Button'; import styles from '@patternfly/react-styles/css/components/Table/table'; @@ -34,7 +34,7 @@ export const CollapseColumn: React.FunctionComponent = ({ aria-expanded={isOpen} icon={
- +
} /> diff --git a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx index 47742e3798e..059c5df5529 100644 --- a/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx +++ b/packages/react-table/src/components/Table/utils/decorators/treeRow.tsx @@ -4,7 +4,7 @@ import styles from '@patternfly/react-styles/css/components/Table/table'; import stylesTreeView from '@patternfly/react-styles/css/components/Table/table-tree-view'; import { Button } from '@patternfly/react-core/dist/esm/components/Button'; import { Checkbox } from '@patternfly/react-core/dist/esm/components/Checkbox'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import EllipsisHIcon from '@patternfly/react-icons/dist/esm/icons/ellipsis-h-icon'; export const treeRow = @@ -54,7 +54,7 @@ export const treeRow = aria-label={toggleAriaLabel || `${isExpanded ? 'Collapse' : 'Expand'} row ${rowIndex}`} icon={
- +
} /> diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md index 15ceffc71b2..98f2b192a33 100644 --- a/packages/react-table/src/demos/Table.md +++ b/packages/react-table/src/demos/Table.md @@ -62,7 +62,7 @@ import RhUiErrorFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-erro import RhUiSettingsFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-settings-fill-icon'; import HelpIcon from '@patternfly/react-icons/dist/esm/icons/help-icon'; import QuestionCircleIcon from '@patternfly/react-icons/dist/esm/icons/question-circle-icon'; -import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon'; +import RhUiCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-caret-down-icon'; import RhMicronsCaretRightIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-right-icon'; import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon'; import BlueprintIcon from '@patternfly/react-icons/dist/esm/icons/blueprint-icon'; 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 faa3e634a4f..8b60cb9fab0 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 @@ -1689,11 +1689,11 @@ exports[`Table Collapsible nested table 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" >
@@ -1780,11 +1780,11 @@ exports[`Table Collapsible nested table 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -1942,11 +1942,11 @@ exports[`Table Collapsible nested table 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -2462,11 +2462,11 @@ exports[`Table Collapsible table 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > @@ -2679,11 +2679,11 @@ exports[`Table Collapsible table 1`] = ` fill="currentColor" height="1em" role="img" - viewBox="0 0 20 20" + viewBox="0 0 32 32" width="1em" > diff --git a/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/SimpleDropdown.test.tsx.snap b/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/SimpleDropdown.test.tsx.snap index 57fb147adbb..5d0186f516d 100644 --- a/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/SimpleDropdown.test.tsx.snap +++ b/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/SimpleDropdown.test.tsx.snap @@ -27,24 +27,12 @@ exports[`Dropdown items Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -79,24 +67,12 @@ exports[`Dropdown toggle Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap index c53bcf6ffa1..bdba016a990 100644 --- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap +++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap @@ -28,24 +28,12 @@ exports[`checkbox select with no props snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -81,24 +69,12 @@ exports[`opened checkbox select snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap index 2b6691795e1..0908d0dbf47 100644 --- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap +++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/MultiTypeaheadSelect.test.tsx.snap @@ -81,24 +81,12 @@ exports[`MultiTypeaheadSelect Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + diff --git a/packages/react-templates/src/components/Select/__tests__/__snapshots__/SimpleSelect.test.tsx.snap b/packages/react-templates/src/components/Select/__tests__/__snapshots__/SimpleSelect.test.tsx.snap index ce2d4e048ca..1a35bfa987c 100644 --- a/packages/react-templates/src/components/Select/__tests__/__snapshots__/SimpleSelect.test.tsx.snap +++ b/packages/react-templates/src/components/Select/__tests__/__snapshots__/SimpleSelect.test.tsx.snap @@ -28,24 +28,12 @@ exports[`Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + @@ -81,24 +69,12 @@ exports[`checkbox select with no props snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - + 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 6e5766b7ce2..af6e065c317 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 @@ -81,24 +81,12 @@ exports[`Matches snapshot 1`] = ` fill="currentColor" height="1em" role="img" + viewBox="0 0 32 32" width="1em" > - - - - - - +