@patternfly/react-core 5.2.0-prerelease.1 → 5.2.0-prerelease.11

package/src/components/Page/__tests__/PageSidebarBody.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PageSidebarBody } from '../PageSidebarBody';
+import styles from '@patternfly/react-styles/css/components/Page/page';
 
 test('Renders without children', () => {
   render(
@@ -18,10 +19,10 @@ test('Renders with children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with class pf-v5-c-page__sidebar-body by default', () => {
+test(`Renders with class ${styles.pageSidebarBody} by default`, () => {
   render(<PageSidebarBody>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-page__sidebar-body');
+  expect(screen.getByText('Test')).toHaveClass(styles.pageSidebarBody);
 });
 
 test('Renders with custom class', () => {
@@ -30,40 +31,40 @@ test('Renders with custom class', () => {
   expect(screen.getByText('Test')).toHaveClass('tester');
 });
 
-test('Renders without pf-m-page-insets by default', () => {
+test(`Renders without ${styles.modifiers.pageInsets} by default`, () => {
   render(<PageSidebarBody>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).not.toHaveClass('pf-m-page-insets');
+  expect(screen.getByText('Test')).not.toHaveClass(styles.modifiers.pageInsets);
 });
 
-test('Renders with pf-m-page-insets when usePageInsets is passed', () => {
+test(`Renders with ${styles.modifiers.pageInsets} when usePageInsets is passed`, () => {
   render(<PageSidebarBody usePageInsets>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).toHaveClass('pf-m-page-insets');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.pageInsets);
 });
 
-test('Renders without pf-m-fill by default', () => {
+test(`Renders without ${styles.modifiers.fill} by default`, () => {
   render(<PageSidebarBody>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).not.toHaveClass('pf-m-fill');
+  expect(screen.getByText('Test')).not.toHaveClass(styles.modifiers.fill);
 });
 
-test('Renders with pf-m-fill when isFilled={true} is passed', () => {
+test(`Renders with ${styles.modifiers.fill} when isFilled={true} is passed`, () => {
   render(<PageSidebarBody isFilled={true}>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).toHaveClass('pf-m-fill');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.fill);
 });
 
-test('Renders without pf-m-no-fill by default', () => {
+test(`Renders without ${styles.modifiers.noFill} by default`, () => {
   render(<PageSidebarBody>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).not.toHaveClass('pf-m-no-fill');
+  expect(screen.getByText('Test')).not.toHaveClass(styles.modifiers.noFill);
 });
 
-test('Renders with pf-m-no-fill when isFilled={false} is passed', () => {
+test(`Renders with ${styles.modifiers.noFill} when isFilled={false} is passed`, () => {
   render(<PageSidebarBody isFilled={false}>Test</PageSidebarBody>);
 
-  expect(screen.getByText('Test')).toHaveClass('pf-m-no-fill');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.noFill);
 });
 
 test('Renders with additional props', () => {

package/src/components/Page/examples/Page.md

@@ -17,6 +17,7 @@ propComponents:
 
 import BarsIcon from '@patternfly/react-icons/dist/js/icons/bars-icon';
 import './page.css';
+import c_page_section_m_limit_width_MaxWidth from '@patternfly/react-tokens/dist/esm/c_page_section_m_limit_width_MaxWidth';
 
 ## Examples
 

package/src/components/Page/examples/PageCenteredSection.tsx

@@ -17,6 +17,8 @@ import {
   CardBody
 } from '@patternfly/react-core';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
+/* eslint-disable camelcase */
+import c_page_section_m_limit_width_MaxWidth from '@patternfly/react-tokens/dist/esm/c_page_section_m_limit_width_MaxWidth';
 
 export const PageCenteredSection: React.FunctionComponent = () => {
   const [isSidebarOpen, setIsSidebarOpen] = React.useState(true);
@@ -67,8 +69,7 @@ export const PageCenteredSection: React.FunctionComponent = () => {
         <Card>
           <CardBody>
             When a width limited page section is wider than the value of
-            <code>--pf-v5-c-page--section--m-limit-width--MaxWidth</code>, the section will be centered in the main
-            section.
+            <code>{c_page_section_m_limit_width_MaxWidth.name}</code>, the section will be centered in the main section.
             <br />
             <br />
             The content in this example is placed in a card to better illustrate how the section behaves when it is

package/src/components/Panel/PanelMain.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Panel/panel';
 import { css } from '@patternfly/react-styles';
+import cssMaxHeight from '@patternfly/react-tokens/dist/esm/c_panel__main_MaxHeight';
 
 export interface PanelMainProps extends React.HTMLProps<HTMLDivElement> {
   /** Content rendered inside the panel main div */
@@ -19,7 +20,7 @@ export const PanelMain: React.FunctionComponent<PanelMainProps> = ({
 }: PanelMainProps) => (
   <div
     className={css(styles.panelMain, className)}
-    style={{ '--pf-v5-c-panel__main--MaxHeight': maxHeight } as React.CSSProperties}
+    style={{ [cssMaxHeight.name]: maxHeight } as React.CSSProperties}
     {...props}
   >
     {children}

package/src/components/Panel/__tests__/Panel.test.tsx

@@ -5,6 +5,7 @@ import { PanelMain } from '../PanelMain';
 import { PanelMainBody } from '../PanelMainBody';
 import userEvent from '@testing-library/user-event';
 import { useEffect } from 'react';
+import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
   render(
@@ -20,14 +21,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with the class pf-v5-c-panel', () => {
+test(`Renders with the class ${styles.panel}`, () => {
   render(<Panel>Test</Panel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel');
+  expect(screen.getByText('Test')).toHaveClass(styles.panel);
 });
 
-test('Renders with only the class pf-v5-c-panel by default', () => {
+test(`Renders with only the class ${styles.panel} by default`, () => {
   render(<Panel>Test</Panel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.panel, { exact: true });
 });
 
 test('Renders with custom class name when className prop is passed', () => {
@@ -35,19 +36,19 @@ test('Renders with custom class name when className prop is passed', () => {
   expect(screen.getByText('Test')).toHaveClass('test-class');
 });
 
-test('Renders with class name pf-m-raised when variant is raised', () => {
+test(`Renders with class name ${styles.modifiers.raised} when variant is raised`, () => {
   render(<Panel variant="raised">Test</Panel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-m-raised');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.raised);
 });
 
-test('Renders with class name pf-m-bordered when variant is bordered', () => {
+test(`Renders with class name ${styles.modifiers.bordered} when variant is bordered`, () => {
   render(<Panel variant="bordered">Test</Panel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-m-bordered');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.bordered);
 });
 
-test('Renders with class name pf-m-scrollable when isScrollable is true', () => {
+test(`Renders with class name ${styles.modifiers.scrollable} when isScrollable is true`, () => {
   render(<Panel isScrollable>Test</Panel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-m-scrollable');
+  expect(screen.getByText('Test')).toHaveClass(styles.modifiers.scrollable);
 });
 
 test('Renders with ref', async () => {

package/src/components/Panel/__tests__/PanelFooter.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelFooter } from '../PanelFooter';
+import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +17,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with the class pf-v5-c-panel__footer', () => {
+test(`Renders with the class ${styles.panelFooter}`, () => {
   render(<PanelFooter>Test</PanelFooter>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__footer');
+  expect(screen.getByText('Test')).toHaveClass(styles.panelFooter);
 });
 
-test('Renders with only the class pf-v5-c-panel__footer by default', () => {
+test(`Renders with only the class ${styles.panelFooter} by default`, () => {
   render(<PanelFooter>Test</PanelFooter>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__footer', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.panelFooter, { exact: true });
 });
 
 test('Renders with custom class name when className prop is passed', () => {

package/src/components/Panel/__tests__/PanelHeader.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelHeader } from '../PanelHeader';
+import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +17,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with the class pf-v5-c-panel__header', () => {
+test(`Renders with the class ${styles.panelHeader}`, () => {
   render(<PanelHeader>Test</PanelHeader>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__header');
+  expect(screen.getByText('Test')).toHaveClass(styles.panelHeader);
 });
 
-test('Renders with only the class pf-v5-c-panel__header by default', () => {
+test(`Renders with only the class ${styles.panelHeader} by default`, () => {
   render(<PanelHeader>Test</PanelHeader>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__header', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.panelHeader, { exact: true });
 });
 
 test('Renders with custom class name when className prop is passed', () => {

package/src/components/Panel/__tests__/PanelMain.test.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelMain } from '../PanelMain';
+import cssPanelMainMaxHeight from '@patternfly/react-tokens/dist/esm/c_panel__main_MaxHeight';
+import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +18,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with the class pf-v5-c-panel__main', () => {
+test(`Renders with the class ${styles.panelMain}`, () => {
   render(<PanelMain>Test</PanelMain>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__main');
+  expect(screen.getByText('Test')).toHaveClass(styles.panelMain);
 });
 
-test('Renders with only the class pf-v5-c-panel__main by default', () => {
+test(`Renders with only the class ${styles.panelMain} by default`, () => {
   render(<PanelMain>Test</PanelMain>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__main', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.panelMain, { exact: true });
 });
 
 test('Renders with custom class name when className prop is passed', () => {
@@ -34,7 +36,7 @@ test('Renders with custom class name when className prop is passed', () => {
 test('Renders with custom max height name when maxHeight prop is passed', () => {
   render(<PanelMain maxHeight="100px">Test</PanelMain>);
   const styles = getComputedStyle(screen.getByText('Test'));
-  expect(styles.getPropertyValue('--pf-v5-c-panel__main--MaxHeight')).toBe('100px');
+  expect(styles.getPropertyValue(cssPanelMainMaxHeight.name)).toBe('100px');
 });
 
 test('Renders with the inherited element props spread to the component', () => {

package/src/components/Panel/__tests__/PanelMainBody.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { PanelMainBody } from '../PanelMainBody';
+import styles from '@patternfly/react-styles/css/components/Panel/panel';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +17,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with the class pf-v5-c-panel__main-body', () => {
+test(`Renders with the class ${styles.panelMainBody}`, () => {
   render(<PanelMainBody>Test</PanelMainBody>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__main-body');
+  expect(screen.getByText('Test')).toHaveClass(styles.panelMainBody);
 });
 
-test('Renders with only the class pf-v5-c-panel__main-body by default', () => {
+test(`Renders with only the class ${styles.panelMainBody} by default`, () => {
   render(<PanelMainBody>Test</PanelMainBody>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-panel__main-body', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.panelMainBody, { exact: true });
 });
 
 test('Renders with custom class name when className prop is passed', () => {

package/src/components/Progress/__tests__/ProgressHelperText.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressHelperText } from '../ProgressHelperText';
+import styles from '@patternfly/react-styles/css/components/Progress/progress';
 
 test('Renders without children', () => {
   render(
@@ -17,10 +18,10 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with class pf-v5-c-progress__helper-text on the div containing the helper text component', () => {
+test(`Renders with class ${styles.progressHelperText} on the div containing the helper text component`, () => {
   render(<ProgressHelperText>Test</ProgressHelperText>);
 
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-progress__helper-text');
+  expect(screen.getByText('Test')).toHaveClass(styles.progressHelperText);
 });
 
 test('Renders with inherited element props spread to the component', () => {

package/src/components/ProgressStepper/__tests__/ProgressStep.test.tsx

@@ -2,6 +2,7 @@ import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressStep, ProgressStepVariant } from '../ProgressStep';
 import { capitalize } from '../../../helpers';
+import styles from '@patternfly/react-styles/css/components/ProgressStepper/progress-stepper';
 
 jest.mock('@patternfly/react-icons/dist/esm/icons/check-circle-icon', () => () => 'Success icon mock');
 jest.mock('@patternfly/react-icons/dist/esm/icons/resources-full-icon', () => () => 'Info icon mock');
@@ -23,9 +24,9 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with class pf-v5-c-progress-stepper__step on the containing li element', () => {
+test(`Renders with class ${styles.progressStepperStep} on the containing li element`, () => {
   render(<ProgressStep>Test</ProgressStep>);
-  expect(screen.getByRole('listitem')).toHaveClass('pf-v5-c-progress-stepper__step');
+  expect(screen.getByRole('listitem')).toHaveClass(styles.progressStepperStep);
 });
 
 test('Renders with custom class name on the containing li element when className prop is provided', () => {
@@ -36,7 +37,7 @@ test('Renders with custom class name on the containing li element when className
 ['default', undefined].forEach((variant) => {
   test(`Renders with no additional classes when variant=${variant} on containing li element`, () => {
     render(<ProgressStep variant={`${variant as ProgressStepVariant}`}>Test</ProgressStep>);
-    expect(screen.getByRole('listitem')).toHaveClass('pf-v5-c-progress-stepper__step', { exact: true });
+    expect(screen.getByRole('listitem')).toHaveClass(styles.progressStepperStep, { exact: true });
   });
 });
 
@@ -77,9 +78,9 @@ test('Renders the element passed via the icon prop', () => {
   expect(screen.getByText('Custom Icon')).toBeVisible();
 });
 
-test('Renders the icon element inside span element with class pf-v5-c-progress-stepper__step-icon', () => {
+test(`Renders the icon element inside span element with class ${styles.progressStepperStepIcon}`, () => {
   render(<ProgressStep icon="Custom Icon">Test</ProgressStep>);
-  expect(screen.getByText('Custom Icon')).toHaveClass('pf-v5-c-progress-stepper__step-icon');
+  expect(screen.getByText('Custom Icon')).toHaveClass(styles.progressStepperStepIcon);
 });
 
 test('Does not render with class pf-m-current by default on containing li element', () => {
@@ -112,14 +113,14 @@ test('Renders the element passed via the description prop', () => {
   expect(screen.getByRole('button', { name: 'Description' })).toBeVisible();
 });
 
-test('Renders the description element inside div element with class pf-v5-c-progress-stepper__step-description', () => {
+test(`Renders the description element inside div element with class ${styles.progressStepperStepDescription}`, () => {
   render(<ProgressStep description="Description">Test</ProgressStep>);
-  expect(screen.getByText('Description')).toHaveClass('pf-v5-c-progress-stepper__step-description');
+  expect(screen.getByText('Description')).toHaveClass(styles.progressStepperStepDescription);
 });
 
-test('Renders children inside class pf-v5-c-progress-stepper__step-title', () => {
+test(`Renders children inside class ${styles.progressStepperStepTitle}`, () => {
   render(<ProgressStep>Test</ProgressStep>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-progress-stepper__step-title');
+  expect(screen.getByText('Test')).toHaveClass(styles.progressStepperStepTitle);
 });
 
 test('Renders Component element as div by default', () => {

package/src/components/ProgressStepper/__tests__/ProgressStepper.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { ProgressStepper } from '../ProgressStepper';
+import styles from '@patternfly/react-styles/css/components/ProgressStepper/progress-stepper';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +17,14 @@ test('Renders children', () => {
   expect(screen.getByRole('list')).toBeVisible();
 });
 
-test('Renders with only class name pf-v5-c-progress-stepper by default', () => {
+test(`Renders with only class name ${styles.progressStepper} by default`, () => {
   render(<ProgressStepper>Test</ProgressStepper>);
-  expect(screen.getByRole('list')).toHaveClass('pf-v5-c-progress-stepper', { exact: true });
+  expect(screen.getByRole('list')).toHaveClass(styles.progressStepper, { exact: true });
 });
 
-test('Renders with class name pf-v5-c-progress-stepper', () => {
+test(`Renders with class name ${styles.progressStepper}`, () => {
   render(<ProgressStepper>Test</ProgressStepper>);
-  expect(screen.getByRole('list')).toHaveClass('pf-v5-c-progress-stepper');
+  expect(screen.getByRole('list')).toHaveClass(styles.progressStepper);
 });
 
 test('Renders with custom class name when className prop is provided', () => {

package/src/components/SearchInput/SearchInput.tsx

@@ -13,6 +13,7 @@ import { AdvancedSearchMenu } from './AdvancedSearchMenu';
 import { TextInputGroup, TextInputGroupMain, TextInputGroupUtilities } from '../TextInputGroup';
 import { InputGroup, InputGroupItem } from '../InputGroup';
 import { Popper } from '../../helpers';
+import textInputGroupStyles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 
 /** Properties for adding search attributes to an advanced search input. These properties must
  * be passed in as an object within an array to the search input component's attribute properrty.
@@ -58,6 +59,9 @@ export interface SearchInputProps extends Omit<React.HTMLProps<HTMLDivElement>,
   appendTo?: HTMLElement | (() => HTMLElement) | 'inline';
   /** An accessible label for the search input. */
   'aria-label'?: string;
+  /** Flag to indicate utilities should be displayed. By default if this prop is undefined or false, utilities will only be displayed when the search input has a value. */
+
+  areUtilitiesDisplayed?: boolean;
   /** Array of attribute values used for dynamically generated advanced search. */
   attributes?: string[] | SearchInputSearchAttribute[];
   /** Additional classes added to the search input. */
@@ -151,6 +155,7 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
   appendTo,
   zIndex = 9999,
   name,
+  areUtilitiesDisplayed,
   ...props
 }: SearchInputProps) => {
   const [isSearchMenuOpen, setIsSearchMenuOpen] = React.useState(false);
@@ -294,11 +299,11 @@ const SearchInputBase: React.FunctionComponent<SearchInputProps> = ({
         onChange={onChangeHandler}
         name={name}
       />
-      {renderUtilities && (
+      {(renderUtilities || areUtilitiesDisplayed) && (
         <TextInputGroupUtilities>
           {resultsCount && <Badge isRead>{resultsCount}</Badge>}
           {!!onNextClick && !!onPreviousClick && (
-            <div className="pf-v5-c-text-input-group__group">
+            <div className={textInputGroupStyles.textInputGroupGroup}>
               <Button
                 variant={ButtonVariant.plain}
                 aria-label={previousNavigationButtonAriaLabel}

package/src/components/SearchInput/__tests__/SearchInput.test.tsx

@@ -7,6 +7,8 @@ import { SearchInput } from '../SearchInput';
 import { FormGroup } from '../../Form';
 import { Button } from '../../Button';
 import { ExternalLinkSquareAltIcon } from '@patternfly/react-icons';
+import badgeStyles from '@patternfly/react-styles/css/components/Badge/badge';
+import textInputGroupStyles from '@patternfly/react-styles/css/components/TextInputGroup/text-input-group';
 
 const props = {
   onChange: jest.fn(),
@@ -30,7 +32,7 @@ describe('SearchInput', () => {
 
   test('result count', () => {
     render(<SearchInput {...props} resultsCount={3} aria-label="simple text input" data-testid="test-id" />);
-    expect(screen.getByTestId('test-id').querySelector('.pf-v5-c-badge')).toBeInTheDocument();
+    expect(screen.getByTestId('test-id').querySelector(`.${badgeStyles.badge}`)).toBeInTheDocument();
   });
 
   test('renders search input in strict mode', async () => {
@@ -64,8 +66,8 @@ describe('SearchInput', () => {
     render(<SearchInput {...props} resultsCount="3 / 7" aria-label="simple text input" data-testid="test-id" />);
 
     const input = screen.getByTestId('test-id');
-    expect(input.querySelector('.pf-v5-c-text-input-group__group')).toBeInTheDocument();
-    expect(input.querySelector('.pf-v5-c-badge')).toBeInTheDocument();
+    expect(input.querySelector(`.${textInputGroupStyles.textInputGroupGroup}`)).toBeInTheDocument();
+    expect(input.querySelector(`.${badgeStyles.badge}`)).toBeInTheDocument();
 
     await user.click(screen.getByRole('button', { name: 'Previous' }));
     expect(props.onPreviousClick).toHaveBeenCalled();
@@ -248,3 +250,11 @@ test('toggleAriaLabel is applied to the expandable toggle', () => {
 
   expect(screen.getByRole('button')).toHaveAccessibleName('Test label');
 });
+
+test('Utilities are rendered when areUtilitiesDisplayed is set', () => {
+  render(
+    <SearchInput {...props} areUtilitiesDisplayed resetButtonLabel='test-util-display'/>
+  );
+  expect(screen.getByLabelText('test-util-display')).toBeVisible();
+});
+

package/src/components/Sidebar/__tests__/Sidebar.test.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Sidebar } from '../Sidebar';
+import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 
 test('Renders without children', () => {
   render(
@@ -16,14 +17,14 @@ test('Renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with only class name pf-v5-c-sidebar by default', () => {
+test(`Renders with only class name ${styles.sidebar} by default`, () => {
   render(<Sidebar>Test</Sidebar>);
-  expect(screen.getByText('Test').parentElement).toHaveClass('pf-v5-c-sidebar', { exact: true });
+  expect(screen.getByText('Test').parentElement).toHaveClass(styles.sidebar, { exact: true });
 });
 
-test('Renders with class name pf-v5-c-sidebar', () => {
+test(`Renders with class name ${styles.sidebar}`, () => {
   render(<Sidebar>Test</Sidebar>);
-  expect(screen.getByText('Test').parentElement).toHaveClass('pf-v5-c-sidebar');
+  expect(screen.getByText('Test').parentElement).toHaveClass(styles.sidebar);
 });
 
 test('Renders with custom class name when className prop is provided', () => {
@@ -61,9 +62,9 @@ test('Renders with class name pf-m-gutter when hasGutter prop is passed', () =>
   expect(screen.getByText('Test').parentElement).toHaveClass('pf-m-gutter');
 });
 
-test('Renders with class name pf-m-sidebar__main by default for child component', () => {
+test(`Renders with class name ${styles.sidebarMain} by default for child component`, () => {
   render(<Sidebar>Test</Sidebar>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-sidebar__main');
+  expect(screen.getByText('Test')).toHaveClass(styles.sidebarMain);
 });
 
 test('Renders with inherited element props spread to the component', () => {

package/src/components/Sidebar/__tests__/SidebarContent.test.tsx

@@ -1,20 +1,21 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { SidebarContent } from '../SidebarContent';
+import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 
 test('Renders children', () => {
   render(<SidebarContent>Test</SidebarContent>);
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with only class name pf-v5-c-sidebar__content by default', () => {
+test(`Renders with only class name ${styles.sidebarContent} by default`, () => {
   render(<SidebarContent>Test</SidebarContent>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-sidebar__content', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.sidebarContent, { exact: true });
 });
 
-test('Renders with class name pf-v5-c-sidebar__content', () => {
+test(`Renders with class name ${styles.sidebarContent}`, () => {
   render(<SidebarContent>Test</SidebarContent>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-sidebar__content');
+  expect(screen.getByText('Test')).toHaveClass(styles.sidebarContent);
 });
 
 test('Renders with custom class name when className prop is provided', () => {

package/src/components/Sidebar/__tests__/SidebarPanel.test.tsx

@@ -1,20 +1,21 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { SidebarPanel, SidebarPanelWidthType } from '../SidebarPanel';
+import styles from '@patternfly/react-styles/css/components/Sidebar/sidebar';
 
 test('Renders children', () => {
   render(<SidebarPanel>Test</SidebarPanel>);
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('Renders with with only class name pf-v5-c-sidebar__panel by default', () => {
+test(`Renders with with only class name ${styles.sidebarPanel} by default`, () => {
   render(<SidebarPanel>Test</SidebarPanel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-sidebar__panel', { exact: true });
+  expect(screen.getByText('Test')).toHaveClass(styles.sidebarPanel, { exact: true });
 });
 
-test('Renders with with class name pf-v5-c-sidebar__panel', () => {
+test(`Renders with with class name ${styles.sidebarPanel}`, () => {
   render(<SidebarPanel>Test</SidebarPanel>);
-  expect(screen.getByText('Test')).toHaveClass('pf-v5-c-sidebar__panel');
+  expect(screen.getByText('Test')).toHaveClass(styles.sidebarPanel);
 });
 
 test('Renders with custom class name when className prop is provided', () => {

package/src/components/Skeleton/Skeleton.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/Skeleton/skeleton';
 import { css } from '@patternfly/react-styles';
+import cssHeight from '@patternfly/react-tokens/dist/esm/c_skeleton_Height';
+import cssWidth from '@patternfly/react-tokens/dist/esm/c_skeleton_Width';
 
 export interface SkeletonProps extends React.HTMLProps<HTMLDivElement> {
   /** Additional classes added to the Skeleton */
@@ -42,8 +44,8 @@ export const Skeleton: React.FunctionComponent<SkeletonProps> = ({
       )}
       {...((width || height) && {
         style: {
-          '--pf-v5-c-skeleton--Width': width ? width : undefined,
-          '--pf-v5-c-skeleton--Height': height ? height : undefined,
+          [cssWidth.name]: width ? width : undefined,
+          [cssHeight.name]: height ? height : undefined,
           ...props.style
         } as React.CSSProperties
       })}

package/src/components/Skeleton/examples/Skeleton.md

@@ -5,6 +5,14 @@ cssPrefix: pf-v5-c-skeleton
 propComponents: ['Skeleton']
 ---
 
+import global_FontSize_4xl from '@patternfly/react-tokens/dist/esm/global_FontSize_4xl';
+import global_FontSize_3xl from '@patternfly/react-tokens/dist/esm/global_FontSize_3xl';
+import global_FontSize_2xl from '@patternfly/react-tokens/dist/esm/global_FontSize_2xl';
+import global_FontSize_xl from '@patternfly/react-tokens/dist/esm/global_FontSize_xl';
+import global_FontSize_lg from '@patternfly/react-tokens/dist/esm/global_FontSize_lg';
+import global_FontSize_md from '@patternfly/react-tokens/dist/esm/global_FontSize_md';
+import global_FontSize_sm from '@patternfly/react-tokens/dist/esm/global_FontSize_sm';
+
 ## Examples
 
 ### Default