From eddd52a862e68e655621deb84349edecf3b0f445 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 12:40:02 -0400
Subject: [PATCH 01/11] fix(aria): make aria-* props consistent

---
 .../src/components/AboutModal/AboutModal.js   |   8 +-
 .../components/AboutModal/AboutModal.test.js  |   6 +-
 .../AboutModal/AboutModalContainer.js         |  14 +--
 .../AboutModal/AboutModalContainer.test.js    |   4 +-
 .../AboutModalContainer.test.js.snap          |   8 +-
 .../react-core/src/components/Alert/Alert.js  |   4 +-
 .../Alert/AlertActionCloseButton.js           |   4 +-
 .../src/components/Alert/AlertActionLink.js   |   2 +-
 .../src/components/Alert/AlertBody.js         |   8 +-
 .../Alert/__snapshots__/Alert.test.js.snap    |  24 ----
 .../ApplicationLauncher.js                    |  10 +-
 ...Toggle.js => ApplicationLauncherToggle.js} |   0
 .../src/components/ChipGroup/Chip.js          |  54 +++++----
 .../src/components/ChipGroup/ChipButton.js    |  27 +++--
 .../src/components/ChipGroup/ChipGroup.js     |  47 ++++----
 .../__snapshots__/ChipGroup.test.js.snap      |   4 +-
 .../ContextSelector/ContextSelector.js        |  16 +--
 .../src/components/DataList/DataListAction.js |  67 +++++-----
 .../components/DataList/DataListContent.js    |  31 ++---
 .../src/components/DataList/DataListItem.js   |  35 +++---
 .../src/components/Dropdown/Dropdown.js       |   2 +-
 .../src/components/Dropdown/Dropdown.test.js  |   1 -
 .../src/components/Dropdown/KebabToggle.js    |  24 ++--
 .../src/components/Dropdown/Toggle.js         |   6 +-
 .../__snapshots__/Dropdown.test.js.snap       |  78 ++++++------
 .../src/components/LoginPage/LoginForm.js     |  13 +-
 .../components/LoginPage/LoginForm.test.js    |  18 +--
 .../__snapshots__/LoginForm.test.js.snap      |   8 +-
 .../react-core/src/components/Modal/Modal.js  |   8 +-
 .../src/components/Modal/ModalBox.test.js     |   6 +-
 .../src/components/Modal/ModalContent.js      |   8 +-
 .../Modal/__snapshots__/ModalBox.test.js.snap |   3 -
 .../src/components/Pagination/OptionsMenu.js  |   1 +
 .../__snapshots__/Pagination.test.js.snap     |  30 ++---
 .../src/components/Select/CheckboxSelect.js   |   4 +
 .../components/Select/CheckboxSelectInput.js  |   2 +-
 .../Select/GroupedCheckboxSelectInput.js      |   2 +-
 .../src/components/Select/Select.js           |   6 +-
 .../Select/__snapshots__/Select.test.js.snap  |  10 +-
 .../react-core/src/components/Tabs/Tabs.js    |  55 ++++++---
 .../Tabs/__snapshots__/Tabs.test.js.snap      |  65 +++++-----
 .../Table/__snapshots__/Table.test.js.snap    | 114 +++++++++---------
 42 files changed, 415 insertions(+), 422 deletions(-)
 rename packages/patternfly-4/react-core/src/components/ApplicationLauncher/{Toggle.js => ApplicationLauncherToggle.js} (100%)

diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
index 5d96033afc7..cb61dcad9f6 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.js
@@ -52,8 +52,8 @@ class AboutModal extends React.Component {
   static propTypes = propTypes;
   static defaultProps = defaultProps;
 
-  ariaLabelledbyId = `pf-about-modal-title-${currentId++}`;
-  ariaDescribedById = `pf-about-modal-content-${currentId++}`;
+  ariaLabelledBy = `pf-about-modal-title-${currentId++}`;
+  ariaDescribedBy = `pf-about-modal-content-${currentId++}`;
 
   handleEscKeyClick = event => {
     if (event.keyCode === KEY_CODES.ESCAPE_KEY && this.props.isOpen) {
@@ -96,8 +96,8 @@ class AboutModal extends React.Component {
     return ReactDOM.createPortal(
       <AboutModalContainer
         {...this.props}
-        ariaLabelledbyId={this.ariaLabelledbyId}
-        ariaDescribedById={this.ariaDescribedById}
+        aria-labelledby={this.ariaLabelledBy}
+        aria-describedby={this.ariaDescribedBy}
       />,
       this.container
     );
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
index d98f61c08d0..aecd8d2b852 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
@@ -48,11 +48,11 @@ test('modal does not call onClose for esc key if it is not open', () => {
   expect(props.onClose).not.toBeCalled();
 });
 
-test('Each modal is given new ariaDescribedById and ariaLablledbyId', () => {
+test('Each modal is given new aria-describedby and aria-lablledby', () => {
   const first = shallow(<AboutModal {...props}> Test About Modal </AboutModal>);
   const second = shallow(<AboutModal {...props}> Test About Modal </AboutModal>);
-  expect(first.props().ariaLabelledbyId).not.toBe(second.props().ariaLabelledbyId);
-  expect(first.props().ariaDescribedById).not.toBe(second.props().ariaDescribedById);
+  expect(first.props()['aria-labelledby']).not.toBe(second.props()['aria-labelledby']);
+  expect(first.props()['aria-describedby']).not.toBe(second.props()['aria-describedby']);
 });
 
 test('Console error is generated when the logoImageSrc is provided without logoImageAlt', () => {
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.js
index 6763067c314..40f988413ee 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.js
@@ -31,9 +31,9 @@ const propTypes = {
   /** the alternate text of the Logo image. */
   logoImageAlt: PropTypes.string.isRequired,
   /** id to use for About Modal Box aria labeled by */
-  ariaLabelledbyId: PropTypes.string.isRequired,
+  'aria-labelledby': PropTypes.string.isRequired,
   /** id to use for About Modal Box aria described by */
-  ariaDescribedById: PropTypes.string.isRequired,
+  'aria-describedby': PropTypes.string.isRequired,
   /** Additional props are spread to the AboutModalBoxContent component */
   '': PropTypes.any
 };
@@ -55,8 +55,8 @@ const ModalContent = ({
   brandImageAlt,
   logoImageSrc,
   logoImageAlt,
-  ariaLabelledbyId,
-  ariaDescribedById,
+  'aria-labelledby': ariaLabelledBy,
+  'aria-describedby': ariaDescribedBy,
   ...props
 }) => {
   if (!isOpen) {
@@ -65,11 +65,11 @@ const ModalContent = ({
   return (
     <Backdrop>
       <Bullseye>
-        <AboutModalBox className={className} aria-labelledby={ariaLabelledbyId} aria-describedby={ariaDescribedById}>
+        <AboutModalBox className={className} aria-labelledby={ariaLabelledBy} aria-describedby={ariaDescribedBy}>
           <AboutModalBoxBrand src={brandImageSrc} alt={brandImageAlt} />
           <AboutModalBoxCloseButton onClose={onClose} />
-          <AboutModalBoxHeader id={ariaLabelledbyId} productName={productName} />
-          <AboutModalBoxContent {...props} trademark={trademark} id={ariaDescribedById}>
+          <AboutModalBoxHeader id={ariaLabelledBy} productName={productName} />
+          <AboutModalBoxContent {...props} trademark={trademark} id={ariaDescribedBy}>
             {children}
           </AboutModalBoxContent>
           <AboutModalBoxHero />
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.test.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.test.js
index 2c396770fcf..620fedbea60 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.test.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModalContainer.test.js
@@ -10,8 +10,8 @@ const props = {
   brandImageAlt: 'Brand Image',
   logoImageSrc: 'logoImg...',
   logoImageAlt: 'AboutModal Logo',
-  ariaLabelledbyId: 'ariaLablledbyId',
-  ariaDescribedById: 'ariaDescribedById'
+  'aria-labelledby': 'ariaLabelledBy',
+  'aria-describedby': 'ariaDescribedBy'
 };
 test('About Modal Container Test simple', () => {
   const view = shallow(<AboutModalContainer {...props}>This is ModalBox content</AboutModalContainer>);
diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalContainer.test.js.snap b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalContainer.test.js.snap
index 666d84a0590..358c4a98930 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalContainer.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/__snapshots__/AboutModalContainer.test.js.snap
@@ -9,8 +9,8 @@ exports[`About Modal Container Test isOpen 1`] = `
     component="div"
   >
     <AboutModalBox
-      aria-describedby="ariaDescribedById"
-      aria-labelledby="ariaLablledbyId"
+      aria-describedby="ariaDescribedBy"
+      aria-labelledby="ariaLabelledBy"
       className=""
     >
       <AboutModalBoxBrand
@@ -24,12 +24,12 @@ exports[`About Modal Container Test isOpen 1`] = `
       />
       <AboutModalBoxHeader
         className=""
-        id="ariaLablledbyId"
+        id="ariaLabelledBy"
         productName="Product Name"
       />
       <AboutModalBoxContent
         className=""
-        id="ariaDescribedById"
+        id="ariaDescribedBy"
         title="Test Modal Container title"
         trademark="Trademark and copyright information here"
       >
diff --git a/packages/patternfly-4/react-core/src/components/Alert/Alert.js b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
index c63389e714c..96fb1ab25d7 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/Alert.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
@@ -72,7 +72,9 @@ const Alert = ({
         </div>
       )}
       {action && (
-        <div className={css(styles.alertAction, className)}>{React.cloneElement(action, { title, variantLabel })}</div>
+        <div className={css(styles.alertAction, className)}>
+          {React.cloneElement(action, { title, variantLabel })}
+        </div>
       )}
     </div>
   );
diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
index 7ff94816628..84ff0128f0f 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
@@ -20,11 +20,11 @@ const defaultProps = {
   onClose: () => undefined
 };
 
-const AlertActionCloseButton = ({ className, onClose, 'aria-label': ariaLabel, title, variantLabel, ...props }) => (
+const AlertActionCloseButton = ({ className, onClose, variantLabel, 'aria-label': ariaLabel, title, variant, ...props }) => (
   <Button
     variant={ButtonVariant.plain}
     onClick={onClose}
-    aria-label={ariaLabel === '' ? `Close ${variantLabel} alert: ${title}` : ariaLabel}
+    aria-label={ariaLabel === '' ? `Close ${variant} alert: ${title}` : ariaLabel}
     {...props}
   >
     <TimesIcon />
diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
index b4b3e1dee3b..2b2969ca4a2 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
@@ -16,7 +16,7 @@ const defaultProps = {
   className: ''
 };
 
-const AlertActionLink = ({ className, children, ...props }) => (
+const AlertActionLink = ({ className, variantLabel, children, ...props }) => (
   <Button variant={ButtonVariant.link} {...props}>
     {children}
   </Button>
diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
index d32690603de..445b517c04a 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
@@ -10,7 +10,7 @@ const propTypes = {
   children: PropTypes.node,
   className: PropTypes.string,
   onClose: PropTypes.func,
-  closeButtonAriaLabel: PropTypes.string
+  'aria-label': PropTypes.string
 };
 
 const defaultProps = {
@@ -18,13 +18,13 @@ const defaultProps = {
   children: '',
   className: '',
   onClose: undefined,
-  closeButtonAriaLabel: 'Close'
+  'aria-label': 'Close'
 };
 
-const AlertBody = ({ title, className, children, onClose, closeButtonAriaLabel, ...props }) => (
+const AlertBody = ({ title, className, children, onClose, 'aria-label': ariaLabel, ...props }) => (
   <div {...props} className={className}>
     {onClose && (
-      <Button variant={ButtonVariant.plain} onClick={onClose} aria-label={closeButtonAriaLabel}>
+      <Button variant={ButtonVariant.plain} onClick={onClose} aria-label={ariaLabel}>
         <TimesIcon />
       </Button>
     )}
diff --git a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
index 2e252bce718..0bc222bc6c6 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
@@ -221,7 +221,6 @@ exports[`Alert - danger Action Link 1`] = `
           title=""
           type="button"
           variant="link"
-          variantLabel="Danger"
         >
           <button
             aria-disabled={null}
@@ -231,7 +230,6 @@ exports[`Alert - danger Action Link 1`] = `
             tabIndex={null}
             title=""
             type="button"
-            variantLabel="Danger"
           >
             test
           </button>
@@ -331,7 +329,6 @@ exports[`Alert - danger Action and Title 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Danger"
         >
           <button
             aria-disabled={null}
@@ -341,7 +338,6 @@ exports[`Alert - danger Action and Title 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Danger"
           >
             test
           </button>
@@ -442,7 +438,6 @@ exports[`Alert - danger Custom aria label 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Danger"
         >
           <button
             aria-disabled={null}
@@ -452,7 +447,6 @@ exports[`Alert - danger Custom aria label 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Danger"
           >
             test
           </button>
@@ -817,7 +811,6 @@ exports[`Alert - info Action Link 1`] = `
           title=""
           type="button"
           variant="link"
-          variantLabel="Info"
         >
           <button
             aria-disabled={null}
@@ -827,7 +820,6 @@ exports[`Alert - info Action Link 1`] = `
             tabIndex={null}
             title=""
             type="button"
-            variantLabel="Info"
           >
             test
           </button>
@@ -927,7 +919,6 @@ exports[`Alert - info Action and Title 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Info"
         >
           <button
             aria-disabled={null}
@@ -937,7 +928,6 @@ exports[`Alert - info Action and Title 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Info"
           >
             test
           </button>
@@ -1038,7 +1028,6 @@ exports[`Alert - info Custom aria label 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Info"
         >
           <button
             aria-disabled={null}
@@ -1048,7 +1037,6 @@ exports[`Alert - info Custom aria label 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Info"
           >
             test
           </button>
@@ -1413,7 +1401,6 @@ exports[`Alert - success Action Link 1`] = `
           title=""
           type="button"
           variant="link"
-          variantLabel="Success"
         >
           <button
             aria-disabled={null}
@@ -1423,7 +1410,6 @@ exports[`Alert - success Action Link 1`] = `
             tabIndex={null}
             title=""
             type="button"
-            variantLabel="Success"
           >
             test
           </button>
@@ -1523,7 +1509,6 @@ exports[`Alert - success Action and Title 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Success"
         >
           <button
             aria-disabled={null}
@@ -1533,7 +1518,6 @@ exports[`Alert - success Action and Title 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Success"
           >
             test
           </button>
@@ -1634,7 +1618,6 @@ exports[`Alert - success Custom aria label 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Success"
         >
           <button
             aria-disabled={null}
@@ -1644,7 +1627,6 @@ exports[`Alert - success Custom aria label 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Success"
           >
             test
           </button>
@@ -2009,7 +1991,6 @@ exports[`Alert - warning Action Link 1`] = `
           title=""
           type="button"
           variant="link"
-          variantLabel="Warning"
         >
           <button
             aria-disabled={null}
@@ -2019,7 +2000,6 @@ exports[`Alert - warning Action Link 1`] = `
             tabIndex={null}
             title=""
             type="button"
-            variantLabel="Warning"
           >
             test
           </button>
@@ -2119,7 +2099,6 @@ exports[`Alert - warning Action and Title 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Warning"
         >
           <button
             aria-disabled={null}
@@ -2129,7 +2108,6 @@ exports[`Alert - warning Action and Title 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Warning"
           >
             test
           </button>
@@ -2230,7 +2208,6 @@ exports[`Alert - warning Custom aria label 1`] = `
           title="Some title"
           type="button"
           variant="link"
-          variantLabel="Warning"
         >
           <button
             aria-disabled={null}
@@ -2240,7 +2217,6 @@ exports[`Alert - warning Custom aria label 1`] = `
             tabIndex={null}
             title="Some title"
             type="button"
-            variantLabel="Warning"
           >
             test
           </button>
diff --git a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
index 62c5ce78523..17601d1ea93 100644
--- a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
+++ b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
@@ -3,7 +3,7 @@ import styles from '@patternfly/patternfly/components/AppLauncher/app-launcher.c
 import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import ApplicationLauncherMenu from './ApplicationLauncherMenu';
-import Toggle from './Toggle';
+import ApplicationLauncherToggle from './ApplicationLauncherToggle';
 import { ThIcon } from '@patternfly/react-icons';
 import { ApplicationLauncherDirection, ApplicationLauncherPosition } from './applicationLauncherConstants';
 import { DropdownContext } from '../Dropdown/dropdownConstants';
@@ -51,13 +51,11 @@ class ApplicationLauncher extends React.Component {
   render() {
     const {
       'aria-label': ariaLabel,
-      children,
       dropdownItems,
       className,
       isOpen,
       onSelect,
       onToggle,
-      ...props
     } = this.props;
     return (
       <GenerateId>
@@ -69,16 +67,16 @@ class ApplicationLauncher extends React.Component {
             }}
           >
             {Children.map(
-              <Toggle id={`pf-toggle-id-${randomId}`} aria-label={ariaLabel} onToggle={onToggle}>
+              <ApplicationLauncherToggle id={`pf-toggle-id-${randomId}`} aria-label={ariaLabel} onToggle={onToggle}>
                 <ThIcon />
-              </Toggle>,
+              </ApplicationLauncherToggle>,
               oneToggle =>
                 cloneElement(oneToggle, {
                   parentRef: this.parentRef,
                   id: randomId,
                   isOpen,
                   isPlain: true,
-                  ariaHasPopup: true,
+                  'aria-haspopup': 'true',
                   onEnter: this.onEnter
                 })
             )}
diff --git a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/Toggle.js b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncherToggle.js
similarity index 100%
rename from packages/patternfly-4/react-core/src/components/ApplicationLauncher/Toggle.js
rename to packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncherToggle.js
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js b/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
index ba3f056bdd0..8f107c9612f 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
@@ -7,6 +7,30 @@ import { TimesCircleIcon } from '@patternfly/react-icons';
 import styles from '@patternfly/patternfly/components/Chip/chip.css';
 import GenerateId from '../../helpers/GenerateId/GenerateId';
 
+const propTypes = {
+  /** Content rendered inside the chip text */
+  children: PropTypes.node,
+  /** Aria Label for close button */
+  'aria-label': PropTypes.string,
+  /** Additional classes added to the chip item */
+  className: PropTypes.string,
+  /** Flag indicating if the chip has overflow */
+  isOverflowChip: PropTypes.bool,
+  /** Function that is called when clicking on the chip button */
+  onClick: PropTypes.func,
+  /** Position of the tooltip which is displayed if text is longer */
+  tooltipPosition: PropTypes.oneOf(Object.values(TooltipPosition))
+};
+
+const defaultProps = {
+  children: null,
+  'aria-label': 'close',
+  className: '',
+  isOverflowChip: false,
+  tooltipPosition: 'top',
+  onClick: () => { }
+};
+
 class Chip extends React.Component {
   span = React.createRef();
   state = { isTooltipVisible: false };
@@ -29,7 +53,7 @@ class Chip extends React.Component {
   };
 
   renderChip = randomId => {
-    const { children, closeBtnAriaLabel, tooltipPosition, className, onClick } = this.props;
+    const { children, 'aria-label': ariaLabel, tooltipPosition, className, onClick } = this.props;
     if (this.state.isTooltipVisible) {
       return (
         <Tooltip position={tooltipPosition} content={children}>
@@ -39,7 +63,7 @@ class Chip extends React.Component {
             </span>
             <ChipButton
               onClick={onClick}
-              ariaLabel={closeBtnAriaLabel}
+              aria-label={ariaLabel}
               id={`remove_${randomId}`}
               aria-labelledby={`remove_${randomId} ${randomId}`}
             >
@@ -56,7 +80,7 @@ class Chip extends React.Component {
         </span>
         <ChipButton
           onClick={onClick}
-          ariaLabel={closeBtnAriaLabel}
+          aria-label={ariaLabel}
           id={`remove_${randomId}`}
           aria-labelledby={`remove_${randomId} ${randomId}`}
         >
@@ -73,28 +97,8 @@ class Chip extends React.Component {
     );
   }
 }
-Chip.propTypes = {
-  /** Content rendered inside the chip text */
-  children: PropTypes.node,
-  /** Aria Label for close button */
-  closeBtnAriaLabel: PropTypes.string,
-  /** Additional classes added to the chip item */
-  className: PropTypes.string,
-  /** Flag indicating if the chip has overflow */
-  isOverflowChip: PropTypes.bool,
-  /** Function that is called when clicking on the chip button */
-  onClick: PropTypes.func,
-  /** Position of the tooltip which is displayed if text is longer */
-  tooltipPosition: PropTypes.oneOf(Object.values(TooltipPosition))
-};
 
-Chip.defaultProps = {
-  children: null,
-  closeBtnAriaLabel: 'close',
-  className: '',
-  isOverflowChip: false,
-  tooltipPosition: 'top',
-  onClick: () => {}
-};
+Chip.propTypes = propTypes;
+Chip.defaultProps = defaultProps;
 
 export default Chip;
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/ChipButton.js b/packages/patternfly-4/react-core/src/components/ChipGroup/ChipButton.js
index 73a3a37e1d9..443c9e51f25 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/ChipButton.js
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/ChipButton.js
@@ -1,18 +1,10 @@
 import React from 'react';
-import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
-import styles from '@patternfly/patternfly/components/Chip/chip.css';
 import { Button } from '../Button';
 
-const ChipButton = ({ ariaLabel, children, className, onClick, ...props }) => (
-  <Button variant="plain" aria-label={ariaLabel} onClick={onClick} className={className} {...props}>
-    {children}
-  </Button>
-);
-
-ChipButton.propTypes = {
+const propTypes = {
   /** Aria label for chip button */
-  ariaLabel: PropTypes.string,
+  'aria-label': PropTypes.string,
   /** Content rendered inside the chip item */
   children: PropTypes.node,
   /** Additional classes added to the chip item */
@@ -21,11 +13,20 @@ ChipButton.propTypes = {
   onClick: PropTypes.func
 };
 
-ChipButton.defaultProps = {
-  ariaLabel: 'close',
+const defaultProps = {
+  'aria-label': 'close',
   children: null,
   className: '',
-  onClick: () => {}
+  onClick: () => { }
 };
 
+const ChipButton = ({ children, ...props }) => (
+  <Button variant="plain"  {...props}>
+    {children}
+  </Button>
+);
+
+ChipButton.propTypes = propTypes;
+ChipButton.defaultProps = defaultProps;
+
 export default ChipButton;
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/ChipGroup.js b/packages/patternfly-4/react-core/src/components/ChipGroup/ChipGroup.js
index 7a613a52485..3af35536e33 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/ChipGroup.js
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/ChipGroup.js
@@ -5,6 +5,29 @@ import styles from '@patternfly/patternfly/components/ChipGroup/chip-group.css';
 import { Chip } from '@patternfly/react-core';
 import { fillTemplate } from '../../helpers';
 
+const propTypes = {
+  /** Content rendered inside the chip text */
+  children: PropTypes.node,
+  /** Additional classes added to the chip item */
+  className: PropTypes.string,
+  /** Customizable "Show Less" text string */
+  expandedText: PropTypes.string,
+  /**
+   * Customizeable template string. Use variable "${remaining}" for the overflow chip count.
+   */
+  collapsedText: PropTypes.string,
+  /** Flag for grouping with a toolbar & category name */
+  withToolbar: PropTypes.bool
+};
+
+const defaultProps = {
+  children: null,
+  className: '',
+  expandedText: 'Show Less',
+  collapsedText: '${remaining} more',
+  withToolbar: false
+};
+
 class ChipGroup extends React.Component {
   state = {
     isOpen: false
@@ -64,27 +87,7 @@ const InnerChipGroup = props => {
   );
 };
 
-ChipGroup.propTypes = {
-  /** Content rendered inside the chip text */
-  children: PropTypes.node,
-  /** Additional classes added to the chip item */
-  className: PropTypes.string,
-  /** Customizable "Show Less" text string */
-  expandedText: PropTypes.string,
-  /**
-   * Customizeable template string. Use variable "${remaining}" for the overflow chip count.
-   */
-  collapsedText: PropTypes.string,
-  /** Flag for grouping with a toolbar & category name */
-  withToolbar: PropTypes.bool
-};
-
-ChipGroup.defaultProps = {
-  children: null,
-  className: '',
-  expandedText: 'Show Less',
-  collapsedText: '${remaining} more',
-  withToolbar: false
-};
+ChipGroup.propTypes = propTypes;
+ChipGroup.defaultProps = defaultProps;
 
 export default ChipGroup;
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap b/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
index 461b12432b1..bf222b0c0f8 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
@@ -13,8 +13,8 @@ exports[`ChipGroup chip group default 1`] = `
     withToolbar={false}
   >
     <Chip
+      aria-label="close"
       className=""
-      closeBtnAriaLabel="close"
       isOverflowChip={false}
       onClick={[Function]}
       tooltipPosition="top"
@@ -39,8 +39,8 @@ exports[`ChipGroup chip group with toolbar 1`] = `
     className=""
   >
     <Chip
+      aria-label="close"
       className=""
-      closeBtnAriaLabel="close"
       isOverflowChip={false}
       onClick={[Function]}
       tooltipPosition="top"
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
index 290e6a168fb..6c85fc92f0a 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
@@ -32,7 +32,7 @@ const propTypes = {
   /** Text that appears in the Context Selector Toggle */
   toggleText: PropTypes.string,
   /** aria-label for the Context Selector Search Button */
-  searchButtonAriaLabel: PropTypes.string,
+  'aria-label': PropTypes.string,
   /** Value in the Search field */
   searchInputValue: PropTypes.string,
   /** Function callback called when user changes the Search Input */
@@ -47,15 +47,15 @@ const defaultProps = {
   children: null,
   className: '',
   isOpen: false,
-  onToggle: () => {},
-  onSelect: () => {},
+  onToggle: () => { },
+  onSelect: () => { },
   screenReaderLabel: '',
   toggleText: '',
-  searchButtonAriaLabel: 'Search menu items',
+  'aria-label': 'Search menu items',
   searchInputValue: '',
-  onSearchInputChange: () => {},
+  onSearchInputChange: () => { },
   searchInputPlaceholder: 'Search',
-  onSearchButtonClick: () => {}
+  onSearchButtonClick: () => { }
 };
 
 class ContextSelector extends React.Component {
@@ -79,7 +79,7 @@ class ContextSelector extends React.Component {
       onSelect,
       screenReaderLabel,
       toggleText,
-      searchButtonAriaLabel,
+      'aria-label': ariaLabel,
       searchInputValue,
       onSearchInputChange,
       searchInputPlaceholder,
@@ -121,7 +121,7 @@ class ContextSelector extends React.Component {
                     />
                     <Button
                       variant={ButtonVariant.tertiary}
-                      aria-label={searchButtonAriaLabel}
+                      aria-label={ariaLabel}
                       id={searchButtonId}
                       onClick={onSearchButtonClick}
                     >
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
index a14bca29525..d01d4cc74dc 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
@@ -4,6 +4,28 @@ import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
 import { Dropdown, DropdownPosition, KebabToggle } from '../Dropdown';
 
+const propTypes = {
+  /** Content rendered inside the DataList list */
+  children: PropTypes.node,
+  /** Additional classes added to the DataList list */
+  className: PropTypes.string,
+  /** DataList actions to show in the dropdown */
+  actions: PropTypes.arrayOf(PropTypes.node).isRequired,
+  /** Identify the DataList toggle number */
+  id: PropTypes.string.isRequired,
+  /** Adds accessible text to the DataList item */
+  'aria-labelledby': PropTypes.string.isRequired,
+  /** Adds accessible text to the DataList item */
+  'aria-label': PropTypes.string.isRequired,
+  /** Additional props are spread to the container <div> */
+  '': PropTypes.any
+};
+
+const defaultProps = {
+  children: null,
+  className: ''
+};
+
 class DataListAction extends React.Component {
   constructor(props) {
     super(props);
@@ -36,40 +58,21 @@ class DataListAction extends React.Component {
     return children ? (
       children
     ) : (
-      <div className={css(styles.dataListAction, className)} {...props}>
-        <Dropdown
-          isPlain
-          position={DropdownPosition.right}
-          isOpen={this.state.isOpen}
-          onSelect={this.onSelect}
-          toggle={<KebabToggle onToggle={this.onToggle} />}
-          dropdownItems={actions}
-        />
-      </div>
-    );
+        <div className={css(styles.dataListAction, className)} {...props}>
+          <Dropdown
+            isPlain
+            position={DropdownPosition.right}
+            isOpen={this.state.isOpen}
+            onSelect={this.onSelect}
+            toggle={<KebabToggle onToggle={this.onToggle} />}
+            dropdownItems={actions}
+          />
+        </div>
+      );
   }
 }
 
-DataListAction.propTypes = {
-  /** Content rendered inside the DataList list */
-  children: PropTypes.node,
-  /** Additional classes added to the DataList list */
-  className: PropTypes.string,
-  /** DataList actions to show in the dropdown */
-  actions: PropTypes.arrayOf(PropTypes.node).isRequired,
-  /** Identify the DataList toggle number */
-  id: PropTypes.string.isRequired,
-  /** Adds accessible text to the DataList item */
-  'aria-labelledby': PropTypes.string.isRequired,
-  /** Adds accessible text to the DataList item */
-  'aria-label': PropTypes.string.isRequired,
-  /** Additional props are spread to the container <div> */
-  '': PropTypes.any
-};
-
-DataListAction.defaultProps = {
-  children: null,
-  className: ''
-};
+DataListAction.propTypes = propTypes;
+DataListAction.defaultProps = defaultProps;
 
 export default DataListAction;
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js b/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
index 551ef6dce55..ae9a230df51 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
@@ -3,19 +3,7 @@ import PropTypes from 'prop-types';
 import { css } from '@patternfly/react-styles';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
 
-const DataListContent = ({ className, children, id, isHidden, 'aria-label': ariaLabel, rowid, ...props }) => (
-  <section
-    id={id}
-    className={css(styles.dataListExpandableContent, className)}
-    hidden={isHidden}
-    aria-label={ariaLabel}
-    {...props}
-  >
-    {children}
-  </section>
-);
-
-DataListContent.propTypes = {
+const propTypes = {
   /** Content rendered inside the DataList item */
   children: PropTypes.node,
   /** Additional classes added to the DataList cell */
@@ -30,10 +18,25 @@ DataListContent.propTypes = {
   '': PropTypes.any
 };
 
-DataListContent.defaultProps = {
+const defaultProps = {
   className: '',
   id: '',
   isHidden: false
 };
 
+const DataListContent = ({ className, children, id, isHidden, 'aria-label': ariaLabel, rowid, ...props }) => (
+  <section
+    id={id}
+    className={css(styles.dataListExpandableContent, className)}
+    hidden={isHidden}
+    aria-label={ariaLabel}
+    {...props}
+  >
+    {children}
+  </section>
+);
+
+DataListContent.propTypes = propTypes;
+DataListContent.defaultProps = defaultProps;
+
 export default DataListContent;
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListItem.js b/packages/patternfly-4/react-core/src/components/DataList/DataListItem.js
index 58fb7c791fa..d434fb7b934 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListItem.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListItem.js
@@ -3,21 +3,7 @@ import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
 
-const DataListItem = ({ children, className, isExpanded, 'aria-labelledby': ariaLabelledBy, ...props }) => (
-  <li
-    className={css(styles.dataListItem, isExpanded && styles.modifiers.expanded, className)}
-    aria-labelledby={ariaLabelledBy}
-    {...props}
-  >
-    {React.Children.map(children, child =>
-      React.isValidElement(child) && React.cloneElement(child, {
-        rowid: ariaLabelledBy
-      })
-    )}
-  </li>
-);
-
-DataListItem.propTypes = {
+const propTypes = {
   /** Flag to show if the expanded content of the DataList item is visible */
   isExpanded: PropTypes.bool,
   /** Content rendered inside the DataList item */
@@ -30,10 +16,27 @@ DataListItem.propTypes = {
   '': PropTypes.any
 };
 
-DataListItem.defaultProps = {
+const defaultProps = {
   isExpanded: false,
   children: null,
   className: ''
 };
 
+const DataListItem = ({ children, className, isExpanded, 'aria-labelledby': ariaLabelledBy, ...props }) => (
+  <li
+    className={css(styles.dataListItem, isExpanded && styles.modifiers.expanded, className)}
+    aria-labelledby={ariaLabelledBy}
+    {...props}
+  >
+    {React.Children.map(children, child =>
+      React.isValidElement(child) && React.cloneElement(child, {
+        rowid: ariaLabelledBy
+      })
+    )}
+  </li>
+);
+
+DataListItem.propTypes = propTypes;
+DataListItem.defaultProps = defaultProps;
+
 export default DataListItem;
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.js b/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.js
index 606f96291e2..32aac3ca17d 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.js
@@ -102,7 +102,7 @@ class Dropdown extends React.Component {
             isOpen,
             id,
             isPlain,
-            ariaHasPopup,
+            'aria-haspopup': '' + ariaHasPopup,
             onEnter: this.onEnter
           })
         )}
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.test.js b/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.test.js
index 3929785733e..212a3a4b257 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.test.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Dropdown.test.js
@@ -8,7 +8,6 @@ import DropdownToggle from './DropdownToggle';
 import KebabToggle from './KebabToggle';
 
 
-
 const dropdownItems = [
   <DropdownItem key="link">Link</DropdownItem>,
   <DropdownItem key="action" component="button">
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/KebabToggle.js b/packages/patternfly-4/react-core/src/components/Dropdown/KebabToggle.js
index 56d50d01563..7f1e40860d5 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/KebabToggle.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/KebabToggle.js
@@ -3,15 +3,7 @@ import PropTypes from 'prop-types';
 import { EllipsisVIcon } from '@patternfly/react-icons';
 import Toggle from './Toggle';
 
-const defaultAriaLabel = 'Actions';
-
-const Kebab = ({ ...props }) => (
-  <Toggle {...props}>
-    <EllipsisVIcon />
-  </Toggle>
-);
-
-Kebab.propTypes = {
+const propTypes = {
   /** HTML ID of dropdown toggle */
   id: PropTypes.string,
   /** Anything which can be rendered as dropdown toggle */
@@ -39,12 +31,13 @@ Kebab.propTypes = {
   /** Additional props are spread to the container component */
   '': PropTypes.any
 };
-Kebab.defaultProps = {
+
+const defaultProps = {
   id: '',
   children: null,
   className: '',
   isOpen: false,
-  'aria-label': defaultAriaLabel,
+  'aria-label': 'Actions',
   parentRef: null,
   isFocused: false,
   isHovered: false,
@@ -54,4 +47,13 @@ Kebab.defaultProps = {
   onToggle: Function.prototype
 };
 
+const Kebab = ({ ...props }) => (
+  <Toggle {...props}>
+    <EllipsisVIcon />
+  </Toggle>
+);
+
+Kebab.propTypes = propTypes;
+Kebab.defaultProps = defaultProps;
+
 export default Kebab;
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
index 1cde485c004..67341752872 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/Toggle.js
@@ -35,13 +35,13 @@ const defaultProps = {
   children: null,
   className: '',
   isOpen: false,
+  onToggle: Function.prototype,
   parentRef: null,
   isFocused: false,
   isHovered: false,
   isActive: false,
   isDisabled: false,
-  isPlain: false,
-  onToggle: Function.prototype
+  isPlain: false
 };
 
 class DropdownToggle extends Component {
@@ -99,7 +99,6 @@ class DropdownToggle extends Component {
       isHovered,
       isDisabled,
       isPlain,
-      ariaHasPopup,
       onToggle,
       onEnter,
       parentRef,
@@ -126,7 +125,6 @@ class DropdownToggle extends Component {
         type={type || 'button'}
         onClick={_event => onToggle && onToggle(!isOpen)}
         aria-expanded={isOpen}
-        aria-haspopup={ariaHasPopup}
         onKeyDown={this.onKeyDown}
         disabled={isDisabled}
       >
diff --git a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
index 64b28d9249e..c7bdd404022 100644
--- a/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Dropdown/__snapshots__/Dropdown.test.js.snap
@@ -29,8 +29,8 @@ exports[`KebabToggle basic 1`] = `
     className="pf-c-dropdown pf-m-expanded"
   >
     <Kebab
+      aria-haspopup="null"
       aria-label="Actions"
-      ariaHasPopup={null}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -45,8 +45,8 @@ exports[`KebabToggle basic 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="null"
         aria-label="Actions"
-        ariaHasPopup={null}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -61,7 +61,7 @@ exports[`KebabToggle basic 1`] = `
       >
         <button
           aria-expanded={true}
-          aria-haspopup={null}
+          aria-haspopup="null"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -269,8 +269,8 @@ exports[`KebabToggle dropup + right aligned 1`] = `
     className="pf-c-dropdown pf-m-top"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -285,8 +285,8 @@ exports[`KebabToggle dropup + right aligned 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -301,7 +301,7 @@ exports[`KebabToggle dropup + right aligned 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -483,8 +483,8 @@ exports[`KebabToggle dropup 1`] = `
     className="pf-c-dropdown pf-m-top"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -499,8 +499,8 @@ exports[`KebabToggle dropup 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -515,7 +515,7 @@ exports[`KebabToggle dropup 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -697,8 +697,8 @@ exports[`KebabToggle expanded 1`] = `
     className="pf-c-dropdown pf-m-expanded"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -713,8 +713,8 @@ exports[`KebabToggle expanded 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -729,7 +729,7 @@ exports[`KebabToggle expanded 1`] = `
       >
         <button
           aria-expanded={true}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -1148,8 +1148,8 @@ exports[`KebabToggle plain 1`] = `
     className="pf-c-dropdown"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -1164,8 +1164,8 @@ exports[`KebabToggle plain 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -1180,7 +1180,7 @@ exports[`KebabToggle plain 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle pf-m-plain"
           disabled={false}
@@ -1362,8 +1362,8 @@ exports[`KebabToggle regular 1`] = `
     className="pf-c-dropdown"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -1378,8 +1378,8 @@ exports[`KebabToggle regular 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -1394,7 +1394,7 @@ exports[`KebabToggle regular 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -1576,8 +1576,8 @@ exports[`KebabToggle right aligned 1`] = `
     className="pf-c-dropdown"
   >
     <Kebab
+      aria-haspopup="true"
       aria-label="Actions"
-      ariaHasPopup={true}
       className=""
       id="Dropdown Toggle"
       isActive={false}
@@ -1592,8 +1592,8 @@ exports[`KebabToggle right aligned 1`] = `
       parentRef={null}
     >
       <DropdownToggle
+        aria-haspopup="true"
         aria-label="Actions"
-        ariaHasPopup={true}
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -1608,7 +1608,7 @@ exports[`KebabToggle right aligned 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           aria-label="Actions"
           className="pf-c-dropdown__toggle"
           disabled={false}
@@ -1679,7 +1679,7 @@ exports[`dropdown basic 1`] = `
     className="pf-c-dropdown pf-m-expanded"
   >
     <DropdownToggle
-      ariaHasPopup={null}
+      aria-haspopup="null"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -1694,7 +1694,7 @@ exports[`dropdown basic 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={null}
+        aria-haspopup="null"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -1709,7 +1709,7 @@ exports[`dropdown basic 1`] = `
       >
         <button
           aria-expanded={true}
-          aria-haspopup={null}
+          aria-haspopup="null"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
@@ -1924,7 +1924,7 @@ exports[`dropdown dropup + right aligned 1`] = `
     className="pf-c-dropdown pf-m-top"
   >
     <DropdownToggle
-      ariaHasPopup={true}
+      aria-haspopup="true"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -1939,7 +1939,7 @@ exports[`dropdown dropup + right aligned 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup="true"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -1954,7 +1954,7 @@ exports[`dropdown dropup + right aligned 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
@@ -2143,7 +2143,7 @@ exports[`dropdown dropup 1`] = `
     className="pf-c-dropdown pf-m-top"
   >
     <DropdownToggle
-      ariaHasPopup={true}
+      aria-haspopup="true"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -2158,7 +2158,7 @@ exports[`dropdown dropup 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup="true"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -2173,7 +2173,7 @@ exports[`dropdown dropup 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
@@ -2362,7 +2362,7 @@ exports[`dropdown expanded 1`] = `
     className="pf-c-dropdown pf-m-expanded"
   >
     <DropdownToggle
-      ariaHasPopup={true}
+      aria-haspopup="true"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -2377,7 +2377,7 @@ exports[`dropdown expanded 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup="true"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -2392,7 +2392,7 @@ exports[`dropdown expanded 1`] = `
       >
         <button
           aria-expanded={true}
-          aria-haspopup={true}
+          aria-haspopup="true"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
@@ -2818,7 +2818,7 @@ exports[`dropdown regular 1`] = `
     className="pf-c-dropdown"
   >
     <DropdownToggle
-      ariaHasPopup={true}
+      aria-haspopup="true"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -2833,7 +2833,7 @@ exports[`dropdown regular 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup="true"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -2848,7 +2848,7 @@ exports[`dropdown regular 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
@@ -3037,7 +3037,7 @@ exports[`dropdown right aligned 1`] = `
     className="pf-c-dropdown"
   >
     <DropdownToggle
-      ariaHasPopup={true}
+      aria-haspopup="true"
       className=""
       iconComponent={[Function]}
       id="Dropdown Toggle"
@@ -3052,7 +3052,7 @@ exports[`dropdown right aligned 1`] = `
       parentRef={null}
     >
       <DropdownToggle
-        ariaHasPopup={true}
+        aria-haspopup="true"
         className=""
         id="Dropdown Toggle"
         isActive={false}
@@ -3067,7 +3067,7 @@ exports[`dropdown right aligned 1`] = `
       >
         <button
           aria-expanded={false}
-          aria-haspopup={true}
+          aria-haspopup="true"
           className="pf-c-dropdown__toggle"
           disabled={false}
           id="Dropdown Toggle"
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.js b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.js
index 757bede79f9..9e5decbea5d 100644
--- a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.js
+++ b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import { Form, FormGroup, ActionGroup, FormHelperText } from '../Form';
 import { TextInput } from '../TextInput';
@@ -42,9 +41,9 @@ const propTypes = {
   /** Function that handles the onChange event for the Remember Me Checkbox */
   onChangeRememberMe: PropTypes.func,
   /** Aria Label for the Remember me checkbox */
-  rememberMeAriaLabel: props => {
-    if (props.rememberMeLabel && !props.rememberMeAriaLabel) {
-      return new Error('rememberMeAriaLabel is required with the Remember me checkbox');
+  'aria-label': props => {
+    if (props.rememberMeLabel && !props['aria-label']) {
+      return new Error('aria-label is required with the Remember me checkbox');
     }
     return null;
   },
@@ -70,7 +69,7 @@ const defaultProps = {
   rememberMeLabel: '',
   isRememberMeChecked: false,
   onChangeRememberMe: () => undefined,
-  rememberMeAriaLabel: ''
+  'aria-label': ''
 };
 
 const LoginForm = ({
@@ -91,7 +90,7 @@ const LoginForm = ({
   rememberMeLabel,
   isRememberMeChecked,
   onChangeRememberMe,
-  rememberMeAriaLabel,
+  'aria-label': ariaLabel,
   ...props
 }) => (
   <Form className={className} {...props}>
@@ -127,7 +126,7 @@ const LoginForm = ({
           label={rememberMeLabel}
           checked={isRememberMeChecked}
           onChange={onChangeRememberMe}
-          aria-label={rememberMeAriaLabel}
+          aria-label={ariaLabel}
         />
       </FormGroup>
     )}
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js
index 54234e3c9d0..5736dad72c2 100644
--- a/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js
+++ b/packages/patternfly-4/react-core/src/components/LoginPage/LoginForm.test.js
@@ -8,7 +8,7 @@ test('should render Login form', () => {
 });
 
 test('default function onChangeUsername', () => {
-  const view = shallow(<LoginForm rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />);
+  const view = shallow(<LoginForm rememberMeLabel="Login Form" aria-label="Login Form" />);
   view.find('#pf-login-username-id').simulate('change');
   const result = LoginForm.defaultProps.onChangeUsername();
   expect(result).toBe(undefined);
@@ -17,14 +17,14 @@ test('default function onChangeUsername', () => {
 test('should call onChangeUsername callback', () => {
   const mockFn = jest.fn();
   const view = shallow(
-    <LoginForm onChangeUsername={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+    <LoginForm onChangeUsername={mockFn} rememberMeLabel="Login Form" aria-label="Login Form" />
   );
   view.find('#pf-login-username-id').simulate('change');
   expect(mockFn).toHaveBeenCalled();
 });
 
 test('default function onChangePassword', () => {
-  const view = shallow(<LoginForm rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />);
+  const view = shallow(<LoginForm rememberMeLabel="Login Form" aria-label="Login Form" />);
   view.find('#pf-login-password-id').simulate('change');
   const result = LoginForm.defaultProps.onChangePassword();
   expect(result).toBe(undefined);
@@ -33,14 +33,14 @@ test('default function onChangePassword', () => {
 test('should call onChangePassword callback', () => {
   const mockFn = jest.fn();
   const view = shallow(
-    <LoginForm onChangePassword={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+    <LoginForm onChangePassword={mockFn} rememberMeLabel="Login Form" aria-label="Login Form" />
   );
   view.find('#pf-login-password-id').simulate('change');
   expect(mockFn).toHaveBeenCalled();
 });
 
 test('default function onChangeRememberMe', () => {
-  const view = shallow(<LoginForm rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />);
+  const view = shallow(<LoginForm rememberMeLabel="Login Form" aria-label="Login Form" />);
   view.find('#pf-login-remember-me-id').simulate('change');
   const result = LoginForm.defaultProps.onChangeRememberMe();
   expect(result).toBe(undefined);
@@ -49,13 +49,13 @@ test('default function onChangeRememberMe', () => {
 test('should call onChangeRememberMe callback', () => {
   const mockFn = jest.fn();
   const view = shallow(
-    <LoginForm onChangeRememberMe={mockFn} rememberMeLabel="Login Form" rememberMeAriaLabel="Login Form" />
+    <LoginForm onChangeRememberMe={mockFn} rememberMeLabel="Login Form" aria-label="Login Form" />
   );
   view.find('#pf-login-remember-me-id').simulate('change');
   expect(mockFn).toHaveBeenCalled();
 });
 
-test('LoginForm with rememberMeLabel and no rememberMeAriaLabel generates console error', () => {
+test('LoginForm with rememberMeLabel and no aria-label generates console error', () => {
   const myMock = jest.fn();
   const mockFn = jest.fn();
   global.console = { error: myMock };
@@ -64,12 +64,12 @@ test('LoginForm with rememberMeLabel and no rememberMeAriaLabel generates consol
   expect(myMock).toBeCalled();
 });
 
-test('LoginForm with rememberMeLabel and rememberMeAriaLabel does not generates console error', () => {
+test('LoginForm with rememberMeLabel and aria-label does not generates console error', () => {
   const myMock = jest.fn();
   const mockFn = jest.fn();
   global.console = { error: myMock };
   const view = shallow(
-    <LoginForm onChangeRememberMe={mockFn} rememberMeAriaLabel="remember me" rememberMeLabel="remember me" />
+    <LoginForm onChangeRememberMe={mockFn} aria-label="remember me" rememberMeLabel="remember me" />
   );
   expect(view).toMatchSnapshot();
   expect(myMock).not.toBeCalled();
diff --git a/packages/patternfly-4/react-core/src/components/LoginPage/__snapshots__/LoginForm.test.js.snap b/packages/patternfly-4/react-core/src/components/LoginPage/__snapshots__/LoginForm.test.js.snap
index f0f1b516c6b..f4fe87b4c77 100644
--- a/packages/patternfly-4/react-core/src/components/LoginPage/__snapshots__/LoginForm.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/LoginPage/__snapshots__/LoginForm.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LoginForm with rememberMeLabel and no rememberMeAriaLabel generates console error 1`] = `
+exports[`LoginForm with rememberMeLabel and aria-label does not generates console error 1`] = `
 <Form
   className=""
   isHorizontal={false}
@@ -62,7 +62,7 @@ exports[`LoginForm with rememberMeLabel and no rememberMeAriaLabel generates con
     isValid={true}
   >
     <Checkbox
-      aria-label=""
+      aria-label="remember me"
       checked={false}
       className=""
       id="pf-login-remember-me-id"
@@ -95,7 +95,7 @@ exports[`LoginForm with rememberMeLabel and no rememberMeAriaLabel generates con
 </Form>
 `;
 
-exports[`LoginForm with rememberMeLabel and rememberMeAriaLabel does not generates console error 1`] = `
+exports[`LoginForm with rememberMeLabel and no aria-label generates console error 1`] = `
 <Form
   className=""
   isHorizontal={false}
@@ -157,7 +157,7 @@ exports[`LoginForm with rememberMeLabel and rememberMeAriaLabel does not generat
     isValid={true}
   >
     <Checkbox
-      aria-label="remember me"
+      aria-label=""
       checked={false}
       className=""
       id="pf-login-remember-me-id"
diff --git a/packages/patternfly-4/react-core/src/components/Modal/Modal.js b/packages/patternfly-4/react-core/src/components/Modal/Modal.js
index 1e334c0e48e..2057b2f41de 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/Modal.js
+++ b/packages/patternfly-4/react-core/src/components/Modal/Modal.js
@@ -19,7 +19,7 @@ const propTypes = {
   /** Flag to show the title */
   hideTitle: PropTypes.bool,
   /** id to use for Modal Box description */
-  ariaDescribedById: PropTypes.string,
+  'aria-describedby': PropTypes.string,
   /** Action buttons to put in the Modal Footer */
   actions: PropTypes.any,
   /** A callback for when the close button is clicked */
@@ -39,7 +39,7 @@ const defaultProps = {
   className: '',
   isOpen: false,
   hideTitle: false,
-  ariaDescribedById: '',
+  'aria-describedby': '',
   actions: [],
   onClose: () => undefined,
   isLarge: false,
@@ -96,8 +96,6 @@ class Modal extends React.Component {
   }
 
   render() {
-    const { ...props } = this.props;
-
     if (!canUseDOM) {
       return null;
     }
@@ -106,7 +104,7 @@ class Modal extends React.Component {
       this.container = document.createElement('div');
     }
 
-    return ReactDOM.createPortal(<ModalContent {...props} title={this.props.title} id={this.id} ariaDescribedById={this.props.ariaDescribedById}/>, this.container);
+    return ReactDOM.createPortal(<ModalContent {...this.props} title={this.props.title} id={this.id} />, this.container);
   }
 }
 
diff --git a/packages/patternfly-4/react-core/src/components/Modal/ModalBox.test.js b/packages/patternfly-4/react-core/src/components/Modal/ModalBox.test.js
index ba28d670681..2e70d7ac9e1 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/ModalBox.test.js
+++ b/packages/patternfly-4/react-core/src/components/Modal/ModalBox.test.js
@@ -4,7 +4,7 @@ import { shallow } from 'enzyme';
 
 test('ModalBox Test', () => {
   const view = shallow(
-    <ModalBox titleId="titleId" ariaDescribedById="bodyId">
+    <ModalBox titleId="titleId" aria-describedby="bodyId">
       This is a ModalBox
     </ModalBox>
   );
@@ -13,7 +13,7 @@ test('ModalBox Test', () => {
 
 test('ModalBox Test isLarge', () => {
   const view = shallow(
-    <ModalBox titleId="titleId" ariaDescribedById="bodyId" isLarge>
+    <ModalBox titleId="titleId" aria-describedby="bodyId" isLarge>
       This is a ModalBox
     </ModalBox>
   );
@@ -22,7 +22,7 @@ test('ModalBox Test isLarge', () => {
 
 test('ModalBox Test isOpen', () => {
   const view = shallow(
-    <ModalBox titleId="titleId" ariaDescribedById="bodyId" isLarge isOpen>
+    <ModalBox titleId="titleId" aria-describedby="bodyId" isLarge isOpen>
       This is a ModalBox
     </ModalBox>
   );
diff --git a/packages/patternfly-4/react-core/src/components/Modal/ModalContent.js b/packages/patternfly-4/react-core/src/components/Modal/ModalContent.js
index b4be65b3e4b..7f6df312d74 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/ModalContent.js
+++ b/packages/patternfly-4/react-core/src/components/Modal/ModalContent.js
@@ -33,7 +33,7 @@ const propTypes = {
   /** Creates a small version of the Modal */
   isSmall: PropTypes.bool,
   /** id to use for Modal Box description */
-  ariaDescribedById: PropTypes.string,
+  'aria-describedby': PropTypes.string,
   /** id of the ModalBoxBody */
   id: PropTypes.string.isRequired,
   /** Additional props are spread to the ModalBoxBody component */
@@ -49,7 +49,7 @@ const defaultProps = {
   onClose: () => undefined,
   isLarge: false,
   isSmall: false,
-  ariaDescribedById: ''
+  'aria-describedby': ''
 };
 
 const ModalContent = ({
@@ -63,7 +63,7 @@ const ModalContent = ({
   isLarge,
   isSmall,
   width,
-  ariaDescribedById,
+  'aria-describedby': ariaDescribedBy,
   id,
   ...props
 }) => {
@@ -76,7 +76,7 @@ const ModalContent = ({
     <Backdrop>
       <Bullseye>
         <FocusTrap focusTrapOptions={{ clickOutsideDeactivates: true }} className={css(bullseyeStyle.bullseye)}>
-          <ModalBox style={{ width }} className={className} isLarge={isLarge} isSmall={isSmall} title={title} id={ariaDescribedById || id}>
+          <ModalBox style={{ width }} className={className} isLarge={isLarge} isSmall={isSmall} title={title} id={ariaDescribedBy || id}>
             <ModalBoxHCloseButton onClose={onClose} />
             {modalBoxHeader}
             <ModalBoxBody {...props} id={id}>
diff --git a/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBox.test.js.snap b/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBox.test.js.snap
index 63c66c3aace..aa7747e8ee9 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBox.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Modal/__snapshots__/ModalBox.test.js.snap
@@ -3,7 +3,6 @@
 exports[`ModalBox Test 1`] = `
 <div
   aria-modal="true"
-  ariaDescribedById="bodyId"
   className="pf-c-modal-box"
   role="dialog"
   titleId="titleId"
@@ -15,7 +14,6 @@ exports[`ModalBox Test 1`] = `
 exports[`ModalBox Test isLarge 1`] = `
 <div
   aria-modal="true"
-  ariaDescribedById="bodyId"
   className="pf-c-modal-box pf-m-lg"
   role="dialog"
   titleId="titleId"
@@ -27,7 +25,6 @@ exports[`ModalBox Test isLarge 1`] = `
 exports[`ModalBox Test isOpen 1`] = `
 <div
   aria-modal="true"
-  ariaDescribedById="bodyId"
   className="pf-c-modal-box pf-m-lg"
   isOpen={true}
   role="dialog"
diff --git a/packages/patternfly-4/react-core/src/components/Pagination/OptionsMenu.js b/packages/patternfly-4/react-core/src/components/Pagination/OptionsMenu.js
index 9db58cd8e41..3e2c0657396 100644
--- a/packages/patternfly-4/react-core/src/components/Pagination/OptionsMenu.js
+++ b/packages/patternfly-4/react-core/src/components/Pagination/OptionsMenu.js
@@ -92,6 +92,7 @@ class OptionsMenu extends Component {
       perPage,
       onPerPageSelect,
       toggleTemplate,
+      perPageSuffix,
       ...props
     } = this.props;
     return (
diff --git a/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap b/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
index ab18631e32e..dbacb9d5621 100644
--- a/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Pagination/__snapshots__/Pagination.test.js.snap
@@ -96,7 +96,6 @@ exports[`component render custom pagination toggle 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -207,7 +206,7 @@ exports[`component render custom pagination toggle 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-8"
               isOpen={false}
@@ -597,7 +596,6 @@ exports[`component render custom perPageOptions 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -651,7 +649,7 @@ exports[`component render custom perPageOptions 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-4"
               isOpen={false}
@@ -1084,7 +1082,6 @@ exports[`component render custom start end 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -1195,7 +1192,7 @@ exports[`component render custom start end 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={5}
               id="pf-toggle-id-6"
               isOpen={false}
@@ -1626,7 +1623,6 @@ exports[`component render last page 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -1737,7 +1733,7 @@ exports[`component render last page 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={11}
               id="pf-toggle-id-3"
               isOpen={false}
@@ -2168,7 +2164,6 @@ exports[`component render limited number of pages 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -2279,7 +2274,7 @@ exports[`component render limited number of pages 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-2"
               isOpen={false}
@@ -2710,7 +2705,6 @@ exports[`component render no items 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -2821,7 +2815,7 @@ exports[`component render no items 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={0}
               id="pf-toggle-id-5"
               isOpen={false}
@@ -3247,7 +3241,6 @@ exports[`component render should render correctly bottom 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -3358,7 +3351,7 @@ exports[`component render should render correctly bottom 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-1"
               isOpen={false}
@@ -3789,7 +3782,6 @@ exports[`component render should render correctly top 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -3900,7 +3892,7 @@ exports[`component render should render correctly top 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-0"
               isOpen={false}
@@ -4322,7 +4314,6 @@ exports[`component render titles 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -4433,7 +4424,7 @@ exports[`component render titles 1`] = `
             className="pf-c-dropdown"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-7"
               isOpen={false}
@@ -4864,7 +4855,6 @@ exports[`component render up drop direction 1`] = `
     >
       <div
         className="pf-c-options-menu"
-        perPageSuffix="per page"
       >
         <span
           hidden={true}
@@ -4975,7 +4965,7 @@ exports[`component render up drop direction 1`] = `
             className="pf-c-dropdown pf-m-top"
           >
             <OptionsToggle
-              ariaHasPopup={true}
+              aria-haspopup="true"
               firstIndex={1}
               id="pf-toggle-id-9"
               isOpen={false}
diff --git a/packages/patternfly-4/react-core/src/components/Select/CheckboxSelect.js b/packages/patternfly-4/react-core/src/components/Select/CheckboxSelect.js
index e5633f661d8..c7c67d7c446 100644
--- a/packages/patternfly-4/react-core/src/components/Select/CheckboxSelect.js
+++ b/packages/patternfly-4/react-core/src/components/Select/CheckboxSelect.js
@@ -17,6 +17,10 @@ const propTypes = {
   isGrouped: PropTypes.bool,
   /** Currently checked options */
   checked: PropTypes.arrayOf(PropTypes.string),
+  /** Aria label for fieldset */
+  'aria-label': PropTypes.string,
+  /** Aria labelled by for fieldset */
+  'aria-labelledby': PropTypes.string,
   /** Additional props are spread to the container <select> */
   '': PropTypes.any
 };
diff --git a/packages/patternfly-4/react-core/src/components/Select/CheckboxSelectInput.js b/packages/patternfly-4/react-core/src/components/Select/CheckboxSelectInput.js
index 09febe47119..f29d9ce3bcd 100644
--- a/packages/patternfly-4/react-core/src/components/Select/CheckboxSelectInput.js
+++ b/packages/patternfly-4/react-core/src/components/Select/CheckboxSelectInput.js
@@ -58,7 +58,7 @@ class CheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
         >
           {this.options}
         </Select>
diff --git a/packages/patternfly-4/react-core/src/components/Select/GroupedCheckboxSelectInput.js b/packages/patternfly-4/react-core/src/components/Select/GroupedCheckboxSelectInput.js
index 2da1cc9e3b5..4dcd516ccdd 100644
--- a/packages/patternfly-4/react-core/src/components/Select/GroupedCheckboxSelectInput.js
+++ b/packages/patternfly-4/react-core/src/components/Select/GroupedCheckboxSelectInput.js
@@ -65,7 +65,7 @@ class GroupedCheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           isGrouped
         >
           {this.options}
diff --git a/packages/patternfly-4/react-core/src/components/Select/Select.js b/packages/patternfly-4/react-core/src/components/Select/Select.js
index 133d666f20d..3d8a0da1239 100644
--- a/packages/patternfly-4/react-core/src/components/Select/Select.js
+++ b/packages/patternfly-4/react-core/src/components/Select/Select.js
@@ -27,7 +27,7 @@ const propTypes = {
   /** Adds accessible text to Select */
   'aria-label': PropTypes.string,
   /** Id of label for the Select aria-labelledby */
-  ariaLabelledBy: PropTypes.string,
+  'aria-labelledby': PropTypes.string,
   /** Callback for selection behavior */
   onSelect: PropTypes.func.isRequired,
   /** Callback for toggle button behavior */
@@ -46,7 +46,7 @@ const defaultProps = {
   isExpanded: false,
   isGrouped: false,
   'aria-label': null,
-  ariaLabelledBy: null,
+  'aria-labelledby': null,
   selections: null,
   placeholderText: null,
   variant: SelectVariant.single,
@@ -75,7 +75,7 @@ class Select extends React.Component {
       isExpanded,
       isGrouped,
       selections,
-      ariaLabelledBy,
+      'aria-labelledby': ariaLabelledBy,
       'aria-label': ariaLabel,
       placeholderText,
       width,
diff --git a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
index ad4de2405c4..727c1f7f7da 100644
--- a/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Select/__snapshots__/Select.test.js.snap
@@ -3,7 +3,7 @@
 exports[`checkbox select renders checkbox select groups successfully 1`] = `
 <Select
   aria-label={null}
-  ariaLabelledBy={null}
+  aria-labelledby={null}
   className=""
   isExpanded={true}
   isGrouped={true}
@@ -423,7 +423,7 @@ exports[`checkbox select renders checkbox select groups successfully 1`] = `
 exports[`checkbox select renders closed successfully 1`] = `
 <Select
   aria-label={null}
-  ariaLabelledBy={null}
+  aria-labelledby={null}
   className=""
   isExpanded={false}
   isGrouped={false}
@@ -521,7 +521,7 @@ exports[`checkbox select renders closed successfully 1`] = `
 exports[`checkbox select renders expanded successfully 1`] = `
 <Select
   aria-label={null}
-  ariaLabelledBy={null}
+  aria-labelledby={null}
   className=""
   isExpanded={true}
   isGrouped={false}
@@ -781,7 +781,7 @@ exports[`checkbox select renders expanded successfully 1`] = `
 exports[`select single select renders closed successfully 1`] = `
 <Select
   aria-label={null}
-  ariaLabelledBy={null}
+  aria-labelledby={null}
   className=""
   isExpanded={false}
   isGrouped={false}
@@ -881,7 +881,7 @@ exports[`select single select renders closed successfully 1`] = `
 exports[`select single select renders expanded successfully 1`] = `
 <Select
   aria-label={null}
-  ariaLabelledBy={null}
+  aria-labelledby={null}
   className=""
   isExpanded={true}
   isGrouped={false}
diff --git a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
index f9c47e39fc2..2e8662da123 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
+++ b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
@@ -29,13 +29,11 @@ const propTypes = {
   /** enables Secondary Tab styling */
   isSecondary: PropTypes.bool,
   /** aria-label for the left Scroll Button */
-  leftScrollAriaLabel: PropTypes.string,
+  'aria-label-left-scroll': PropTypes.string,
   /** aria-label for the right Scroll Button */
-  rightScrollAriaLabel: PropTypes.string,
+  'aria-label-right-scroll': PropTypes.string,
   /** determines what tag is used around the Tabs. Use "nav" to define the Tabs inside a navigation region */
   variant: PropTypes.oneOf(Object.values(TabsVariant)),
-  /** provides an accessible label for the Tabs. Labels should be unique for each set of Tabs that are present on a page. When variant is set to nav, this prop should be defined to differentiate the Tabs from other navigation regions on the page. */
-  'aria-label': PropTypes.string
 };
 
 const defaultProps = {
@@ -45,20 +43,30 @@ const defaultProps = {
   id: null,
   isFilled: false,
   isSecondary: false,
-  leftScrollAriaLabel: 'Scroll left',
-  rightScrollAriaLabel: 'Scroll Right',
-  'aria-label': null,
+  'aria-label-left-scroll': 'Scroll left',
+  'aria-label-right-scroll': 'Scroll Right',
   variant: TabsVariant.div
 };
 
-const Tabs = ({ 'aria-label': ariaLabel, id, variant, ...props }) => {
+const Tabs = ({ id, variant, ...props }) => {
   const unique_id = id ? id : getUniqueId();
   return variant === TabsVariant.nav
-    ? <TabsWithNav ariaLabel={ariaLabel} id={unique_id} {...props} />
+    ? <TabsWithNav id={unique_id} {...props} />
     : <TabsWithDiv id={unique_id} {...props} />;
 }
 
-const TabsWithNav = ({ activeKey, ariaLabel, className, id, isFilled, isSecondary, leftScrollAriaLabel, rightScrollAriaLabel, showLeftScrollButton, showRightScrollButton, highlightLeftScrollButton, highlightRightScrollButton, ...props }) => (
+const TabsWithNav = ({
+  activeKey,
+  className,
+  id,
+  isFilled,
+  isSecondary,
+  showLeftScrollButton,
+  showRightScrollButton,
+  highlightLeftScrollButton,
+  highlightRightScrollButton,
+  ...props
+}) => (
   <nav {...props}
     aria-label={ariaLabel}
     className={css(
@@ -71,12 +79,24 @@ const TabsWithNav = ({ activeKey, ariaLabel, className, id, isFilled, isSecondar
       highlightRightScrollButton && styles.modifiers.endCurrent,
       className)}
   >
-    <InternalTabs id={id} activeKey={activeKey} leftScrollAriaLabel={leftScrollAriaLabel} rightScrollAriaLabel={rightScrollAriaLabel} {...props} />
+    <InternalTabs id={id} activeKey={activeKey} {...props} />
     <InternalTabContainer id={id} activeKey={activeKey} {...props} />
   </nav>
 );
 
-const TabsWithDiv = ({ activeKey, className, id, isFilled, isSecondary, leftScrollAriaLabel, rightScrollAriaLabel, showLeftScrollButton, showRightScrollButton, highlightLeftScrollButton, highlightRightScrollButton, ...props }) => (
+const TabsWithDiv = ({
+  activeKey,
+  className,
+  id,
+  isFilled,
+  isSecondary,
+  showLeftScrollButton,
+  showRightScrollButton,
+  highlightLeftScrollButton,
+  highlightRightScrollButton,
+  'aria-label-left-scroll': ariaLabelLeftScroll,
+  'aria-label-right-scroll': ariaLabelRightScroll,
+  ...props }) => (
   <div {...props}
     className={css(
       styles.tabs,
@@ -88,7 +108,7 @@ const TabsWithDiv = ({ activeKey, className, id, isFilled, isSecondary, leftScro
       highlightRightScrollButton && styles.modifiers.endCurrent,
       className)}
   >
-    <InternalTabs id={id} activeKey={activeKey} leftScrollAriaLabel={leftScrollAriaLabel} rightScrollAriaLabel={rightScrollAriaLabel} {...props} />
+    <InternalTabs id={id} activeKey={activeKey} {...props} />
     <InternalTabContainer id={id} activeKey={activeKey} {...props} />
   </div>
 );
@@ -203,9 +223,8 @@ class InternalTabs extends React.Component {
       id,
       isFilled,
       isSecondary,
-      leftScrollAriaLabel,
-      rightScrollAriaLabel,
-      ...props
+      'aria-label-left-scroll': ariaLabelLeftScroll,
+      'aria-label-right-scroll': ariaLabelRightScroll,
     } = this.props;
     const {
       showLeftScrollButton,
@@ -219,7 +238,7 @@ class InternalTabs extends React.Component {
         <button
           className={css(styles.tabsScrollButton)}
           variant="plain"
-          aria-label={leftScrollAriaLabel}
+          aria-label={ariaLabelLeftScroll}
           onClick={this.scrollLeft}
         >
           <AngleLeftIcon />
@@ -250,7 +269,7 @@ class InternalTabs extends React.Component {
         <button
           className={css(styles.tabsScrollButton)}
           variant="plain"
-          aria-label={rightScrollAriaLabel}
+          aria-label={ariaLabelRightScroll}
           onClick={this.scrollRight}
         >
           <AngleRightIcon />
diff --git a/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap b/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
index dd28d760788..620da916ece 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Tabs/__snapshots__/Tabs.test.js.snap
@@ -3,25 +3,24 @@
 exports[`should call handleScrollButtons tabs with scrolls 1`] = `
 <Tabs
   activeKey={0}
-  aria-label={null}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="handleScrollButtons"
   isFilled={true}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
   variant="div"
 >
   <TabsWithDiv
     activeKey={0}
+    aria-label-left-scroll="Scroll left"
+    aria-label-right-scroll="Scroll Right"
     className=""
     id="handleScrollButtons"
     isFilled={true}
     isSecondary={false}
-    leftScrollAriaLabel="Scroll left"
     onSelect={[Function]}
-    rightScrollAriaLabel="Scroll Right"
   >
     <div
       className="pf-c-tabs pf-m-fill"
@@ -29,14 +28,13 @@ exports[`should call handleScrollButtons tabs with scrolls 1`] = `
     >
       <InternalTabs
         activeKey={0}
-        aria-label={null}
+        aria-label-left-scroll="Scroll left"
+        aria-label-right-scroll="Scroll Right"
         className=""
         id="handleScrollButtons"
         isFilled={false}
         isSecondary={false}
-        leftScrollAriaLabel="Scroll left"
         onSelect={[Function]}
-        rightScrollAriaLabel="Scroll Right"
         variant="div"
       >
         <button
@@ -384,25 +382,24 @@ exports[`should call handleScrollButtons tabs with scrolls 1`] = `
 exports[`should call scrollLeft tabs with scrolls 1`] = `
 <Tabs
   activeKey={0}
-  aria-label={null}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="scrollLeft"
   isFilled={true}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
   variant="div"
 >
   <TabsWithDiv
     activeKey={0}
+    aria-label-left-scroll="Scroll left"
+    aria-label-right-scroll="Scroll Right"
     className=""
     id="scrollLeft"
     isFilled={true}
     isSecondary={false}
-    leftScrollAriaLabel="Scroll left"
     onSelect={[Function]}
-    rightScrollAriaLabel="Scroll Right"
   >
     <div
       className="pf-c-tabs pf-m-fill"
@@ -410,14 +407,13 @@ exports[`should call scrollLeft tabs with scrolls 1`] = `
     >
       <InternalTabs
         activeKey={0}
-        aria-label={null}
+        aria-label-left-scroll="Scroll left"
+        aria-label-right-scroll="Scroll Right"
         className=""
         id="scrollLeft"
         isFilled={false}
         isSecondary={false}
-        leftScrollAriaLabel="Scroll left"
         onSelect={[Function]}
-        rightScrollAriaLabel="Scroll Right"
         variant="div"
       >
         <button
@@ -765,25 +761,24 @@ exports[`should call scrollLeft tabs with scrolls 1`] = `
 exports[`should call scrollRight tabs with scrolls 1`] = `
 <Tabs
   activeKey={0}
-  aria-label={null}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="scrollRight"
   isFilled={true}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
   variant="div"
 >
   <TabsWithDiv
     activeKey={0}
+    aria-label-left-scroll="Scroll left"
+    aria-label-right-scroll="Scroll Right"
     className=""
     id="scrollRight"
     isFilled={true}
     isSecondary={false}
-    leftScrollAriaLabel="Scroll left"
     onSelect={[Function]}
-    rightScrollAriaLabel="Scroll Right"
   >
     <div
       className="pf-c-tabs pf-m-fill"
@@ -791,14 +786,13 @@ exports[`should call scrollRight tabs with scrolls 1`] = `
     >
       <InternalTabs
         activeKey={0}
-        aria-label={null}
+        aria-label-left-scroll="Scroll left"
+        aria-label-right-scroll="Scroll Right"
         className=""
         id="scrollRight"
         isFilled={false}
         isSecondary={false}
-        leftScrollAriaLabel="Scroll left"
         onSelect={[Function]}
-        rightScrollAriaLabel="Scroll Right"
         variant="div"
       >
         <button
@@ -1146,14 +1140,14 @@ exports[`should call scrollRight tabs with scrolls 1`] = `
 exports[`should render accessible tabs 1`] = `
 <TabsWithNav
   activeKey={0}
-  ariaLabel="accessible Tabs example"
+  aria-label="accessible Tabs example"
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="accessibleTabs"
   isFilled={false}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
 >
   <ForwardRef
     eventKey={0}
@@ -1182,13 +1176,13 @@ exports[`should render accessible tabs 1`] = `
 exports[`should render filled tabs 1`] = `
 <TabsWithDiv
   activeKey={0}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="filledTabs"
   isFilled={true}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
 >
   <ForwardRef
     eventKey={0}
@@ -1217,13 +1211,13 @@ exports[`should render filled tabs 1`] = `
 exports[`should render secondary tabs 1`] = `
 <TabsWithDiv
   activeKey={0}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="primaryTabs"
   isFilled={false}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
 >
   <ForwardRef
     eventKey={0}
@@ -1231,14 +1225,13 @@ exports[`should render secondary tabs 1`] = `
   >
     <Tabs
       activeKey={0}
-      aria-label={null}
+      aria-label-left-scroll="Scroll left"
+      aria-label-right-scroll="Scroll Right"
       className=""
       id="secondaryTabs"
       isFilled={false}
       isSecondary={false}
-      leftScrollAriaLabel="Scroll left"
       onSelect={[Function]}
-      rightScrollAriaLabel="Scroll Right"
       variant="div"
     >
       <ForwardRef
@@ -1284,13 +1277,13 @@ exports[`should render secondary tabs 1`] = `
 exports[`should render simple tabs 1`] = `
 <TabsWithDiv
   activeKey={0}
+  aria-label-left-scroll="Scroll left"
+  aria-label-right-scroll="Scroll Right"
   className=""
   id="simpleTabs"
   isFilled={false}
   isSecondary={false}
-  leftScrollAriaLabel="Scroll left"
   onSelect={[Function]}
-  rightScrollAriaLabel="Scroll Right"
 >
   <ForwardRef
     eventKey={0}
diff --git a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
index 7d7614da73d..2aa4906f7a7 100644
--- a/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
+++ b/packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
@@ -3022,8 +3022,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-10"
                                   isActive={false}
@@ -3038,8 +3038,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-10"
                                     isActive={false}
@@ -3054,7 +3054,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -3748,8 +3748,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-11"
                                   isActive={false}
@@ -3764,8 +3764,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-11"
                                     isActive={false}
@@ -3780,7 +3780,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -4474,8 +4474,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-12"
                                   isActive={false}
@@ -4490,8 +4490,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-12"
                                     isActive={false}
@@ -4506,7 +4506,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -5200,8 +5200,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-13"
                                   isActive={false}
@@ -5216,8 +5216,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-13"
                                     isActive={false}
@@ -5232,7 +5232,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -5926,8 +5926,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-14"
                                   isActive={false}
@@ -5942,8 +5942,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-14"
                                     isActive={false}
@@ -5958,7 +5958,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -6652,8 +6652,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-15"
                                   isActive={false}
@@ -6668,8 +6668,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-15"
                                     isActive={false}
@@ -6684,7 +6684,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -7378,8 +7378,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-16"
                                   isActive={false}
@@ -7394,8 +7394,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-16"
                                     isActive={false}
@@ -7410,7 +7410,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -8104,8 +8104,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-17"
                                   isActive={false}
@@ -8120,8 +8120,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-17"
                                     isActive={false}
@@ -8136,7 +8136,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -8830,8 +8830,8 @@ exports[`Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-18"
                                   isActive={false}
@@ -8846,8 +8846,8 @@ exports[`Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-18"
                                     isActive={false}
@@ -8862,7 +8862,7 @@ exports[`Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -44728,8 +44728,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-0"
                                   isActive={false}
@@ -44744,8 +44744,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-0"
                                     isActive={false}
@@ -44760,7 +44760,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -45580,8 +45580,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-1"
                                   isActive={false}
@@ -45596,8 +45596,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-1"
                                     isActive={false}
@@ -45612,7 +45612,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -46432,8 +46432,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-2"
                                   isActive={false}
@@ -46448,8 +46448,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-2"
                                     isActive={false}
@@ -46464,7 +46464,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -47284,8 +47284,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-3"
                                   isActive={false}
@@ -47300,8 +47300,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-3"
                                     isActive={false}
@@ -47316,7 +47316,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -48136,8 +48136,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-4"
                                   isActive={false}
@@ -48152,8 +48152,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-4"
                                     isActive={false}
@@ -48168,7 +48168,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -48988,8 +48988,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-5"
                                   isActive={false}
@@ -49004,8 +49004,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-5"
                                     isActive={false}
@@ -49020,7 +49020,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -49840,8 +49840,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-6"
                                   isActive={false}
@@ -49856,8 +49856,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-6"
                                     isActive={false}
@@ -49872,7 +49872,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -50692,8 +50692,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-7"
                                   isActive={false}
@@ -50708,8 +50708,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-7"
                                     isActive={false}
@@ -50724,7 +50724,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -51544,8 +51544,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-8"
                                   isActive={false}
@@ -51560,8 +51560,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-8"
                                     isActive={false}
@@ -51576,7 +51576,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain"
                                       disabled={false}
@@ -52399,8 +52399,8 @@ exports[`Simple Actions table 1`] = `
                                 onToggle={[Function]}
                               >
                                 <Kebab
+                                  aria-haspopup="true"
                                   aria-label="Actions"
-                                  ariaHasPopup={true}
                                   className=""
                                   id="pf-toggle-id-9"
                                   isActive={false}
@@ -52415,8 +52415,8 @@ exports[`Simple Actions table 1`] = `
                                   parentRef={null}
                                 >
                                   <DropdownToggle
+                                    aria-haspopup="true"
                                     aria-label="Actions"
-                                    ariaHasPopup={true}
                                     className=""
                                     id="pf-toggle-id-9"
                                     isActive={false}
@@ -52431,7 +52431,7 @@ exports[`Simple Actions table 1`] = `
                                   >
                                     <button
                                       aria-expanded={false}
-                                      aria-haspopup={true}
+                                      aria-haspopup="true"
                                       aria-label="Actions"
                                       className="pf-c-dropdown__toggle pf-m-plain pf-m-disabled"
                                       disabled={true}

From d77bbab3da75befeeaaddccdf543ae2247c1897d Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 13:10:48 -0400
Subject: [PATCH 02/11] fix tabs aria label

---
 .../patternfly-4/react-core/src/components/Tabs/Tabs.js  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
index 2e8662da123..c1d27a04cc2 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
+++ b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
@@ -65,10 +65,11 @@ const TabsWithNav = ({
   showRightScrollButton,
   highlightLeftScrollButton,
   highlightRightScrollButton,
+  'aria-label-left-scroll': ariaLabelLeftScroll,
+  'aria-label-right-scroll': ariaLabelRightScroll,
   ...props
 }) => (
   <nav {...props}
-    aria-label={ariaLabel}
     className={css(
       styles.tabs,
       isFilled && styles.modifiers.fill,
@@ -226,12 +227,6 @@ class InternalTabs extends React.Component {
       'aria-label-left-scroll': ariaLabelLeftScroll,
       'aria-label-right-scroll': ariaLabelRightScroll,
     } = this.props;
-    const {
-      showLeftScrollButton,
-      showRightScrollButton,
-      highlightLeftScrollButton,
-      highlightRightScrollButton
-    } = this.state;
 
     return <React.Fragment>
       {!isSecondary && (

From 241448845f2025f7a72e821456f6b5ea061cff18 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 14:32:51 -0400
Subject: [PATCH 03/11] fix typo

---
 .../react-core/src/components/AboutModal/AboutModal.test.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
index aecd8d2b852..43cd1c7c2f4 100644
--- a/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
+++ b/packages/patternfly-4/react-core/src/components/AboutModal/AboutModal.test.js
@@ -48,7 +48,7 @@ test('modal does not call onClose for esc key if it is not open', () => {
   expect(props.onClose).not.toBeCalled();
 });
 
-test('Each modal is given new aria-describedby and aria-lablledby', () => {
+test('Each modal is given new aria-describedby and aria-labelledby', () => {
   const first = shallow(<AboutModal {...props}> Test About Modal </AboutModal>);
   const second = shallow(<AboutModal {...props}> Test About Modal </AboutModal>);
   expect(first.props()['aria-labelledby']).not.toBe(second.props()['aria-labelledby']);

From 967e2a942e4aa6f15c42f22f9e77dd44dd04d5f9 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 14:47:10 -0400
Subject: [PATCH 04/11] Fix AlertActionCloseButton variant label

---
 .../src/components/Alert/AlertActionCloseButton.js   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
index 84ff0128f0f..55803031178 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionCloseButton.js
@@ -20,11 +20,19 @@ const defaultProps = {
   onClose: () => undefined
 };
 
-const AlertActionCloseButton = ({ className, onClose, variantLabel, 'aria-label': ariaLabel, title, variant, ...props }) => (
+const AlertActionCloseButton = ({
+  className,
+  onClose,
+  'aria-label': ariaLabel,
+  title,
+  variant,
+  variantLabel,
+  ...props
+}) => (
   <Button
     variant={ButtonVariant.plain}
     onClick={onClose}
-    aria-label={ariaLabel === '' ? `Close ${variant} alert: ${title}` : ariaLabel}
+    aria-label={ariaLabel === '' ? `Close ${variantLabel} alert: ${title}` : ariaLabel}
     {...props}
   >
     <TimesIcon />

From 29d5f0a872638a14d3d09f01fa3bb857a43af0b2 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 15:18:41 -0400
Subject: [PATCH 05/11] don't pass title or variant to <button> in DOM

---
 .../src/components/Alert/AlertActionLink.js   |  9 ++++++-
 .../Alert/__snapshots__/Alert.test.js.snap    | 24 -------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
index 2b2969ca4a2..4b959790142 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertActionLink.js
@@ -16,7 +16,14 @@ const defaultProps = {
   className: ''
 };
 
-const AlertActionLink = ({ className, variantLabel, children, ...props }) => (
+const AlertActionLink = ({
+  className,
+  title,
+  variant,
+  variantLabel,
+  children,
+  ...props
+}) => (
   <Button variant={ButtonVariant.link} {...props}>
     {children}
   </Button>
diff --git a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
index 0bc222bc6c6..22a0acba151 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
@@ -218,7 +218,6 @@ exports[`Alert - danger Action Link 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title=""
           type="button"
           variant="link"
         >
@@ -228,7 +227,6 @@ exports[`Alert - danger Action Link 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title=""
             type="button"
           >
             test
@@ -326,7 +324,6 @@ exports[`Alert - danger Action and Title 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -336,7 +333,6 @@ exports[`Alert - danger Action and Title 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -435,7 +431,6 @@ exports[`Alert - danger Custom aria label 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -445,7 +440,6 @@ exports[`Alert - danger Custom aria label 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -808,7 +802,6 @@ exports[`Alert - info Action Link 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title=""
           type="button"
           variant="link"
         >
@@ -818,7 +811,6 @@ exports[`Alert - info Action Link 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title=""
             type="button"
           >
             test
@@ -916,7 +908,6 @@ exports[`Alert - info Action and Title 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -926,7 +917,6 @@ exports[`Alert - info Action and Title 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -1025,7 +1015,6 @@ exports[`Alert - info Custom aria label 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -1035,7 +1024,6 @@ exports[`Alert - info Custom aria label 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -1398,7 +1386,6 @@ exports[`Alert - success Action Link 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title=""
           type="button"
           variant="link"
         >
@@ -1408,7 +1395,6 @@ exports[`Alert - success Action Link 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title=""
             type="button"
           >
             test
@@ -1506,7 +1492,6 @@ exports[`Alert - success Action and Title 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -1516,7 +1501,6 @@ exports[`Alert - success Action and Title 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -1615,7 +1599,6 @@ exports[`Alert - success Custom aria label 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -1625,7 +1608,6 @@ exports[`Alert - success Custom aria label 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -1988,7 +1970,6 @@ exports[`Alert - warning Action Link 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title=""
           type="button"
           variant="link"
         >
@@ -1998,7 +1979,6 @@ exports[`Alert - warning Action Link 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title=""
             type="button"
           >
             test
@@ -2096,7 +2076,6 @@ exports[`Alert - warning Action and Title 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -2106,7 +2085,6 @@ exports[`Alert - warning Action and Title 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test
@@ -2205,7 +2183,6 @@ exports[`Alert - warning Custom aria label 1`] = `
           isDisabled={false}
           isFocus={false}
           isHover={false}
-          title="Some title"
           type="button"
           variant="link"
         >
@@ -2215,7 +2192,6 @@ exports[`Alert - warning Custom aria label 1`] = `
             className="pf-c-button pf-m-link"
             disabled={false}
             tabIndex={null}
-            title="Some title"
             type="button"
           >
             test

From b7c824a6328a1ffa92dafeb38bf504309faf2cea Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 16:33:52 -0400
Subject: [PATCH 06/11] fix DataListToggle ariaLabelledBy logic

---
 .../components/DataList/DataListContent.js    |  5 +-
 .../src/components/DataList/DataListToggle.js | 54 ++++++++++++-------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js b/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
index ae9a230df51..0137fb884f4 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListContent.js
@@ -12,7 +12,7 @@ const propTypes = {
   id: PropTypes.string,
   /** Flag to show if the expanded content of the DataList item is visible */
   isHidden: PropTypes.bool,
-  /** Adds accessible text to the DataList toggle */
+  /** Adds accessible text to the expandable context section */
   'aria-label': PropTypes.string.isRequired,
   /** Additional props are spread to the container <section> */
   '': PropTypes.any
@@ -24,12 +24,11 @@ const defaultProps = {
   isHidden: false
 };
 
-const DataListContent = ({ className, children, id, isHidden, 'aria-label': ariaLabel, rowid, ...props }) => (
+const DataListContent = ({ className, children, id, isHidden, rowid, ...props }) => (
   <section
     id={id}
     className={css(styles.dataListExpandableContent, className)}
     hidden={isHidden}
-    aria-label={ariaLabel}
     {...props}
   >
     {children}
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js b/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
index a5820af0344..3318ef4e81c 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
@@ -5,24 +5,7 @@ import { AngleRightIcon } from '@patternfly/react-icons';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
 import { Button, ButtonVariant } from '../Button';
 
-const DataListToggle = ({
-  className,
-  isExpanded,
-  'aria-controls': ariaControls,
-  'aria-label': ariaLabel,
-  'aria-labelledby': ariaLabelledBy,
-  rowid,
-  id,
-  ...props
-}) => (
-  <div className={css(styles.dataListToggle, className)} {...props}>
-    <Button id={id} variant={ButtonVariant.plain} aria-controls={ariaControls !== '' && ariaControls} aria-label={ariaLabel} aria-labelledby={ariaLabel !== "Details" ? null : `${rowid} ${id}`} aria-expanded={isExpanded}>
-      <AngleRightIcon />
-    </Button>
-  </div>
-);
-
-DataListToggle.propTypes = {
+const propTypes = {
   /** Additional classes added to the DataList cell */
   className: PropTypes.string,
   /** Flag to show if the expanded content of the DataList item is visible */
@@ -39,7 +22,7 @@ DataListToggle.propTypes = {
   '': PropTypes.any
 };
 
-DataListToggle.defaultProps = {
+const defaultProps = {
   'aria-controls': '',
   'aria-label': 'Details',
   'aria-labelledby': '',
@@ -47,4 +30,37 @@ DataListToggle.defaultProps = {
   isExpanded: false
 };
 
+const DataListToggle = ({
+  className,
+  isExpanded,
+  'aria-controls': ariaControls,
+  'aria-label': ariaLabel,
+  'aria-labelledby': ariaLabelledBy,
+  rowid,
+  id,
+  ...props
+}) => {
+  if (ariaLabel === "Details") {
+    ariaLabelledBy = `${rowid} ${id}`;
+  }
+
+  return (
+    <div className={css(styles.dataListToggle, className)} {...props}>
+      <Button
+        id={id}
+        variant={ButtonVariant.plain}
+        aria-controls={ariaControls !== '' && ariaControls}
+        aria-label={ariaLabel}
+        aria-labelledby={ariaLabelledBy}
+        aria-expanded={isExpanded}
+      >
+        <AngleRightIcon />
+      </Button>
+    </div>
+  );
+}
+
+DataListToggle.propTypes = propTypes;
+DataListToggle.defaultProps = defaultProps;
+
 export default DataListToggle;

From 658381f228c9892962618f144e6df79a17a3fabe Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 17:00:00 -0400
Subject: [PATCH 07/11] Fix aria-labelledby in docs

---
 .../patternfly-4/react-core/src/components/Select/Select.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Select/Select.md b/packages/patternfly-4/react-core/src/components/Select/Select.md
index d63dddd28df..d6ebc4f8d67 100644
--- a/packages/patternfly-4/react-core/src/components/Select/Select.md
+++ b/packages/patternfly-4/react-core/src/components/Select/Select.md
@@ -65,7 +65,7 @@ class SingleSelectInput extends React.Component {
           onSelect={this.onSelect}
           selections={selected}
           isExpanded={isExpanded}
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
         >
           {this.options.map((option, index) => (
             <SelectOption
@@ -148,7 +148,7 @@ class CheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
         >
           {this.options}
         </Select>
@@ -230,7 +230,7 @@ class GroupedCheckboxSelectInput extends React.Component {
           selections={selected}
           isExpanded={isExpanded}
           placeholderText="Filter by status"
-          ariaLabelledBy={titleId}
+          aria-labelledby={titleId}
           isGrouped
         >
           {this.options}

From d7b6f0a3002df4f4415f57726f4ce7989d3e6c2c Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 17:09:17 -0400
Subject: [PATCH 08/11] fix modal aria docs

---
 packages/patternfly-4/react-core/src/components/Modal/Modal.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/patternfly-4/react-core/src/components/Modal/Modal.md b/packages/patternfly-4/react-core/src/components/Modal/Modal.md
index faf937032fd..3f568f2711b 100644
--- a/packages/patternfly-4/react-core/src/components/Modal/Modal.md
+++ b/packages/patternfly-4/react-core/src/components/Modal/Modal.md
@@ -240,7 +240,7 @@ class NoHeader extends React.Component {
           title="Modal Header"
           isOpen={isModalOpen}
           hideTitle={true}
-          ariaDescribedById="no-header-example"
+          aria-describedby="no-header-example"
           onClose={this.handleModalToggle}
           actions={[
             <Button key="confirm" variant="primary" onClick={this.handleModalToggle}>

From ccedbe9d78bf9d7631e79cffae3a1e1eb05ecad1 Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 18:19:04 -0400
Subject: [PATCH 09/11] Rename aria-labels that could possibly be extended

and remove some unused ones
---
 .../patternfly-4/react-core/src/components/Alert/Alert.js | 2 +-
 .../react-core/src/components/Alert/AlertBody.js          | 4 ++--
 .../components/ApplicationLauncher/ApplicationLauncher.js | 6 +++---
 .../react-core/src/components/ChipGroup/Chip.js           | 6 +++---
 .../src/components/ContextSelector/ContextSelector.js     | 6 +++---
 .../react-core/src/components/DataList/DataList.js        | 3 +--
 .../react-core/src/components/DataList/DataListAction.js  | 6 ------
 .../react-core/src/components/DataList/DataListToggle.js  | 8 ++++----
 .../react-core/src/components/Page/PageHeader.js          | 8 ++++----
 .../react-core/src/components/Select/Select.js            | 2 +-
 10 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Alert/Alert.js b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
index 96fb1ab25d7..969e54a5acd 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/Alert.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/Alert.js
@@ -33,7 +33,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-  'aria-label': undefined,
+  'aria-label': '',
   action: null,
   children: '',
   className: '',
diff --git a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
index 445b517c04a..9991522d52b 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
+++ b/packages/patternfly-4/react-core/src/components/Alert/AlertBody.js
@@ -10,7 +10,7 @@ const propTypes = {
   children: PropTypes.node,
   className: PropTypes.string,
   onClose: PropTypes.func,
-  'aria-label': PropTypes.string
+  'aria-label-button': PropTypes.string
 };
 
 const defaultProps = {
@@ -21,7 +21,7 @@ const defaultProps = {
   'aria-label': 'Close'
 };
 
-const AlertBody = ({ title, className, children, onClose, 'aria-label': ariaLabel, ...props }) => (
+const AlertBody = ({ title, className, children, onClose, 'aria-label-button': ariaLabel, ...props }) => (
   <div {...props} className={className}>
     {onClose && (
       <Button variant={ButtonVariant.plain} onClick={onClose} aria-label={ariaLabel}>
diff --git a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
index 17601d1ea93..69d9ca3d941 100644
--- a/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
+++ b/packages/patternfly-4/react-core/src/components/ApplicationLauncher/ApplicationLauncher.js
@@ -25,7 +25,7 @@ export const propTypes = {
   /** Indicates where menu will be alligned horizontally */
   position: PropTypes.oneOf(Object.values(ApplicationLauncherPosition)),
   /** Adds accessible text to the button. Required for plain buttons */
-  'aria-label': PropTypes.string
+  'aria-label-button': PropTypes.string
 };
 
 export const defaultProps = {
@@ -36,7 +36,7 @@ export const defaultProps = {
   onSelect: Function.prototype,
   onToggle: Function.prototype,
   position: ApplicationLauncherPosition.left,
-  'aria-label': 'Actions'
+  'aria-label-button': 'Actions'
 };
 
 class ApplicationLauncher extends React.Component {
@@ -50,7 +50,7 @@ class ApplicationLauncher extends React.Component {
 
   render() {
     const {
-      'aria-label': ariaLabel,
+      'aria-label-button': ariaLabel,
       dropdownItems,
       className,
       isOpen,
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js b/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
index 8f107c9612f..ba86993de40 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/Chip.js
@@ -11,7 +11,7 @@ const propTypes = {
   /** Content rendered inside the chip text */
   children: PropTypes.node,
   /** Aria Label for close button */
-  'aria-label': PropTypes.string,
+  'aria-label-button': PropTypes.string,
   /** Additional classes added to the chip item */
   className: PropTypes.string,
   /** Flag indicating if the chip has overflow */
@@ -24,7 +24,7 @@ const propTypes = {
 
 const defaultProps = {
   children: null,
-  'aria-label': 'close',
+  'aria-label-button': 'close',
   className: '',
   isOverflowChip: false,
   tooltipPosition: 'top',
@@ -53,7 +53,7 @@ class Chip extends React.Component {
   };
 
   renderChip = randomId => {
-    const { children, 'aria-label': ariaLabel, tooltipPosition, className, onClick } = this.props;
+    const { children, 'aria-label-button': ariaLabel, tooltipPosition, className, onClick } = this.props;
     if (this.state.isTooltipVisible) {
       return (
         <Tooltip position={tooltipPosition} content={children}>
diff --git a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
index 6c85fc92f0a..347a1ca429d 100644
--- a/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
+++ b/packages/patternfly-4/react-core/src/components/ContextSelector/ContextSelector.js
@@ -32,7 +32,7 @@ const propTypes = {
   /** Text that appears in the Context Selector Toggle */
   toggleText: PropTypes.string,
   /** aria-label for the Context Selector Search Button */
-  'aria-label': PropTypes.string,
+  'aria-label-search': PropTypes.string,
   /** Value in the Search field */
   searchInputValue: PropTypes.string,
   /** Function callback called when user changes the Search Input */
@@ -51,7 +51,7 @@ const defaultProps = {
   onSelect: () => { },
   screenReaderLabel: '',
   toggleText: '',
-  'aria-label': 'Search menu items',
+  'aria-label-search': 'Search menu items',
   searchInputValue: '',
   onSearchInputChange: () => { },
   searchInputPlaceholder: 'Search',
@@ -79,7 +79,7 @@ class ContextSelector extends React.Component {
       onSelect,
       screenReaderLabel,
       toggleText,
-      'aria-label': ariaLabel,
+      'aria-label-search': ariaLabel,
       searchInputValue,
       onSearchInputChange,
       searchInputPlaceholder,
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataList.js b/packages/patternfly-4/react-core/src/components/DataList/DataList.js
index f2a07d7e3f8..c6e89e42a9c 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataList.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataList.js
@@ -3,11 +3,10 @@ import { css } from '@patternfly/react-styles';
 import PropTypes from 'prop-types';
 import styles from '@patternfly/patternfly/components/DataList/data-list.css';
 
-const DataList = ({ children, className, 'aria-label': ariaLabel, ...props }) => (
+const DataList = ({ children, className, ...props }) => (
   <ul
     className={css(styles.dataList, className)}
     role="list"
-    aria-label={ariaLabel}
     {...props}
   >
     {children}
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
index d01d4cc74dc..823299fd1a5 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListAction.js
@@ -13,10 +13,6 @@ const propTypes = {
   actions: PropTypes.arrayOf(PropTypes.node).isRequired,
   /** Identify the DataList toggle number */
   id: PropTypes.string.isRequired,
-  /** Adds accessible text to the DataList item */
-  'aria-labelledby': PropTypes.string.isRequired,
-  /** Adds accessible text to the DataList item */
-  'aria-label': PropTypes.string.isRequired,
   /** Additional props are spread to the container <div> */
   '': PropTypes.any
 };
@@ -50,8 +46,6 @@ class DataListAction extends React.Component {
       actions,
       className,
       id,
-      'aria-label': ariaLabel,
-      'aria-labelledby': ariaLabelledBy,
       ...props
     } = this.props;
 
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js b/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
index 3318ef4e81c..65d857365be 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataListToggle.js
@@ -12,12 +12,12 @@ const propTypes = {
   isExpanded: PropTypes.bool,
   /** Identify the DataList toggle number */
   id: PropTypes.string.isRequired,
-  /** Adds accessible text to the DataList toggle */
-  'aria-labelledby': PropTypes.string,
-  /** Adds accessible text to the DataList toggle */
-  'aria-label': PropTypes.string,
   /** Allows users of some screen readers to shift focus to the controlled element. Should be used when the controlled contents are not adjacent to the toggle that controls them. */
   'aria-controls': PropTypes.string,
+  /** Adds accessible text to the DataList toggle */
+  'aria-label': PropTypes.string,
+  /** Adds accessible text to the DataList toggle */
+  'aria-labelledby': PropTypes.string,
   /** Additional props are spread to the container <div> */
   '': PropTypes.any
 };
diff --git a/packages/patternfly-4/react-core/src/components/Page/PageHeader.js b/packages/patternfly-4/react-core/src/components/Page/PageHeader.js
index dad161b4b05..309e6d7d463 100644
--- a/packages/patternfly-4/react-core/src/components/Page/PageHeader.js
+++ b/packages/patternfly-4/react-core/src/components/Page/PageHeader.js
@@ -24,8 +24,8 @@ const propTypes = {
   onNavToggle: PropTypes.func,
   /** True if the side nav is shown  */
   isNavOpen: PropTypes.bool,
-  /** Callback function to handle the side nav toggle button */
-  'aria-label': PropTypes.string,
+  /** aria-label for the button */
+  'aria-label-button': PropTypes.string,
   /** Additional props are spread to the container <header> */
   '': PropTypes.any
 };
@@ -40,7 +40,7 @@ const defaultProps = {
   showNavToggle: false,
   isNavOpen: true,
   onNavToggle: () => undefined,
-  'aria-label': 'Global navigation'
+  'aria-label-button': 'Global navigation'
 };
 
 const PageHeader = ({
@@ -53,7 +53,7 @@ const PageHeader = ({
   isNavOpen,
   showNavToggle,
   onNavToggle,
-  'aria-label': ariaLabel,
+  'aria-label-button': ariaLabel,
   ...props
 }) => (
   <header role="banner" className={css(styles.pageHeader, className)} {...props}>
diff --git a/packages/patternfly-4/react-core/src/components/Select/Select.js b/packages/patternfly-4/react-core/src/components/Select/Select.js
index 3d8a0da1239..422f1b8b830 100644
--- a/packages/patternfly-4/react-core/src/components/Select/Select.js
+++ b/packages/patternfly-4/react-core/src/components/Select/Select.js
@@ -24,7 +24,7 @@ const propTypes = {
   placeholderText: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   /** Selected item */
   selections: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]),
-  /** Adds accessible text to Select */
+  /** Adds accessible text to all Select elements */
   'aria-label': PropTypes.string,
   /** Id of label for the Select aria-labelledby */
   'aria-labelledby': PropTypes.string,

From 10ec018a7c55f9f49c22d9e67fb6b0508f6ff2bd Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 18:31:29 -0400
Subject: [PATCH 10/11] update snapshots

---
 .../Alert/__snapshots__/Alert.test.js.snap    | 60 ++++++++++++-------
 .../__snapshots__/ChipGroup.test.js.snap      |  4 +-
 .../src/components/DataList/DataList.test.js  |  4 +-
 .../__snapshots__/DataList.test.js.snap       |  2 +
 .../Page/__snapshots__/Page.test.js.snap      |  8 +--
 .../__snapshots__/PageHeader.test.js.snap     |  2 +-
 6 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
index 22a0acba151..2704dfe582b 100644
--- a/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Alert/__snapshots__/Alert.test.js.snap
@@ -9,13 +9,14 @@ exports[`Alert - danger Action Close Button 1`] = `
       onClose={[MockFunction]}
     />
   }
+  aria-label=""
   className=""
   title=""
   variant="danger"
   variantLabel={null}
 >
   <div
-    aria-label="Danger Alert"
+    aria-label=""
     className="pf-c-alert pf-m-danger"
   >
     <AlertIcon
@@ -142,13 +143,14 @@ exports[`Alert - danger Action Link 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title=""
   variant="danger"
   variantLabel={null}
 >
   <div
-    aria-label="Danger Alert"
+    aria-label=""
     className="pf-c-alert pf-m-danger"
   >
     <AlertIcon
@@ -247,13 +249,14 @@ exports[`Alert - danger Action and Title 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title="Some title"
   variant="danger"
   variantLabel={null}
 >
   <div
-    aria-label="Danger Alert"
+    aria-label=""
     className="pf-c-alert pf-m-danger"
   >
     <AlertIcon
@@ -454,13 +457,14 @@ exports[`Alert - danger Custom aria label 1`] = `
 exports[`Alert - danger Description 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title=""
   variant="danger"
   variantLabel={null}
 >
   <div
-    aria-label="Danger Alert"
+    aria-label=""
     className="pf-c-alert pf-m-danger"
   >
     <AlertIcon
@@ -520,13 +524,14 @@ exports[`Alert - danger Description 1`] = `
 exports[`Alert - danger Title 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title="Some title"
   variant="danger"
   variantLabel={null}
 >
   <div
-    aria-label="Danger Alert"
+    aria-label=""
     className="pf-c-alert pf-m-danger"
   >
     <AlertIcon
@@ -593,13 +598,14 @@ exports[`Alert - info Action Close Button 1`] = `
       onClose={[MockFunction]}
     />
   }
+  aria-label=""
   className=""
   title=""
   variant="info"
   variantLabel={null}
 >
   <div
-    aria-label="Info Alert"
+    aria-label=""
     className="pf-c-alert pf-m-info"
   >
     <AlertIcon
@@ -726,13 +732,14 @@ exports[`Alert - info Action Link 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title=""
   variant="info"
   variantLabel={null}
 >
   <div
-    aria-label="Info Alert"
+    aria-label=""
     className="pf-c-alert pf-m-info"
   >
     <AlertIcon
@@ -831,13 +838,14 @@ exports[`Alert - info Action and Title 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title="Some title"
   variant="info"
   variantLabel={null}
 >
   <div
-    aria-label="Info Alert"
+    aria-label=""
     className="pf-c-alert pf-m-info"
   >
     <AlertIcon
@@ -1038,13 +1046,14 @@ exports[`Alert - info Custom aria label 1`] = `
 exports[`Alert - info Description 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title=""
   variant="info"
   variantLabel={null}
 >
   <div
-    aria-label="Info Alert"
+    aria-label=""
     className="pf-c-alert pf-m-info"
   >
     <AlertIcon
@@ -1104,13 +1113,14 @@ exports[`Alert - info Description 1`] = `
 exports[`Alert - info Title 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title="Some title"
   variant="info"
   variantLabel={null}
 >
   <div
-    aria-label="Info Alert"
+    aria-label=""
     className="pf-c-alert pf-m-info"
   >
     <AlertIcon
@@ -1177,13 +1187,14 @@ exports[`Alert - success Action Close Button 1`] = `
       onClose={[MockFunction]}
     />
   }
+  aria-label=""
   className=""
   title=""
   variant="success"
   variantLabel={null}
 >
   <div
-    aria-label="Success Alert"
+    aria-label=""
     className="pf-c-alert pf-m-success"
   >
     <AlertIcon
@@ -1310,13 +1321,14 @@ exports[`Alert - success Action Link 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title=""
   variant="success"
   variantLabel={null}
 >
   <div
-    aria-label="Success Alert"
+    aria-label=""
     className="pf-c-alert pf-m-success"
   >
     <AlertIcon
@@ -1415,13 +1427,14 @@ exports[`Alert - success Action and Title 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title="Some title"
   variant="success"
   variantLabel={null}
 >
   <div
-    aria-label="Success Alert"
+    aria-label=""
     className="pf-c-alert pf-m-success"
   >
     <AlertIcon
@@ -1622,13 +1635,14 @@ exports[`Alert - success Custom aria label 1`] = `
 exports[`Alert - success Description 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title=""
   variant="success"
   variantLabel={null}
 >
   <div
-    aria-label="Success Alert"
+    aria-label=""
     className="pf-c-alert pf-m-success"
   >
     <AlertIcon
@@ -1688,13 +1702,14 @@ exports[`Alert - success Description 1`] = `
 exports[`Alert - success Title 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title="Some title"
   variant="success"
   variantLabel={null}
 >
   <div
-    aria-label="Success Alert"
+    aria-label=""
     className="pf-c-alert pf-m-success"
   >
     <AlertIcon
@@ -1761,13 +1776,14 @@ exports[`Alert - warning Action Close Button 1`] = `
       onClose={[MockFunction]}
     />
   }
+  aria-label=""
   className=""
   title=""
   variant="warning"
   variantLabel={null}
 >
   <div
-    aria-label="Warning Alert"
+    aria-label=""
     className="pf-c-alert pf-m-warning"
   >
     <AlertIcon
@@ -1894,13 +1910,14 @@ exports[`Alert - warning Action Link 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title=""
   variant="warning"
   variantLabel={null}
 >
   <div
-    aria-label="Warning Alert"
+    aria-label=""
     className="pf-c-alert pf-m-warning"
   >
     <AlertIcon
@@ -1999,13 +2016,14 @@ exports[`Alert - warning Action and Title 1`] = `
       test
     </AlertActionLink>
   }
+  aria-label=""
   className=""
   title="Some title"
   variant="warning"
   variantLabel={null}
 >
   <div
-    aria-label="Warning Alert"
+    aria-label=""
     className="pf-c-alert pf-m-warning"
   >
     <AlertIcon
@@ -2206,13 +2224,14 @@ exports[`Alert - warning Custom aria label 1`] = `
 exports[`Alert - warning Description 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title=""
   variant="warning"
   variantLabel={null}
 >
   <div
-    aria-label="Warning Alert"
+    aria-label=""
     className="pf-c-alert pf-m-warning"
   >
     <AlertIcon
@@ -2272,13 +2291,14 @@ exports[`Alert - warning Description 1`] = `
 exports[`Alert - warning Title 1`] = `
 <Alert
   action={null}
+  aria-label=""
   className=""
   title="Some title"
   variant="warning"
   variantLabel={null}
 >
   <div
-    aria-label="Warning Alert"
+    aria-label=""
     className="pf-c-alert pf-m-warning"
   >
     <AlertIcon
diff --git a/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap b/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
index bf222b0c0f8..a4c78a09250 100644
--- a/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/ChipGroup/__snapshots__/ChipGroup.test.js.snap
@@ -13,7 +13,7 @@ exports[`ChipGroup chip group default 1`] = `
     withToolbar={false}
   >
     <Chip
-      aria-label="close"
+      aria-label-button="close"
       className=""
       isOverflowChip={false}
       onClick={[Function]}
@@ -39,7 +39,7 @@ exports[`ChipGroup chip group with toolbar 1`] = `
     className=""
   >
     <Chip
-      aria-label="close"
+      aria-label-button="close"
       className=""
       isOverflowChip={false}
       onClick={[Function]}
diff --git a/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js b/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
index 0801a620393..06bbbd83795 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
+++ b/packages/patternfly-4/react-core/src/components/DataList/DataList.test.js
@@ -73,7 +73,7 @@ describe('DataList', () => {
     );
 
     expect(view.find(Button).props()['aria-label']).toBe('Toggle details for');
-    expect(view.find(Button).props()['aria-labelledby']).toBe(null);
+    expect(view.find(Button).props()['aria-labelledby']).toBe("ex-toggle2 ex-item2");
     expect(view.find(Button).props()['aria-expanded']).toBe(false);
     expect(view.find(Button).props().id).toBe('ex-toggle2');
     expect(view.find(Button).props().id).toBe('ex-toggle2');
@@ -105,7 +105,7 @@ describe('DataList', () => {
 
   test('DataListAction button', () => {
     const view = shallow(
-      <DataListAction aria-label="Actions" aria-labelledby="ex-action" id="ex-action">
+      <DataListAction aria-label="Actions" actions={[]} aria-labelledby="ex-action" id="ex-action">
         <Button id="delete-item-1">Delete</Button>
       </DataListAction>
     );
diff --git a/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap b/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
index c5fbc4809b0..19b7893f05a 100644
--- a/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/DataList/__snapshots__/DataList.test.js.snap
@@ -37,6 +37,8 @@ exports[`DataList DataListAction button 1`] = `
 
 exports[`DataList DataListAction dropdown 1`] = `
 <div
+  aria-label="Actions"
+  aria-labelledby="ex-action"
   className="pf-c-data-list__action"
 >
   <Dropdown
diff --git a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
index 761a0dd21a6..9b6234285a4 100644
--- a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/Page.test.js.snap
@@ -6,7 +6,7 @@ exports[`Check page horizontal layout example against snapshot 1`] = `
   className="my-page-class"
   header={
     <PageHeader
-      aria-label="Global navigation"
+      aria-label-button="Global navigation"
       avatar=" | Avatar"
       className=""
       isNavOpen={true}
@@ -38,7 +38,7 @@ exports[`Check page horizontal layout example against snapshot 1`] = `
     layout="horizontal"
   >
     <PageHeader
-      aria-label="Global navigation"
+      aria-label-button="Global navigation"
       avatar=" | Avatar"
       className=""
       isNavOpen={true}
@@ -137,7 +137,7 @@ exports[`Check page vertical layout example against snapshot 1`] = `
   className="my-page-class"
   header={
     <PageHeader
-      aria-label="Global navigation"
+      aria-label-button="Global navigation"
       avatar=" | Avatar"
       className=""
       isNavOpen={true}
@@ -166,7 +166,7 @@ exports[`Check page vertical layout example against snapshot 1`] = `
     id="PageId"
   >
     <PageHeader
-      aria-label="Global navigation"
+      aria-label-button="Global navigation"
       avatar=" | Avatar"
       className=""
       isNavOpen={true}
diff --git a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/PageHeader.test.js.snap b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/PageHeader.test.js.snap
index 628d72e87aa..8d330e4b60b 100644
--- a/packages/patternfly-4/react-core/src/components/Page/__snapshots__/PageHeader.test.js.snap
+++ b/packages/patternfly-4/react-core/src/components/Page/__snapshots__/PageHeader.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Check page vertical layout example against snapshot 1`] = `
 <PageHeader
-  aria-label="Global navigation"
+  aria-label-button="Global navigation"
   avatar=" | Avatar"
   className=""
   isNavOpen={true}

From c2ea61af941ce90fb22fd0f1866e585fc9aecd9a Mon Sep 17 00:00:00 2001
From: redallen <zallen@redhat.com>
Date: Tue, 9 Apr 2019 18:39:56 -0400
Subject: [PATCH 11/11] fix tabs passing aria-label to <nav>

---
 .../react-core/src/components/Tabs/Tabs.js         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
index c1d27a04cc2..ebdb42bcf26 100644
--- a/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
+++ b/packages/patternfly-4/react-core/src/components/Tabs/Tabs.js
@@ -80,7 +80,12 @@ const TabsWithNav = ({
       highlightRightScrollButton && styles.modifiers.endCurrent,
       className)}
   >
-    <InternalTabs id={id} activeKey={activeKey} {...props} />
+    <InternalTabs
+      id={id}
+      activeKey={activeKey}
+      aria-label-left-scroll={ariaLabelLeftScroll}
+      aria-label-right-scroll={ariaLabelRightScroll}
+      {...props} />
     <InternalTabContainer id={id} activeKey={activeKey} {...props} />
   </nav>
 );
@@ -109,7 +114,12 @@ const TabsWithDiv = ({
       highlightRightScrollButton && styles.modifiers.endCurrent,
       className)}
   >
-    <InternalTabs id={id} activeKey={activeKey} {...props} />
+    <InternalTabs
+      id={id}
+      activeKey={activeKey}
+      aria-label-left-scroll={ariaLabelLeftScroll}
+      aria-label-right-scroll={ariaLabelRightScroll}
+      {...props} />
     <InternalTabContainer id={id} activeKey={activeKey} {...props} />
   </div>
 );