@patternfly/react-core 6.0.0-alpha.71 → 6.0.0-alpha.73

package/src/components/Label/examples/LabelOutline.tsx

@@ -328,101 +328,107 @@ export const LabelOutline: React.FunctionComponent = () => {
       </Label>
       <br />
       <br />
-      <Label variant="outline" color="cyan">
-        Cyan
+      <Label variant="outline" color="teal">
+        Teal
       </Label>
-      <Label variant="outline" color="cyan" icon={<CubeIcon />}>
-        Cyan icon
+      <Label variant="outline" color="teal" icon={<CubeIcon />}>
+        Teal icon
       </Label>
-      <Label variant="outline" color="cyan" onClose={() => Function.prototype}>
-        Cyan removable
+      <Label variant="outline" color="teal" onClose={() => Function.prototype}>
+        Teal removable
       </Label>
-      <Label variant="outline" color="cyan" icon={<CubeIcon />} onClose={() => Function.prototype}>
-        Cyan icon removable
+      <Label variant="outline" color="teal" icon={<CubeIcon />} onClose={() => Function.prototype}>
+        Teal icon removable
       </Label>
-      <Label variant="outline" color="cyan" href="#outline">
-        Cyan link
+      <Label variant="outline" color="teal" href="#outline">
+        Teal link
       </Label>
-      <Label variant="outline" color="cyan" href="#outline" onClose={() => Function.prototype}>
-        Cyan link removable
+      <Label variant="outline" color="teal" href="#outline" onClose={() => Function.prototype}>
+        Teal link removable
       </Label>{' '}
-      <Label variant="outline" color="cyan" onClick={() => logColor('cyan')}>
-        Cyan clickable
+      <Label variant="outline" color="teal" onClick={() => logColor('teal')}>
+        Teal clickable
       </Label>
-      <Label variant="outline" color="cyan" onClick={() => logColor('cyan')} onClose={() => Function.prototype}>
-        Cyan clickable removable
+      <Label variant="outline" color="teal" onClick={() => logColor('teal')} onClose={() => Function.prototype}>
+        Teal clickable removable
       </Label>
-      <Label variant="outline" color="cyan" icon={<CubeIcon />} onClose={() => Function.prototype} textMaxWidth="16ch">
-        Cyan label with icon that overflows
+      <Label variant="outline" color="teal" icon={<CubeIcon />} onClose={() => Function.prototype} textMaxWidth="16ch">
+        Teal label with icon that overflows
       </Label>{' '}
       <Label
         variant="outline"
-        color="cyan"
+        color="teal"
         isDisabled
         icon={<CubeIcon />}
         href="#filled"
         onClose={() => Function.prototype}
       >
-        Cyan link removable (disabled)
+        Teal link removable (disabled)
       </Label>{' '}
       <Label
         variant="outline"
-        color="cyan"
+        color="teal"
         isDisabled
         icon={<CubeIcon />}
-        onClick={() => logColor('cyan')}
+        onClick={() => logColor('teal')}
         onClose={() => Function.prototype}
       >
-        Cyan clickable removable (disabled)
+        Teal clickable removable (disabled)
       </Label>
       <br />
       <br />
-      <Label variant="outline" color="gold">
-        Gold
+      <Label variant="outline" color="yellow">
+        Yellow
       </Label>
-      <Label variant="outline" color="gold" icon={<CubeIcon />}>
-        Gold icon
+      <Label variant="outline" color="yellow" icon={<CubeIcon />}>
+        Yellow icon
       </Label>
-      <Label variant="outline" color="gold" onClose={() => Function.prototype}>
-        Gold removable
+      <Label variant="outline" color="yellow" onClose={() => Function.prototype}>
+        Yellow removable
       </Label>
-      <Label variant="outline" color="gold" icon={<CubeIcon />} onClose={() => Function.prototype}>
-        Gold icon removable
+      <Label variant="outline" color="yellow" icon={<CubeIcon />} onClose={() => Function.prototype}>
+        Yellow icon removable
       </Label>
-      <Label variant="outline" color="gold" href="#outline">
-        Gold link
+      <Label variant="outline" color="yellow" href="#outline">
+        Yellow link
       </Label>
-      <Label variant="outline" color="gold" href="#outline" onClose={() => Function.prototype}>
-        Gold link removable
+      <Label variant="outline" color="yellow" href="#outline" onClose={() => Function.prototype}>
+        Yellow link removable
       </Label>{' '}
-      <Label variant="outline" color="gold" onClick={() => logColor('gold')}>
-        Gold clickable
+      <Label variant="outline" color="yellow" onClick={() => logColor('yellow')}>
+        Yellow clickable
       </Label>
-      <Label variant="outline" color="gold" onClick={() => logColor('gold')} onClose={() => Function.prototype}>
-        Gold clickable removable
+      <Label variant="outline" color="yellow" onClick={() => logColor('yellow')} onClose={() => Function.prototype}>
+        Yellow clickable removable
       </Label>
-      <Label variant="outline" color="gold" icon={<CubeIcon />} onClose={() => Function.prototype} textMaxWidth="16ch">
-        Gold label with icon that overflows
+      <Label
+        variant="outline"
+        color="yellow"
+        icon={<CubeIcon />}
+        onClose={() => Function.prototype}
+        textMaxWidth="16ch"
+      >
+        Yellow label with icon that overflows
       </Label>{' '}
       <Label
         variant="outline"
-        color="gold"
+        color="yellow"
         isDisabled
         icon={<CubeIcon />}
         href="#filled"
         onClose={() => Function.prototype}
       >
-        Gold link removable (disabled)
+        Yellow link removable (disabled)
       </Label>{' '}
       <Label
         variant="outline"
-        color="gold"
+        color="yellow"
         isDisabled
         icon={<CubeIcon />}
-        onClick={() => logColor('gold')}
+        onClick={() => logColor('yellow')}
         onClose={() => Function.prototype}
       >
-        Gold clickable removable (disabled)
+        Yellow clickable removable (disabled)
       </Label>
       <br />
       <br />

package/src/components/MenuToggle/MenuToggle.tsx

@@ -6,6 +6,7 @@ import { BadgeProps } from '../Badge';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+import { OUIAProps, getDefaultOUIAId, getOUIAProps } from '../../helpers';
 
 export enum MenuToggleStatus {
   success = 'success',
@@ -24,12 +25,13 @@ export interface SplitButtonOptions {
 
 export interface MenuToggleProps
   extends Omit<
-    React.DetailedHTMLProps<
-      React.ButtonHTMLAttributes<HTMLButtonElement> & React.HTMLAttributes<HTMLDivElement>,
-      MenuToggleElement
+      React.DetailedHTMLProps<
+        React.ButtonHTMLAttributes<HTMLButtonElement> & React.HTMLAttributes<HTMLDivElement>,
+        MenuToggleElement
+      >,
+      'ref'
     >,
-    'ref'
-  > {
+    OUIAProps {
   /** Content rendered inside the toggle */
   children?: React.ReactNode;
   /** Additional classes added to the toggle */
@@ -58,16 +60,29 @@ export interface MenuToggleProps
   badge?: BadgeProps | React.ReactNode;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<MenuToggleElement>;
+  /** Value to overwrite the randomly generated data-ouia-component-id. It will always target the toggle button. */
+  ouiaId?: number | string;
+  /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
+  ouiaSafe?: boolean;
 }
 
-class MenuToggleBase extends React.Component<MenuToggleProps> {
+interface MenuToggleState {
+  ouiaStateId: string;
+}
+
+class MenuToggleBase extends React.Component<MenuToggleProps, MenuToggleState> {
   displayName = 'MenuToggleBase';
   static defaultProps: MenuToggleProps = {
     className: '',
     isExpanded: false,
     isDisabled: false,
     isFullWidth: false,
-    isFullHeight: false
+    isFullHeight: false,
+    ouiaSafe: true
+  };
+
+  state: MenuToggleState = {
+    ouiaStateId: getDefaultOUIAId(MenuToggle.displayName, this.props.variant)
   };
 
   render() {
@@ -87,12 +102,16 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
       innerRef,
       onClick,
       'aria-label': ariaLabel,
+      ouiaId,
+      ouiaSafe,
       ...otherProps
     } = this.props;
     const isPlain = variant === 'plain';
     const isPlainText = variant === 'plainText';
     const isTypeahead = variant === 'typeahead';
 
+    const ouiaProps = getOUIAProps(MenuToggle.displayName, ouiaId ?? this.state.ouiaStateId, ouiaSafe);
+
     let _statusIcon = statusIcon;
     if (!statusIcon) {
       switch (status) {
@@ -130,6 +149,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             onClick={onClick}
             aria-label={ariaLabel || 'Menu toggle'}
             tabIndex={-1}
+            {...ouiaProps}
           >
             {toggleControls}
           </button>
@@ -189,6 +209,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             onClick={onClick}
             {...(children && { style: { display: 'flex', paddingLeft: 'var(--pf-v5-global--spacer--sm)' } })}
             {...otherProps}
+            {...ouiaProps}
           >
             {children && <span className={css(styles.menuToggleText)}>{children}</span>}
             {toggleControls}
@@ -207,6 +228,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
         disabled={isDisabled}
         onClick={onClick}
         {...componentProps}
+        {...ouiaProps}
       />
     );
   }

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

@@ -5,6 +5,9 @@ exports[`menu toggle passes additional classes 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle test-class"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-2"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -42,6 +45,9 @@ exports[`menu toggle renders successfully 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-1"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -79,6 +85,9 @@ exports[`menu toggle shows badge 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-6"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -125,6 +134,9 @@ exports[`menu toggle shows icon 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-5"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -179,6 +191,9 @@ exports[`menu toggle shows isDisabled 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle pf-m-disabled"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-4"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     disabled=""
     type="button"
   >
@@ -217,6 +232,9 @@ exports[`menu toggle shows isExpanded 1`] = `
   <button
     aria-expanded="true"
     class="pf-v6-c-menu-toggle pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-3"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -254,6 +272,9 @@ exports[`menu toggle shows isPlain 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle pf-m-plain"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plain-1"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -282,6 +303,9 @@ exports[`menu toggle shows isPrimary 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle pf-m-primary"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-primary-1"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -319,6 +343,9 @@ exports[`menu toggle shows plain text 1`] = `
   <button
     aria-expanded="false"
     class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span

package/src/components/MenuToggle/examples/MenuToggle.md

@@ -191,9 +191,11 @@ import { MenuToggle } from '@patternfly/react-core';
 </React.Fragment>
 ```
 
-### Split button toggle with checkbox
+### Split toggle with checkbox
 
-To add an action button or other control to a menu toggle, use a split button. A `<MenuToggle>` can be rendered as a split button by adding a `splitButtonOptions` object. Elements to be displayed before the toggle button must be included in the `items` property of `splitButtonOptions`.
+To add a checkbox (or other action/control) to a menu toggle, use a split button. 
+
+A `<MenuToggle>` can be rendered as a split button by adding a `splitButtonOptions` object. Elements to be displayed before the toggle button must be included in the `items` property of `splitButtonOptions`.
 
 The following example shows a split button with a `<MenuToggleCheckbox>`.
 
@@ -203,25 +205,25 @@ Variant styling can be applied to split button toggles to adjust their appearanc
 
 ```
 
-### Split button toggle with checkbox label
+### Split toggle with labeled checkbox
 
-To display text in a split button menu toggle, add a label to the `items` property of `splitButtonOptions`.
+To add a text label to a split button toggle, pass `children` to the `<MenuToggle>` component.
 
-```ts file='MenuToggleSplitButtonCheckboxWithText.tsx'
+```ts file='MenuToggleSplitButtonCheckboxWithToggleText.tsx'
 
 ```
 
-### Split button toggle with checkbox and toggle button text
+### Split toggle with checkbox and toggle text label
 
-For split button toggles that should still contain text which will trigger the toggle's `onClick`, pass `children` to the `MenuToggle`.
+You can allow users to select a toggle checkbox by clicking either the checkbox or the text label.
 
-The following example shows a split button with a `<MenuToggleCheckbox>` and toggle button text.
+To do so, pass `children` to the `<MenuToggleCheckbox>` component. When the menu toggle text is clicked, the checkbox's `onChange` callback will be triggered.
 
-```ts file='MenuToggleSplitButtonCheckboxWithToggleText.tsx'
+```ts file='MenuToggleSplitButtonCheckboxWithText.tsx'
 
 ```
 
-### Split button toggle with action
+### Split toggle with action
 
 To add an action to a split button, pass `variant='action'` into `splitButtonOptions` and add a `<MenuToggleAction>` to the `items` property of `splitButtonOptions`.
 

package/src/components/Nav/__tests__/Generated/NavList.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { render } from '@testing-library/react';
-import * as ReactCoreUtils from '@patternfly/react-core/src/helpers/util';
+import * as ReactCoreUtils from '../../../../helpers/util';
 
 import { NavList } from '../../NavList';
 import { NavContext } from '../../Nav';

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

@@ -874,7 +874,7 @@ exports[`Nav Nav List with flyout 1`] = `
       data-popper-escaped="true"
       data-popper-placement="right-start"
       data-popper-reference-hidden="true"
-      style="position: absolute; left: 0px; top: 0px; z-index: 9999; opacity: 0; transition: opacity 0ms cubic-bezier(.54, 1.5, .38, 1.11); min-width: 0px; transform: translate(0px, 0px);"
+      style="position: absolute; left: 0px; top: 0px; z-index: 9999; opacity: 1; transition: opacity 0ms cubic-bezier(.54, 1.5, .38, 1.11); min-width: 0px; transform: translate(0px, 0px);"
     >
       <div>
         Flyout test

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

@@ -95,6 +95,14 @@ To remove padding at specific breakpoints, pass in 'noPadding' at those breakpoi
 
 ```
 
+### Main section variations
+
+This example shows all types of page sections.
+
+```ts file="./PageMainSectionVariations.tsx"
+
+```
+
 ### Group section
 
 To group page content sections, add 1 or more `<PageGroup>` components to a `<Page>`.

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

@@ -0,0 +1,84 @@
+import React from 'react';
+import {
+  Page,
+  Masthead,
+  MastheadToggle,
+  MastheadMain,
+  MastheadBrand,
+  MastheadContent,
+  PageSidebar,
+  PageSidebarBody,
+  PageSection,
+  PageToggleButton,
+  Toolbar,
+  ToolbarContent,
+  ToolbarItem
+} from '@patternfly/react-core';
+import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
+
+export const PageMainSectionPadding: React.FunctionComponent = () => {
+  const [isSidebarOpen, setIsSidebarOpen] = React.useState(true);
+
+  const onSidebarToggle = () => {
+    setIsSidebarOpen(!isSidebarOpen);
+  };
+
+  const headerToolbar = (
+    <Toolbar id="main-variations-toolbar">
+      <ToolbarContent>
+        <ToolbarItem>header-tools</ToolbarItem>
+      </ToolbarContent>
+    </Toolbar>
+  );
+
+  const header = (
+    <Masthead>
+      <MastheadToggle>
+        <PageToggleButton
+          variant="plain"
+          aria-label="Global navigation"
+          isSidebarOpen={isSidebarOpen}
+          onSidebarToggle={onSidebarToggle}
+          id="main-variations-nav-toggle"
+        >
+          <BarsIcon />
+        </PageToggleButton>
+      </MastheadToggle>
+      <MastheadMain>
+        <MastheadBrand href="https://patternfly.org" target="_blank">
+          Logo
+        </MastheadBrand>
+      </MastheadMain>
+      <MastheadContent>{headerToolbar}</MastheadContent>
+    </Masthead>
+  );
+
+  const sidebar = (
+    <PageSidebar isSidebarOpen={isSidebarOpen} id="main-variations-sidebar">
+      <PageSidebarBody>Navigation</PageSidebarBody>
+    </PageSidebar>
+  );
+
+  return (
+    <Page header={header} sidebar={sidebar}>
+      <PageSection type="subnav">
+        Section with <code>type="subnav"</code> for horizontal subnav navigation
+      </PageSection>
+      <PageSection type="nav">
+        Section with <code>type="nav"</code> for tertiary navigation
+      </PageSection>
+      <PageSection type="tabs">
+        Section with <code>type="tabs"</code> for tabs
+      </PageSection>
+      <PageSection type="breadcrumb">
+        Section with <code>type="breadcrumb"</code> for breadcrumbs
+      </PageSection>
+      <PageSection>
+        Section without <code>type</code> prop or <code>type="default"</code> for main sections
+      </PageSection>
+      <PageSection type="wizard">
+        Section with <code>type="wizard"</code> for wizards
+      </PageSection>
+    </Page>
+  );
+};

package/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap

@@ -6,6 +6,9 @@ exports[`PaginationOptionsMenu should match snapshot (auto-generated) 1`] = `
     aria-expanded="false"
     aria-haspopup="listbox"
     class="pf-v6-c-menu-toggle pf-m-plain pf-m-text"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+    data-ouia-component-type="PF6/MenuToggle"
+    data-ouia-safe="true"
     id="''-toggle"
     type="button"
   >