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

package/src/components/Alert/examples/Alert.md

@@ -12,8 +12,9 @@ import BoxIcon from '@patternfly/react-icons/dist/esm/icons/box-icon';
 import DatabaseIcon from '@patternfly/react-icons/dist/esm/icons/database-icon';
 import ServerIcon from '@patternfly/react-icons/dist/esm/icons/server-icon';
 import LaptopIcon from '@patternfly/react-icons/dist/esm/icons/laptop-icon';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
-## Alert examples 
+## Alert examples
 
 ### Alert variants
 
@@ -37,22 +38,23 @@ import { Alert } from '@patternfly/react-core';
   <Alert variant="success" title="Success alert title" ouiaId="SuccessAlert" />
   <Alert variant="warning" title="Warning alert title" ouiaId="WarningAlert" />
   <Alert variant="danger" title="Danger alert title" ouiaId="DangerAlert" />
-</React.Fragment>
+</React.Fragment>;
 ```
 
 ### Alert variations
 
-PatternFly supports several properties and variations that can be used to add extra content to an alert. 
+PatternFly supports several properties and variations that can be used to add extra content to an alert.
 
-* As demonstrated in the 1st variation below, use the `actionLinks` property to add one or more `<AlertActionLink>` components that place links beneath the alert message. You must pass in `href` and `component="a"` properties to have an `<AlertActionLink>` act as a proper link, rather than as a button.
+- As demonstrated in the 1st variation below, use the `actionLinks` property to add one or more `<AlertActionLink>` components that place links beneath the alert message. You must pass in `href` and `component="a"` properties to have an `<AlertActionLink>` act as a proper link, rather than as a button.
 
-* As demonstrated in the 2nd variation below, use a native HTML `<a>` element to add links within an alert message.
+- As demonstrated in the 2nd variation below, use a native HTML `<a>` element to add links within an alert message.
 
-* As demonstrated in the 3rd and 4th variations below, use the `actionClose` property to add an `<AlertActionCloseButton>` component, which can be used to manage and customize alert dismissals. `actionClose` can be used with or without the presence of `actionLinks`.
+- As demonstrated in the 3rd variation below, use the `actionClose` property to add an `<AlertActionCloseButton>` component, which can be used to manage and customize alert dismissals.
+
+- As demonstrated in the 4th and 5th variations below, use the `component` property to set the element for an alert title.
+  - If there is not a description passed via `children` prop, then the `component` prop should be set to a non-heading element such as a `span` or `div`.
+  - If there is a description passed via `children` prop, then the `component` prop should be a heading element. Headings should be ordered by their level and heading levels should not be skipped. For example, a heading of an `h2` level should not be followed directly by an `h4`.
 
-* As demonstrated in the 5th and 6th variations below, use the `component` property to set the element for an alert title.  
-  * If the `description` prop is not passed in, then the `component` prop should be set to a non-heading element such as a `span` or `div`.
-  * If the `description` prop is passed in, then the `component` prop should be a heading element. Headings should be ordered by their level and heading levels should not be skipped. For example, a heading of an `h2` level should not be followed directly by an `h4`.
 ```ts
 import React from 'react';
 import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
@@ -61,17 +63,22 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
   <Alert
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
     actionLinks={
       <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+        <AlertActionLink component="a" href="#">
+          View details
+        </AlertActionLink>
+        <AlertActionLink // eslint-disable-next-line no-console
+          onClick={() => console.log('Clicked on Ignore')}
+        >
+          Ignore
+        </AlertActionLink>
       </React.Fragment>
     }
   >
     <p>Success alert description. This should tell the user more information about the alert.</p>
   </Alert>
-  <Alert variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}>
+  <Alert variant="success" title="Success alert title">
     <p>
       Success alert description. This should tell the user more information about the alert.{' '}
       <a href="#">This is a link.</a>
@@ -80,21 +87,18 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
   <Alert
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
-    actionLinks={
-      <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
-      </React.Fragment>
-    }
-  />
-  <Alert variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />} />
+    // eslint-disable-next-line no-console
+    actionClose={<AlertActionCloseButton onClose={() => console.log('Clicked the close button')} />}
+  >
+    <p>Short alert description.</p>
+  </Alert>
   <Alert variant="success" title="div success alert title" component="div" />
-  <Alert variant="success" title="h6 Success alert title" component="h6" >
-    <p>Short alert description</p>
+  <Alert variant="success" title="h6 Success alert title" component="h6">
+    <p>Short alert description.</p>
   </Alert>
-  </React.Fragment>
+</React.Fragment>;
 ```
+
 ### Alert timeout
 
 Use the `timeout` property to automatically dismiss an alert after a period of time. If set to `true`, the `timeout` will be 8000 milliseconds. Provide a specific value to dismiss the alert after a different number of milliseconds.
@@ -105,29 +109,46 @@ import { Alert, AlertActionLink, AlertGroup, Button } from '@patternfly/react-co
 
 const AlertTimeout: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<React.ReactNode[]>([]);
+  const [newAlertKey, setNewAlertKey] = React.useState<number>(0);
+
   const onClick = () => {
     const timeout = 8000;
-    setAlerts(prevAlerts => {
-      return [...prevAlerts,
-        <Alert title="Default timeout Alert" timeout={timeout} actionLinks={
-          <React.Fragment>
-            <AlertActionLink>View details</AlertActionLink>
-            <AlertActionLink>Ignore</AlertActionLink>
-          </React.Fragment>
-        }>
+    setNewAlertKey((key) => key + 1);
+    setAlerts((prevAlerts) => {
+      return [
+        ...prevAlerts,
+        <Alert
+          title="Default timeout Alert"
+          timeout={timeout}
+          actionLinks={
+            <React.Fragment>
+              <AlertActionLink component="a" href="#">
+                View details
+              </AlertActionLink>
+              <AlertActionLink // eslint-disable-next-line no-console
+                onClick={() => console.log('Clicked on Ignore')}
+              >
+                Ignore
+              </AlertActionLink>
+            </React.Fragment>
+          }
+          key={newAlertKey}
+        >
           This alert will dismiss after {`${timeout / 1000} seconds`}
         </Alert>
-      ]
+      ];
     });
-  }
+  };
 
   return (
     <React.Fragment>
-      <Button variant="secondary" onClick={onClick}>Add alert</Button>
-      <Button variant="secondary" onClick={() => setAlerts([])}>Remove all alerts</Button>
-      <AlertGroup isLiveRegion>
-        {alerts}
-      </AlertGroup>
+      <Button variant="secondary" onClick={onClick}>
+        Add alert
+      </Button>
+      <Button variant="secondary" onClick={() => setAlerts([])}>
+        Remove all alerts
+      </Button>
+      <AlertGroup isLiveRegion>{alerts}</AlertGroup>
     </React.Fragment>
   );
 };
@@ -137,7 +158,7 @@ const AlertTimeout: React.FunctionComponent = () => {
 
 An alert can contain additional, hidden information that is made visible when users click a caret icon. This information can be expanded and collapsed each time the icon is clicked.
 
-It is not recommended to use an expandable alert with a `timeout` in a [toast alert group](/components/alert#toast-alert-group) because the alert could timeout before users have time to interact with and view the entire alert. 
+It is not recommended to use an expandable alert with a `timeout` in a [toast alert group](/components/alert#toast-alert-group) because the alert could timeout before users have time to interact with and view the entire alert.
 
 See the [toast alert considerations](/components/alert/accessibility#toast-alerts) section of the alert accessibility documentation to understand the accessibility risks associated with using toast alerts.
 
@@ -150,13 +171,8 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
     isExpandable
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
-    actionLinks={
-      <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
-      </React.Fragment>
-    }
+    // eslint-disable-next-line no-console
+    actionClose={<AlertActionCloseButton onClose={() => console.log('Clicked the close button')} />}
   >
     <p>Success alert description. This should tell the user more information about the alert.</p>
   </Alert>
@@ -165,17 +181,22 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
     isInline
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
     actionLinks={
       <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+        <AlertActionLink component="a" href="#">
+          View details
+        </AlertActionLink>
+        <AlertActionLink // eslint-disable-next-line no-console
+          onClick={() => console.log('Clicked on Ignore')}
+        >
+          Ignore
+        </AlertActionLink>
       </React.Fragment>
-    } 
+    }
   >
     <p>Success alert description. This should tell the user more information about the alert.</p>
   </Alert>
-</React.Fragment>
+</React.Fragment>;
 ```
 
 ### Truncated alerts
@@ -187,16 +208,28 @@ import React from 'react';
 import { Alert } from '@patternfly/react-core';
 
 <React.Fragment>
-  <Alert variant="info" truncateTitle={1} title={`
+  <Alert
+    variant="info"
+    truncateTitle={1}
+    title={`
   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur pellentesque neque cursus enim fringilla tincidunt. Proin lobortis aliquam dictum. Nam vel ullamcorper nulla, nec blandit dolor. Vivamus pellentesque neque justo, nec accumsan nulla rhoncus id. Suspendisse mollis, tortor quis faucibus volutpat, sem leo fringilla turpis, ac lacinia augue metus in nulla. Cras vestibulum lacinia orci. Pellentesque sodales consequat interdum. Sed porttitor tincidunt metus nec iaculis. Pellentesque non commodo justo. Morbi feugiat rhoncus neque, vitae facilisis diam aliquam nec. Sed dapibus vitae quam at tristique. Nunc vel commodo mi. Mauris et rhoncus leo.
-  `} />
-  <Alert variant="warning" truncateTitle={2} title={`
+  `}
+  />
+  <Alert
+    variant="warning"
+    truncateTitle={2}
+    title={`
   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur pellentesque neque cursus enim fringilla tincidunt. Proin lobortis aliquam dictum. Nam vel ullamcorper nulla, nec blandit dolor. Vivamus pellentesque neque justo, nec accumsan nulla rhoncus id. Suspendisse mollis, tortor quis faucibus volutpat, sem leo fringilla turpis, ac lacinia augue metus in nulla. Cras vestibulum lacinia orci. Pellentesque sodales consequat interdum. Sed porttitor tincidunt metus nec iaculis. Pellentesque non commodo justo. Morbi feugiat rhoncus neque, vitae facilisis diam aliquam nec. Sed dapibus vitae quam at tristique. Nunc vel commodo mi. Mauris et rhoncus leo.
-  `} />
-  <Alert variant="danger" truncateTitle={3} title={`
+  `}
+  />
+  <Alert
+    variant="danger"
+    truncateTitle={3}
+    title={`
   Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur pellentesque neque cursus enim fringilla tincidunt. Proin lobortis aliquam dictum. Nam vel ullamcorper nulla, nec blandit dolor. Vivamus pellentesque neque justo, nec accumsan nulla rhoncus id. Suspendisse mollis, tortor quis faucibus volutpat, sem leo fringilla turpis, ac lacinia augue metus in nulla. Cras vestibulum lacinia orci. Pellentesque sodales consequat interdum. Sed porttitor tincidunt metus nec iaculis. Pellentesque non commodo justo. Morbi feugiat rhoncus neque, vitae facilisis diam aliquam nec. Sed dapibus vitae quam at tristique. Nunc vel commodo mi. Mauris et rhoncus leo.
-  `} />
-</React.Fragment>
+  `}
+  />
+</React.Fragment>;
 ```
 
 ### Custom icons
@@ -218,7 +251,7 @@ import LaptopIcon from '@patternfly/react-icons/dist/esm/icons/laptop-icon';
   <Alert customIcon={<DatabaseIcon />} variant="success" title="Success alert title" />
   <Alert customIcon={<ServerIcon />} variant="warning" title="Warning alert title" />
   <Alert customIcon={<LaptopIcon />} variant="danger" title="Danger alert title" />
-</React.Fragment>
+</React.Fragment>;
 ```
 
 ### Inline alerts variants
@@ -234,8 +267,9 @@ import { Alert } from '@patternfly/react-core';
   <Alert variant="success" isInline title="Success inline alert title" />
   <Alert variant="warning" isInline title="Warning inline alert title" />
   <Alert variant="danger" isInline title="Danger inline alert title" />
-</React.Fragment>
+</React.Fragment>;
 ```
+
 ### Inline alert variations
 
 All general alert variations can use the `isInline` property to apply inline styling.
@@ -248,17 +282,22 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
     isInline
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
     actionLinks={
       <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
+        <AlertActionLink component="a" href="#">
+          View details
+        </AlertActionLink>
+        <AlertActionLink // eslint-disable-next-line no-console
+          onClick={() => console.log('Clicked on Ignore')}
+        >
+          Ignore
+        </AlertActionLink>
       </React.Fragment>
     }
   >
     <p>Success alert description. This should tell the user more information about the alert.</p>
   </Alert>
-  <Alert isInline variant="success" title="Success alert title" actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}>
+  <Alert isInline variant="success" title="Success alert title">
     <p>
       Success alert description. This should tell the user more information about the alert.{' '}
       <a href="#">This is a link.</a>
@@ -268,22 +307,16 @@ import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/reac
     isInline
     variant="success"
     title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
-    actionLinks={
-      <React.Fragment>
-        <AlertActionLink onClick={() => alert('Clicked on View details')}>View details</AlertActionLink>
-        <AlertActionLink onClick={() => alert('Clicked on Ignore')}>Ignore</AlertActionLink>
-      </React.Fragment>
-    }
-  />
-  <Alert
-    isInline
-    variant="success"
-    title="Success alert title"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
-  />
-  <Alert isInline variant="success" title="Success alert title" />
-</React.Fragment>
+    // eslint-disable-next-line no-console
+    actionClose={<AlertActionCloseButton onClose={() => console.log('Clicked the close button')} />}
+  >
+    <p>Short alert description.</p>
+  </Alert>
+  <Alert isInline variant="success" title="div success alert title" component="div" />
+  <Alert isInline variant="success" title="h6 Success alert title" component="h6">
+    <p>Short alert description.</p>
+  </Alert>
+</React.Fragment>;
 ```
 
 ### Plain inline alert variants
@@ -299,7 +332,7 @@ import { Alert } from '@patternfly/react-core';
   <Alert variant="success" isInline isPlain title="Success inline alert title" />
   <Alert variant="warning" isInline isPlain title="Warning inline alert title" />
   <Alert variant="danger" isInline isPlain title="Danger inline alert title" />
-</React.Fragment>
+</React.Fragment>;
 ```
 
 ### Plain inline alert variations
@@ -308,15 +341,10 @@ It is not recommended to use a plain inline alert with `actionClose` nor `action
 
 ```ts
 import React from 'react';
-import { Alert, AlertActionCloseButton, AlertActionLink } from '@patternfly/react-core';
-<Alert
-  isInline
-  isPlain
-  variant="success"
-  title="Success alert title"
->
+import { Alert } from '@patternfly/react-core';
+<Alert isInline isPlain variant="success" title="Success alert title">
   <p>Success alert description. This should tell the user more information about the alert.</p>
-</Alert>
+</Alert>;
 ```
 
 ### Static live region alerts
@@ -334,7 +362,8 @@ import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
     isLiveRegion
     variant="info"
     title="Default live region configuration"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+    // eslint-disable-next-line no-console
+    actionClose={<AlertActionCloseButton onClose={() => console.log('Clicked the close button')} />}
   >
     This alert uses the recommended <code>isLiveRegion</code> prop to automatically set ARIA attributes and CSS classes.
   </Alert>
@@ -344,12 +373,13 @@ import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
     aria-atomic="true"
     variant="info"
     title="Customized live region"
-    actionClose={<AlertActionCloseButton onClose={() => alert('Clicked the close button')} />}
+    // eslint-disable-next-line no-console
+    actionClose={<AlertActionCloseButton onClose={() => console.log('Clicked the close button')} />}
   >
-    You can alternatively omit the <code>isLiveRegion</code> prop to specify ARIA attributes and CSS manually on
-    the containing element.
+    You can alternatively omit the <code>isLiveRegion</code> prop to specify ARIA attributes and CSS manually on the
+    containing element.
   </Alert>
-</React.Fragment>
+</React.Fragment>;
 ```
 
 ### Dynamic live region alerts
@@ -357,19 +387,22 @@ import { Alert, AlertActionCloseButton } from '@patternfly/react-core';
 Alerts that are asynchronously appended into dynamic [alert groups](/components/alert/#alert-group-examples) via the `isLiveRegion` property will be announced to assistive technology the moment the change happens, following the strategy used for `aria-atomic`, which defaults to false. This means only changes of type "addition" will be announced.
 
 ```ts file="AlertDynamicLiveRegion.tsx"
+
 ```
 
-### Asynchronous live region alerts 
+### Asynchronous live region alerts
+
+This example shows how an alert could be triggered by an asynchronous event in the application. Note that you can customize how the alert will be announced to assistive technology. See the [alert accessibility](/components/alert/accessibility/) for more information.
 
-This example shows how an alert could be triggered by an asynchronous event in the application. Note that you can customize how the alert will be announced to assistive technology. See the [https://www.patternfly.org/v4/components/alert/accessibility](alert accessibility) for more information.
 ```ts file="AlertAsyncLiveRegion.tsx"
+
 ```
 
 ## Alert group examples
 
 An alert group stacks and positions 2 or more alerts in a live region, either in a layer over the main content of a page or inline with the page content. Alert groups should always rank alerts by age, stacking new alerts on top of old ones as they surface.
 
-### Alert group variants 
+### Alert group variants
 
 Alert groups can be one of the following variants:
 
@@ -386,15 +419,17 @@ Dynamic alerts that are generated after the page initially loads must be appende
 All alert group variants may combine multiple [alert variants](/components/alert) For example, the following static inline alert group includes one "success" alert and one "info" alert.
 
 ```ts file="./AlertGroupStatic.tsx"
+
 ```
 
 ### Toast alert group
 
-Toast alert groups are created by passing in the `isToast` and `isLiveRegion` properties. 
+Toast alert groups are created by passing in the `isToast` and `isLiveRegion` properties.
 
 Click the buttons in the example below to add alerts to a toast group.
 
 ```ts file="./AlertGroupToast.tsx"
+
 ```
 
 ### Toast alert group with overflow capture
@@ -403,11 +438,12 @@ Users will see an overflow message once a predefined number of alerts are displa
 
 In the following example, an overflow message will appear when more than 4 alerts would be shown. When a 5th alert would appear, an overflow message is shown instead.
 
-When an overflow message appears in an `AlertGroup` using the `isLiveRegion` property, the "view 1 more alert" text label will be announced, but the alert message will not. 
+When an overflow message appears in an `AlertGroup` using the `isLiveRegion` property, the "view 1 more alert" text label will be announced, but the alert message will not.
 
-Users navigating via keyboard or another assistive technology will need a way to navigate to and reveal hidden alerts before they disappear. Alternatively, there should be a place where notifications or alerts are collected to be viewed or read later. 
+Users navigating via keyboard or another assistive technology will need a way to navigate to and reveal hidden alerts before they disappear. Alternatively, there should be a place where notifications or alerts are collected to be viewed or read later.
 
 ```ts file="AlertGroupToastOverflowCapture.tsx"
+
 ```
 
 ### Asynchronous alert groups
@@ -417,6 +453,7 @@ The following example shows how alerts can be triggered by an asynchronous event
 See the [alert accessibility tab](/components/alert/accessibility) for more information on customizing this behavior.
 
 ```ts file="./AlertGroupAsync.tsx"
+
 ```
 
 ### Dynamic alert groups
@@ -424,13 +461,15 @@ See the [alert accessibility tab](/components/alert/accessibility) for more info
 Click the buttons in the example below to add dynamic alerts to a group.
 
 ```ts file="./AlertGroupSingularDynamic.tsx"
+
 ```
 
 ### Dynamic alert group with overflow message
 
-In the following example, there can be a maximum of 4 alerts shown at once. 
+In the following example, there can be a maximum of 4 alerts shown at once.
 
 ```ts file="AlertGroupSingularDynamicOverflow.tsx"
+
 ```
 
 ### Multiple dynamic alert groups
@@ -438,4 +477,5 @@ In the following example, there can be a maximum of 4 alerts shown at once.
 You may add multiple alerts to an alert group at once. Click the "add alert collection" button in the example below to add a batch of 3 toast alerts to a group.
 
 ```ts file="./AlertGroupMultipleDynamic.tsx"
+
 ```

package/src/components/Alert/examples/AlertDynamicLiveRegion.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Alert, AlertGroup, AlertVariant, InputGroup } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 interface AlertInfo {
   title: string;
@@ -10,7 +11,7 @@ interface AlertInfo {
 export const DynamicLiveRegionAlert: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<AlertInfo[]>([]);
   const getUniqueId: () => number = () => new Date().getTime();
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const addAlert = (alertInfo: AlertInfo) => {
     setAlerts((prevAlertInfo) => [...prevAlertInfo, alertInfo]);

package/src/components/Alert/examples/AlertGroupAsync.tsx

@@ -9,12 +9,13 @@ import {
   InputGroupItem,
   useInterval
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupAsync: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
   const [isRunning, setIsRunning] = React.useState(false);
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => new Date().getTime();
 

package/src/components/Alert/examples/AlertGroupMultipleDynamic.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputGroupItem
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupMultipleDynamic: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
@@ -20,7 +21,7 @@ export const AlertGroupMultipleDynamic: React.FunctionComponent = () => {
     setAlerts((prevAlerts) => [...prevAlerts.filter((alert) => alert.key !== key)]);
   };
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => String.fromCharCode(65 + Math.floor(Math.random() * 26)) + Date.now();
 

package/src/components/Alert/examples/AlertGroupSingularDynamic.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputGroupItem
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupSingularDynamic: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
@@ -20,7 +21,7 @@ export const AlertGroupSingularDynamic: React.FunctionComponent = () => {
     setAlerts((prevAlerts) => [...prevAlerts.filter((alert) => alert.key !== key)]);
   };
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => new Date().getTime();
 

package/src/components/Alert/examples/AlertGroupSingularDynamicOverflow.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputGroupItem
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupSingularDynamicOverflow: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
@@ -34,7 +35,7 @@ export const AlertGroupSingularDynamicOverflow: React.FunctionComponent = () =>
     setOverflowMessage(getOverflowMessage(newAlerts.length));
   };
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => new Date().getTime();
 

package/src/components/Alert/examples/AlertGroupToast.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputGroupItem
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupToast: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
@@ -20,7 +21,7 @@ export const AlertGroupToast: React.FunctionComponent = () => {
     setAlerts((prevAlerts) => [...prevAlerts.filter((alert) => alert.key !== key)]);
   };
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => new Date().getTime();
 

package/src/components/Alert/examples/AlertGroupToastOverflowCapture.tsx

@@ -8,6 +8,7 @@ import {
   InputGroup,
   InputGroupItem
 } from '@patternfly/react-core';
+import buttonStyles from '@patternfly/react-styles/css/components/Button/button';
 
 export const AlertGroupToastOverflowCapture: React.FunctionComponent = () => {
   const [alerts, setAlerts] = React.useState<Partial<AlertProps>[]>([]);
@@ -34,7 +35,7 @@ export const AlertGroupToastOverflowCapture: React.FunctionComponent = () => {
     setOverflowMessage(getOverflowMessage(newAlerts.length));
   };
 
-  const btnClasses = ['pf-v5-c-button', 'pf-m-secondary'].join(' ');
+  const btnClasses = [buttonStyles.button, buttonStyles.modifiers.secondary].join(' ');
 
   const getUniqueId = () => new Date().getTime();
 

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

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { render, screen } from '@testing-library/react';
 import { Avatar } from '../Avatar';
+import styles from '@patternfly/react-styles/css/components/Avatar/avatar';
 
 test('Renders simple avatar', () => {
   render(
@@ -13,7 +14,7 @@ test('Renders simple avatar', () => {
 
 test('Renders without any modifier class when border and size props are not passed', () => {
   render(<Avatar alt="avatar" />);
-  expect(screen.getByRole('img')).toHaveClass('pf-v5-c-avatar', { exact: true });
+  expect(screen.getByRole('img')).toHaveClass(styles.avatar, { exact: true });
 });
 
 test('Renders with class name pf-m-light when "light" is passed as border prop', () => {

package/src/components/BackToTop/BackToTop.tsx

@@ -34,12 +34,14 @@ const BackToTopBase: React.FunctionComponent<BackToTopProps> = ({
   const [scrollElement, setScrollElement] = React.useState(null);
 
   const toggleVisible = () => {
-    const scrolled = scrollElement.scrollY ? scrollElement.scrollY : scrollElement.scrollTop;
-    if (!isAlwaysVisible) {
-      if (scrolled > 400) {
-        setVisible(true);
-      } else {
-        setVisible(false);
+    if (scrollElement) {
+      const scrolled = scrollElement.scrollY ? scrollElement.scrollY : scrollElement.scrollTop;
+      if (!isAlwaysVisible) {
+        if (scrolled > 400) {
+          setVisible(true);
+        } else {
+          setVisible(false);
+        }
       }
     }
   };