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..8d2dab6d0f7 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';
@@ -11,14 +12,12 @@ jest.mock('@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon', (
test('Renders without children', () => {
render(
-
+
+
+
);
- expect(screen.getByTestId('container').firstChild).toBeVisible();
+ expect(screen.getByRole('button')).toBeVisible();
});
test('Renders with an aria label composed with the title and variantLabel provided via a context by default', () => {
diff --git a/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md b/packages/react-core/src/components/Breadcrumb/examples/Breadcrumb.md
index 3453bf5dbb3..fca73aac82e 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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
## Examples
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/__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/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/FormSelect/FormSelect.tsx b/packages/react-core/src/components/FormSelect/FormSelect.tsx
index c25b2371bcd..1a0d99c6eed 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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-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..bb835115c38 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 20 20"
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 20 20"
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 20 20"
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 20 20"
width="1em"
>
-
-
+
@@ -302,24 +254,12 @@ exports[`FormSelect Grouped FormSelect input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 20 20"
width="1em"
>
-
-
+
@@ -396,24 +336,12 @@ exports[`FormSelect Simple FormSelect input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 20 20"
width="1em"
>
-
-
+
@@ -469,24 +397,12 @@ exports[`FormSelect invalid FormSelect input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 20 20"
width="1em"
>
-
-
+
@@ -542,24 +458,12 @@ exports[`FormSelect validated success FormSelect input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 20 20"
width="1em"
>
-
-
+
@@ -615,24 +519,12 @@ exports[`FormSelect validated warning FormSelect input 1`] = `
fill="currentColor"
height="1em"
role="img"
+ viewBox="0 0 20 20"
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..431b7e4112c 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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-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 a98e4754952..c31ccade269 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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-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 505d0377e4b..70bef975964 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 20 20"
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 20 20"
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 20 20"
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 20 20"
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 20 20"
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 20 20"
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 20 20"
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 20 20"
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..c67a8cd0ebf 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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-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/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 7d291a25a05..b728b963330 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
@@ -1192,6 +1192,862 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
>
+
+
+
+
+ test
+
+
+`;
+
+exports[`Pagination API verify insetLg inset breakpoints 1`] = `
+
+
+
+`;
+
+exports[`Pagination API verify insetMd inset breakpoints 1`] = `
+
+
+
+`;
+
+exports[`Pagination API verify insetNone inset breakpoints 1`] = `
+
+
+
+`;
+
+exports[`Pagination API verify insetSm inset breakpoints 1`] = `
+
+
@@ -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"
>
-
-
+