@patternfly/react-core 6.0.0-alpha.1 → 6.0.0-alpha.3

package/src/components/HelperText/__tests__/__snapshots__/HelperText.test.tsx.snap

@@ -1,230 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`HelperText default helper text variant applies successfully 1`] = `
+exports[`Renders to match snapshot 1`] = `
 <DocumentFragment>
   <div
-    class="pf-v5-c-helper-text__item"
-  >
-    <span
-      class="pf-v5-c-helper-text__item-text"
-    >
-      default help test text
-    </span>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText dynamic helper text renders successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text"
-  >
-    <div
-      class="pf-v5-c-helper-text__item pf-m-dynamic"
-    >
-      <span
-        aria-hidden="true"
-        class="pf-v5-c-helper-text__item-icon"
-      >
-        <svg
-          aria-hidden="true"
-          class="pf-v5-svg"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          viewBox="0 0 448 512"
-          width="1em"
-        >
-          <path
-            d="M416 208H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h384c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z"
-          />
-        </svg>
-      </span>
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text
-        <span
-          class="pf-v5-screen-reader"
-        >
-          : default status;
-        </span>
-      </span>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText helper text block renders successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text"
-  >
-    <div
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text 1
-      </span>
-    </div>
-    <div
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text 2
-      </span>
-    </div>
-    <div
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text 3
-      </span>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText icon helper text renders properly 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text"
-  >
-    <div
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        aria-hidden="true"
-        class="pf-v5-c-helper-text__item-icon"
-      >
-        <svg
-          aria-hidden="true"
-          class="pf-v5-svg"
-          fill="currentColor"
-          height="1em"
-          role="img"
-          viewBox="0 0 512 512"
-          width="1em"
-        >
-          <path
-            d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"
-          />
-        </svg>
-      </span>
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text
-      </span>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText indeterminate helper text variant applies successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text__item pf-m-indeterminate"
-  >
-    <span
-      class="pf-v5-c-helper-text__item-text"
-    >
-      indeterminate help test text
-    </span>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText invalid helper text variant applies successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text__item"
-  >
-    <span
-      class="pf-v5-c-helper-text__item-text"
-    >
-      invalid help test text
-    </span>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText simple helper text renders successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text"
-  >
-    <div
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text
-      </span>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText success helper text variant applies successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text__item pf-m-success"
-  >
-    <span
-      class="pf-v5-c-helper-text__item-text"
-    >
-      success help test text
-    </span>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`HelperText variant comonent helper text renders properly 1`] = `
-<DocumentFragment>
-  <ul
     class="pf-v5-c-helper-text"
-    role="list"
-  >
-    <li
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text 1
-      </span>
-    </li>
-    <li
-      class="pf-v5-c-helper-text__item"
-    >
-      <span
-        class="pf-v5-c-helper-text__item-text"
-      >
-        help test text 2
-      </span>
-    </li>
-  </ul>
-</DocumentFragment>
-`;
-
-exports[`HelperText warning helper text variant applies successfully 1`] = `
-<DocumentFragment>
-  <div
-    class="pf-v5-c-helper-text__item pf-m-warning"
-  >
-    <span
-      class="pf-v5-c-helper-text__item-text"
-    >
-      warning help test text
-    </span>
-  </div>
+  />
 </DocumentFragment>
 `;

package/src/components/HelperText/__tests__/__snapshots__/HelperTextItem.test.tsx.snap

@@ -0,0 +1,15 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Renders to match snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="pf-v5-c-helper-text__item"
+  >
+    <span
+      class="pf-v5-c-helper-text__item-text"
+    >
+      help test text
+    </span>
+  </div>
+</DocumentFragment>
+`;

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Hint } from '../Hint';
+import styles from '@patternfly/react-styles/css/components/Hint/hint';
 
 test('renders without children', () => {
   render(<Hint data-testid="Hint" />);
@@ -14,12 +15,12 @@ test('renders children', () => {
   expect(screen.getByText('Test')).toBeVisible();
 });
 
-test('renders with class pf-v5-c-hint', () => {
+test(`renders with class ${styles.hint}`, () => {
   render(<Hint>Test</Hint>);
 
   const hint = screen.getByText('Test');
 
-  expect(hint).toHaveClass('pf-v5-c-hint');
+  expect(hint).toHaveClass(styles.hint);
 });
 
 test('renders with custom class names provided via prop', () => {
@@ -46,12 +47,12 @@ test('renders actions options', () => {
   expect(actions).toBeVisible();
 });
 
-test('renders with class pf-v5-c-hint__actions if there is an action prop', () => {
+test(`renders with class ${styles.hintActions} if there is an action prop`, () => {
   render(<Hint actions="actions">Test</Hint>);
 
   const hint = screen.getByText('actions');
 
-  expect(hint).toHaveClass('pf-v5-c-hint__actions');
+  expect(hint).toHaveClass(styles.hintActions);
 });
 
 test('renders with inherited element props spread to the component', () => {

package/src/components/Hint/__tests__/HintBody.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
+import styles from '@patternfly/react-styles/css/components/Hint/hint';
 
 import { HintBody } from '../HintBody';
 
@@ -16,12 +17,12 @@ test('renders children', () => {
   expect(screen.getByRole('button', { name: 'Test Me' })).toBeVisible();
 });
 
-test('renders with class pf-v5-c-hint__body', () => {
+test(`renders with class ${styles.hintBody}`, () => {
   render(<HintBody>Hint Body Test</HintBody>);
 
   const body = screen.getByText('Hint Body Test');
 
-  expect(body).toHaveClass('pf-v5-c-hint__body');
+  expect(body).toHaveClass(styles.hintBody);
 });
 
 test('renders with custom class names provided via prop', () => {

package/src/components/Hint/__tests__/HintFooter.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
+import styles from '@patternfly/react-styles/css/components/Hint/hint';
 
 import { HintFooter } from '../HintFooter';
 
@@ -16,12 +17,12 @@ test('renders children', () => {
   expect(screen.getByRole('button', { name: 'Test Me' })).toBeVisible();
 });
 
-test('renders with class pf-v5-c-hint__footer', () => {
+test(`renders with class ${styles.hintFooter}`, () => {
   render(<HintFooter>Hint Body Test</HintFooter>);
 
   const body = screen.getByText('Hint Body Test');
 
-  expect(body).toHaveClass('pf-v5-c-hint__footer');
+  expect(body).toHaveClass(styles.hintFooter);
 });
 
 test('renders with custom class names provided via prop', () => {

package/src/components/Hint/__tests__/HintTitle.test.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
+import styles from '@patternfly/react-styles/css/components/Hint/hint';
 
 import { HintTitle } from '../HintTitle';
 
@@ -16,12 +17,12 @@ test('renders children', () => {
   expect(screen.getByRole('button', { name: 'Test Me' })).toBeVisible();
 });
 
-test('renders with class pf-v5-c-hint__title', () => {
+test(`renders with class ${styles.hintTitle}`, () => {
   render(<HintTitle>Hint Body Test</HintTitle>);
 
   const body = screen.getByText('Hint Body Test');
 
-  expect(body).toHaveClass('pf-v5-c-hint__title');
+  expect(body).toHaveClass(styles.hintTitle);
 });
 
 test('renders with custom class names provided via prop', () => {

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

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Icon } from '../Icon';
-import { CheckIcon } from '@patternfly/react-icons';
+import CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
+import styles from '@patternfly/react-styles/css/components/Icon/icon';
 
 test('renders basic icon successfully', () => {
   const { asFragment } = render(
@@ -13,15 +14,15 @@ test('renders basic icon successfully', () => {
 });
 
 test('checks basic icon structure', () => {
-  const { asFragment } = render(
+  render(
     <Icon title="icon">
       <CheckIcon />
     </Icon>
   );
   const iconContainer = screen.getByTitle('icon');
-  expect(iconContainer).toHaveClass('pf-v5-c-icon');
-  const iconContent = iconContainer.querySelector('.pf-v5-c-icon__content');
-  expect(iconContent).toHaveClass('pf-v5-c-icon__content');
+  expect(iconContainer).toHaveClass(styles.icon);
+  const iconContent = iconContainer.querySelector(`.${styles.iconContent}`);
+  expect(iconContent).toHaveClass(styles.iconContent);
 });
 
 test('renders without children', () => {
@@ -47,7 +48,7 @@ Object.values(['sm', 'md', 'lg', 'xl']).forEach((size) => {
         <CheckIcon />
       </Icon>
     );
-    const iconContainer = screen.getByTitle(`content-${size}-icon`).querySelector('.pf-v5-c-icon__content');
+    const iconContainer = screen.getByTitle(`content-${size}-icon`).querySelector(`.${styles.iconContent}`);
 
     expect(iconContainer).toHaveClass(`pf-m-${size}`);
   });
@@ -59,7 +60,7 @@ test('check icon without iconSize', () => {
       <CheckIcon />
     </Icon>
   );
-  const iconContainer = screen.getByTitle('no-icon-size').querySelector('.pf-v5-c-icon__content');
+  const iconContainer = screen.getByTitle('no-icon-size').querySelector(`.${styles.iconContent}`);
   expect(Array.from(iconContainer?.classList || []).some((c) => /pf-m-*/.test(c))); // Check no modifier classes have been added
 });
 
@@ -70,7 +71,7 @@ Object.values(['sm', 'md', 'lg', 'xl']).forEach((size) => {
         <CheckIcon />
       </Icon>
     );
-    const iconContainer = screen.getByTitle(`progress-content-${size}-icon`).querySelector('.pf-v5-c-icon__progress');
+    const iconContainer = screen.getByTitle(`progress-content-${size}-icon`).querySelector(`.${styles.iconProgress}`);
 
     expect(iconContainer).toHaveClass(`pf-m-${size}`);
   });
@@ -82,7 +83,7 @@ test('check icon without progress icon size', () => {
       <CheckIcon />
     </Icon>
   );
-  const iconContainer = screen.getByTitle('no-progress-icon-size').querySelector('.pf-v5-c-icon__progress');
+  const iconContainer = screen.getByTitle('no-progress-icon-size').querySelector(`.${styles.iconProgress}`);
   expect(Array.from(iconContainer?.classList || []).some((c) => /pf-m-*/.test(c))); // Check no modifier classes have been added
 });
 
@@ -116,7 +117,7 @@ Object.values(['custom', 'info', 'success', 'warning', 'danger']).forEach((statu
         <CheckIcon />
       </Icon>
     );
-    const iconContent = screen.getByTitle(`${status}-icon`).querySelector('.pf-v5-c-icon__content');
+    const iconContent = screen.getByTitle(`${status}-icon`).querySelector(`.${styles.iconContent}`);
 
     expect(iconContent).toHaveClass(`pf-m-${status}`);
   });
@@ -128,7 +129,7 @@ test('check icon without status', () => {
       <CheckIcon />
     </Icon>
   );
-  const iconContent = screen.getByTitle('no-status').querySelector('.pf-v5-c-icon__content');
+  const iconContent = screen.getByTitle('no-status').querySelector(`.${styles.iconContent}`);
   expect(Array.from(iconContent?.classList || []).some((c) => /pf-m-*/.test(c))); // Check no modifier classes have been added
 });
 
@@ -162,8 +163,8 @@ test('sets isInProgress successfully', () => {
   const iconContainer = screen.getByTitle('progress-icon');
   expect(iconContainer).toHaveClass('pf-m-in-progress');
 
-  const iconContent = iconContainer.querySelector('.pf-v5-c-icon__progress');
-  expect(iconContent).toHaveClass('pf-v5-c-icon__progress');
+  const iconContent = iconContainer.querySelector(`.${styles.iconProgress}`);
+  expect(iconContent).toHaveClass(styles.iconProgress);
 });
 
 test('check icon without isInProgress', () => {

package/src/components/InputGroup/InputGroup.tsx

@@ -1,9 +1,6 @@
 import * as React from 'react';
 import styles from '@patternfly/react-styles/css/components/InputGroup/input-group';
 import { css } from '@patternfly/react-styles';
-import { FormSelect } from '../FormSelect';
-import { TextArea } from '../TextArea';
-import { TextInput } from '../TextInput';
 
 export interface InputGroupProps extends React.HTMLProps<HTMLDivElement> {
   /** Additional classes added to the input group. */
@@ -20,61 +17,12 @@ export const InputGroupBase: React.FunctionComponent<InputGroupProps> = ({
   innerRef,
   ...props
 }: InputGroupProps) => {
-  const getIdItem = () => {
-    const getChildId = (_children: any) =>
-      React.Children.toArray(_children).find(
-        (_child: any) => !formCtrls.includes(_child?.type?.displayName) && _child?.props?.id
-      );
-    let childId = getChildId(children);
-    if (childId) {
-      return childId;
-    }
-    React.Children.toArray(children).find((child: any) => {
-      const _childId = getChildId(child.props.children);
-      if (_childId) {
-        childId = _childId;
-        return true;
-      }
-    });
-    return childId;
-  };
-  const formCtrls = [FormSelect, TextArea, TextInput].map((comp) => comp.displayName);
-  const idItem = getIdItem() as React.ReactElement<{ id: string }>;
   const ref = React.useRef(null);
   const inputGroupRef = innerRef || ref;
 
-  const childrenWithId = React.Children.map(children, (child: any) => {
-    if (child?.type.displayName === 'InputGroupItem') {
-      const newChildren = React.Children.map(child.props.children, (_child) => {
-        if (!_child.props) {
-          return _child;
-        }
-        if (_child.props['aria-describedby']) {
-          return _child;
-        }
-        if (!formCtrls.includes(_child.type.displayName)) {
-          return _child;
-        }
-        return React.cloneElement(_child, {
-          'aria-describedby': _child.props['aria-describedby'] === '' ? undefined : idItem?.props?.id
-        });
-      });
-      return React.cloneElement(child, {}, newChildren);
-    }
-
-    if (child?.props['aria-describedby']) {
-      return child;
-    }
-    if (!formCtrls.includes(child?.type.displayName)) {
-      return child;
-    }
-    return React.cloneElement(child, {
-      'aria-describedby': child.props['aria-describedby'] === '' ? undefined : idItem?.props?.id
-    });
-  });
   return (
     <div ref={inputGroupRef} className={css(styles.inputGroup, className)} {...props}>
-      {idItem ? childrenWithId : children}
+      {children}
     </div>
   );
 };

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

@@ -8,59 +8,22 @@ import { Button } from '../../Button';
 import { TextInput } from '../../TextInput';
 
 describe('InputGroup', () => {
-  test('add aria-describedby to form-control if one of the non form-controls has id', () => {
-    // In this test, TextInput is a form-control component and Button is not.
-    // If Button has an id props, this should be used in aria-describedby.
+  // Regression test for https://github.com/patternfly/patternfly-react/issues/9667
+  test('wont add aria-describedby automatically to form-control', () => {
     render(
       <InputGroup>
         <InputGroupItem>
-          <TextInput value="some data" aria-label="some text" />
+          <TextInput aria-label="User password" />
         </InputGroupItem>
         <InputGroupItem>
-          <Button variant="primary" id="button-id">
-            hello
+          <Button variant="control" id="show-password-toggler">
+            Show
           </Button>
         </InputGroupItem>
       </InputGroup>
     );
-    expect(screen.getByLabelText('some text')).toHaveAttribute('aria-describedby', 'button-id');
-  });
 
-  test('wont add aria-describedby to form-control if describedby is empty string', () => {
-    // In this test, TextInput is a form-control component and Button is not.
-    // If Button has an id props, this should be used in aria-describedby, but this
-    // example has an empty aria-describedby to prevent that from happening.
-    render(
-      <InputGroup>
-        <InputGroupItem>
-          <TextInput value="some data" aria-describedby="" aria-label="some text" />
-        </InputGroupItem>
-        <InputGroupItem>
-          <Button id="button-id">
-            hello
-          </Button>
-        </InputGroupItem>
-      </InputGroup>
-    );
-    expect(screen.getByLabelText('some text')).not.toHaveAttribute('aria-describedby');
-  });
-
-  test('wont override aria-describedby in form-control if describedby has value', () => {
-    // In this test, TextInput is a form-control component and Button is not.
-    // If Button has an id props, this should be used in aria-describedby, but this
-    // example has a predefined aria-describedby to prevent that from happening
-    render(
-      <InputGroup>
-        <InputGroupItem>
-          <TextInput value="some data" aria-describedby="myself" aria-label="some text" />
-        </InputGroupItem>
-        <InputGroupItem>
-          <Button id="button-id">
-            hello
-          </Button>
-        </InputGroupItem>
-      </InputGroup>
-    );
-    expect(screen.getByLabelText('some text')).toHaveAttribute('aria-describedby', 'myself');
+    const formControl = screen.getByLabelText('User password');
+    expect(formControl).not.toHaveAttribute('aria-describedby');
   });
 });

package/src/components/JumpLinks/JumpLinks.tsx

@@ -227,7 +227,7 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
       {...props}
     >
       <div className={styles.jumpLinksMain}>
-        <div className={css('pf-v5-c-jump-links__header')}>
+        <div className={css(`${styles.jumpLinks}__header`)}>
           {expandable && (
             <div className={styles.jumpLinksToggle}>
               <Button

package/src/components/Label/Label.tsx

@@ -7,6 +7,7 @@ import { Tooltip, TooltipPosition } from '../Tooltip';
 import { css } from '@patternfly/react-styles';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 import { useIsomorphicLayoutEffect } from '../../helpers';
+import cssTextMaxWidth from '@patternfly/react-tokens/dist/esm/c_label__text_MaxWidth';
 
 export interface LabelProps extends React.HTMLProps<HTMLSpanElement> {
   /** Content rendered inside the label. */
@@ -230,7 +231,7 @@ export const Label: React.FunctionComponent<LabelProps> = ({
         className={css(styles.labelText)}
         {...(textMaxWidth && {
           style: {
-            '--pf-v5-c-label__text--MaxWidth': textMaxWidth
+            [cssTextMaxWidth.name]: textMaxWidth
           } as React.CSSProperties
         })}
       >

package/src/components/Masthead/Masthead.tsx

@@ -9,8 +9,6 @@ export interface MastheadProps extends React.DetailedHTMLProps<React.HTMLProps<H
   children?: React.ReactNode;
   /** Additional classes added to the masthead */
   className?: string;
-  /** Background theme color of the masthead */
-  backgroundColor?: 'dark' | 'light' | 'light200';
   /** Display type at various breakpoints */
   display?: {
     default?: 'inline' | 'stack';
@@ -34,7 +32,6 @@ export interface MastheadProps extends React.DetailedHTMLProps<React.HTMLProps<H
 export const Masthead: React.FunctionComponent<MastheadProps> = ({
   children,
   className,
-  backgroundColor = 'dark',
   display = {
     md: 'inline'
   },
@@ -48,8 +45,6 @@ export const Masthead: React.FunctionComponent<MastheadProps> = ({
         styles.masthead,
         formatBreakpointMods(display, styles, 'display-', getBreakpoint(width)),
         formatBreakpointMods(inset, styles, '', getBreakpoint(width)),
-        backgroundColor === 'light' && styles.modifiers.light,
-        backgroundColor === 'light200' && styles.modifiers.light_200,
         className
       )}
       {...props}

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

@@ -62,7 +62,7 @@ describe('Masthead', () => {
     'insetXl',
     'inset2xl',
     'inset3xl'
-  ]).forEach(inset => {
+  ]).forEach((inset) => {
     test(`verify ${inset} inset breakpoints`, () => {
       const { asFragment } = render(
         <Masthead inset={{ default: inset, sm: inset, md: inset, lg: inset, xl: inset, '2xl': inset }}>test</Masthead>