@patternfly/react-core 6.6.0-prerelease.9 → 6.6.1-prerelease.0

package/src/components/JumpLinks/JumpLinks.tsx

@@ -142,6 +142,10 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
       return;
     }
     const scrollPosition = Math.ceil(scrollableElement.scrollTop + offset);
+    // Take into account the last section not having enough content to trigger a scroll position; without
+    // checking if at the bottom of the scroll container, the last JumpLinksItem never becomes "active".
+    const isAtBottom =
+      Math.ceil(scrollableElement.scrollTop + scrollableElement.clientHeight) >= scrollableElement.scrollHeight;
     window.requestAnimationFrame(() => {
       let newScrollItems = scrollItems;
       // Items might have rendered after this component or offsetTop values may need
@@ -153,6 +157,11 @@ export const JumpLinks: React.FunctionComponent<JumpLinksProps> = ({
         setScrollItems(newScrollItems);
       }
 
+      if (isAtBottom) {
+        const lastIndex = newScrollItems.length - 1;
+        return setActiveIndex(lastIndex);
+      }
+
       const scrollElements = newScrollItems
         .map((e, index) => ({
           y: e ? e.offsetTop : null,

package/src/components/List/examples/List.md

@@ -6,34 +6,49 @@ propComponents: ['List', 'ListItem']
 ---
 
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 ## Examples
+
 ### Basic
+
 ```ts file="./ListBasic.tsx"
+
 ```
 
 ### Inline
+
 ```ts file="./ListInline.tsx"
+
 ```
 
 ### Ordered
+
 ```ts file="./ListOrdered.tsx"
+
 ```
 
 ### Plain
+
 ```ts file="./ListPlain.tsx"
+
 ```
 
 ### With horizontal rules
+
 ```ts file="./ListHorizontalRules.tsx"
+
 ```
 
 ### With icons
+
 ```ts file="./ListIcons.tsx"
+
 ```
 
 ### With large icons
+
 ```ts file="./ListLargeIcons.tsx"
+
 ```

package/src/components/List/examples/ListIcons.tsx

@@ -1,12 +1,12 @@
 import { List, ListItem } from '@patternfly/react-core';
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 export const ListIcons: React.FunctionComponent = () => (
   <List isPlain>
     <ListItem icon={<RhUiLearnFillIcon />}>First</ListItem>
-    <ListItem icon={<KeyIcon />}>Second</ListItem>
-    <ListItem icon={<DesktopIcon />}>Third</ListItem>
+    <ListItem icon={<RhUiKeyIcon />}>Second</ListItem>
+    <ListItem icon={<RhUiDesktopIcon />}>Third</ListItem>
   </List>
 );

package/src/components/List/examples/ListLargeIcons.tsx

@@ -1,12 +1,12 @@
 import { List, ListItem } from '@patternfly/react-core';
 import RhUiLearnFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-learn-fill-icon';
-import KeyIcon from '@patternfly/react-icons/dist/esm/icons/key-icon';
-import DesktopIcon from '@patternfly/react-icons/dist/esm/icons/desktop-icon';
+import RhUiKeyIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-key-icon';
+import RhUiDesktopIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-desktop-icon';
 
 export const ListLargeIcons: React.FunctionComponent = () => (
   <List isPlain iconSize="large">
     <ListItem icon={<RhUiLearnFillIcon />}>First</ListItem>
-    <ListItem icon={<KeyIcon />}>Second</ListItem>
-    <ListItem icon={<DesktopIcon />}>Third</ListItem>
+    <ListItem icon={<RhUiKeyIcon />}>Second</ListItem>
+    <ListItem icon={<RhUiDesktopIcon />}>Third</ListItem>
   </List>
 );

package/src/components/LoginPage/LoginForm.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { Form, FormGroup, ActionGroup, FormHelperText } from '../Form';
+import { Form, FormGroup, FormHelperText } from '../Form';
 import { TextInput } from '../TextInput';
 import { Button } from '../Button';
 import { Checkbox } from '../Checkbox';
@@ -147,11 +147,11 @@ export const LoginForm: React.FunctionComponent<LoginFormProps> = ({
           />
         </FormGroup>
       )}
-      <ActionGroup>
+      <FormGroup isActionGroup>
         <Button variant="primary" type="submit" onClick={onLoginButtonClick} isBlock isDisabled={isLoginButtonDisabled}>
           {loginButtonLabel}
         </Button>
-      </ActionGroup>
+      </FormGroup>
     </Form>
   );
 };

package/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap

@@ -4,10 +4,16 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r1s:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1t:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -38,7 +44,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r17:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r20:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -52,6 +58,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r21:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -82,7 +91,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1a:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r24:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -96,6 +105,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r25:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
@@ -106,7 +118,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           <input
             aria-invalid="false"
             class="pf-v6-c-check__input"
-            data-ouia-component-id="OUIA-Generated-Checkbox-:r1d:"
+            data-ouia-component-id="OUIA-Generated-Checkbox-:r28:"
             data-ouia-component-type="PF6/Checkbox"
             data-ouia-safe="true"
             id="pf-login-remember-me-id"
@@ -123,27 +135,26 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r29:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <button
+          class="pf-v6-c-button pf-m-primary pf-m-block"
+          data-ouia-component-id="OUIA-Generated-Button-primary-:r2b:"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
+          type="submit"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1e:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>
@@ -154,10 +165,16 @@ exports[`LoginForm LoginForm with show password 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r2c:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r2d:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -188,7 +205,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1h:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2g:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -202,6 +219,9 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r2h:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -238,7 +258,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             >
               <input
                 aria-invalid="false"
-                data-ouia-component-id="OUIA-Generated-TextInputBase-:r1k:"
+                data-ouia-component-id="OUIA-Generated-TextInputBase-:r2k:"
                 data-ouia-component-type="PF6/TextInput"
                 data-ouia-safe="true"
                 id="pf-login-password-id"
@@ -255,7 +275,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             <button
               aria-label="Show password"
               class="pf-v6-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-:r1l:"
+              data-ouia-component-id="OUIA-Generated-Button-control-:r2l:"
               data-ouia-component-type="PF6/Button"
               data-ouia-safe="true"
               type="button"
@@ -284,27 +304,26 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r2m:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <button
+          class="pf-v6-c-button pf-m-primary pf-m-block"
+          data-ouia-component-id="OUIA-Generated-Button-primary-:r2o:"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
+          type="submit"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1m:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>
@@ -315,10 +334,16 @@ exports[`LoginForm should render Login form 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r0:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -349,7 +374,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r4:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -363,6 +388,9 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r5:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -393,7 +421,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r5:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r8:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -407,27 +435,26 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group pf-m-action"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r9:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
       >
-        <div
-          class="pf-v6-c-form__actions"
+        <button
+          class="pf-v6-c-button pf-m-primary pf-m-block"
+          data-ouia-component-id="OUIA-Generated-Button-primary-:rb:"
+          data-ouia-component-type="PF6/Button"
+          data-ouia-safe="true"
+          type="submit"
         >
-          <button
-            class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r6:"
-            data-ouia-component-type="PF6/Button"
-            data-ouia-safe="true"
-            type="submit"
+          <span
+            class="pf-v6-c-button__text"
           >
-            <span
-              class="pf-v6-c-button__text"
-            >
-              Log In
-            </span>
-          </button>
-        </div>
+            Log In
+          </span>
+        </button>
       </div>
     </div>
   </form>

package/src/components/LoginPage/examples/LoginPageLanguageSelect.tsx

@@ -82,6 +82,7 @@ export const LoginPageLanguageSelect: React.FunctionComponent = () => {
       aria-label="Select Language"
       toggle={(toggleRef: React.Ref<MenuToggleElement>) => (
         <MenuToggle
+          aria-haspopup="listbox"
           ref={toggleRef}
           onClick={() => setIsHeaderUtilsOpen(!isHeaderUtilsOpen)}
           isExpanded={isHeaderUtilsOpen}

package/src/components/Menu/MenuItem.tsx

@@ -7,7 +7,7 @@ import leftOffset from '@patternfly/react-tokens/dist/esm/c_menu_m_flyout__menu_
 import RhMicronsExternalLinkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-external-link-icon';
 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 CheckIcon from '@patternfly/react-icons/dist/esm/icons/check-icon';
+import RhMicronsCheckmarkIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-checkmark-icon';
 import { Checkbox } from '../Checkbox';
 import { MenuContext, MenuItemContext } from './MenuContext';
 import { MenuItemAction } from './MenuItemAction';
@@ -399,7 +399,7 @@ const MenuItemBase: React.FunctionComponent<MenuItemProps> = ({
           )}
           {getIsSelected() && (
             <span className={css(styles.menuItemSelectIcon)}>
-              <CheckIcon />
+              <RhMicronsCheckmarkIcon />
             </span>
           )}
         </span>

package/src/components/Menu/examples/Menu.md

@@ -30,7 +30,7 @@ import RhUiTableIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-table-ic
 import RhUiNotificationFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-notification-fill-icon';
 import RhUiStorageDomainFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-ui-storage-domain-fill-icon';
 import RhMicronsCaretLeftIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-left-icon';
-import RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
+import RhMicronsCaretDownFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-fill-icon';
 
 ## Examples
 

package/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 RhMicronsCaretDownIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-icon';
+import RhMicronsCaretDownFillIcon from '@patternfly/react-icons/dist/esm/icons/rh-microns-caret-down-fill-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';
@@ -73,6 +73,8 @@ export interface MenuToggleProps
   badge?: BadgeProps | React.ReactNode;
   /** Adds styling which affects the size of the menu toggle */
   size?: 'default' | 'sm';
+  /** Indicates what type of popup will be triggered by the menu toggle. A value of true is the same as a value of "menu".  */
+  'aria-haspopup'?: 'menu' | 'listbox' | boolean;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<MenuToggleElement>;
   /** Value to overwrite the randomly generated data-ouia-component-id. It will always target the toggle button. */
@@ -95,7 +97,8 @@ class MenuToggleBase extends Component<MenuToggleProps> {
     isDocked: false,
     isTextExpanded: false,
     size: 'default',
-    ouiaSafe: true
+    ouiaSafe: true,
+    'aria-haspopup': 'menu'
   };
 
   render() {
@@ -121,6 +124,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
       innerRef,
       onClick,
       'aria-label': ariaLabel,
+      'aria-haspopup': ariaHasPopup,
       ouiaId,
       ouiaSafe,
       size,
@@ -154,7 +158,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
             <span className={css(styles.menuToggleControls)}>
               {status !== undefined && <span className={css(styles.menuToggleStatusIcon)}>{_statusIcon}</span>}
               <span className={css(styles.menuToggleToggleIcon)}>
-                <RhMicronsCaretDownIcon />
+                <RhMicronsCaretDownFillIcon />
               </span>
             </span>
           );
@@ -171,6 +175,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
                   type="button"
                   className={css(styles.menuToggleButton)}
                   aria-expanded={isExpanded}
+                  aria-haspopup={ariaHasPopup}
                   onClick={onClick}
                   aria-label={ariaLabel || 'Menu toggle'}
                   tabIndex={-1}
@@ -231,6 +236,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
                   className={css(styles.menuToggleButton, children && styles.modifiers.text)}
                   type="button"
                   aria-expanded={isExpanded}
+                  aria-haspopup={ariaHasPopup}
                   aria-label={ariaLabel}
                   disabled={isDisabled}
                   onClick={onClick}
@@ -249,6 +255,7 @@ class MenuToggleBase extends Component<MenuToggleProps> {
               className={css(commonStyles, isCircle && isPlain && styles.modifiers.circle)}
               type="button"
               aria-label={ariaLabel}
+              aria-haspopup={ariaHasPopup}
               aria-expanded={isExpanded}
               ref={innerRef as React.Ref<HTMLButtonElement>}
               disabled={isDisabled}