fix(Button): reverted aria-disabled logic

Author: Eric Olkowski

packages/react-core/src/components/AboutModal/__tests__/__snapshots__/AboutModalBoxCloseButton.test.tsx.snap

@@ -6,6 +6,7 @@ exports[`AboutModalBoxCloseButton Test 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Close Dialog"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-1"
@@ -41,6 +42,7 @@ exports[`AboutModalBoxCloseButton Test close button aria label 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Klose Daylok"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-3"
@@ -76,6 +78,7 @@ exports[`AboutModalBoxCloseButton Test onclose 1`] = `
     class="pf-v6-c-about-modal-box__close"
   >
     <button
+      aria-disabled="false"
       aria-label="Close Dialog"
       class="pf-v6-c-button pf-m-plain"
       data-ouia-component-id="OUIA-Generated-Button-plain-2"

packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionCloseButton.test.tsx.snap

@@ -3,6 +3,7 @@
 exports[`AlertActionCloseButton should match snapshot 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-label="Close some label alert: test title"
     class="pf-v6-c-button pf-m-plain"
     data-ouia-component-id="OUIA-Generated-Button-plain-1"

packages/react-core/src/components/Alert/__tests__/Generated/__snapshots__/AlertActionLink.test.tsx.snap

@@ -3,6 +3,7 @@
 exports[`AlertActionLink should match snapshot (auto-generated) 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     class="pf-v6-c-button pf-m-link pf-m-inline ''"
     data-ouia-component-id="OUIA-Generated-Button-link-1"
     data-ouia-component-type="PF6/Button"

packages/react-core/src/components/Button/Button.tsx

@@ -164,14 +164,12 @@ const ButtonBase: React.FunctionComponent<ButtonProps> = ({
     </span>
   );
   const _children = children && <span className={css('pf-v6-c-button__text')}>{children}</span>;
-  // We only want to render the aria-disabled attribute when true, similar to the disabled attribute natively.
-  const shouldRenderAriaDisabled = isAriaDisabled || (!isButtonElement && isDisabled);
 
   return (
     <Component
       {...props}
       {...(isAriaDisabled ? preventedEvents : null)}
-      {...(shouldRenderAriaDisabled && { 'aria-disabled': true })}
+      aria-disabled={isAriaDisabled || isDisabled}
       aria-label={ariaLabel}
       className={css(
         styles.button,

packages/react-core/src/components/Button/__tests__/Button.test.tsx

@@ -73,22 +73,33 @@ test('Renders with class pf-m-disabled when isDisabled = true and component is n
   expect(screen.getByText('Disabled Anchor Button').parentElement).toHaveClass('pf-m-disabled');
 });
 
-test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isAriaDisabled is not passed by default`, () => {
+// Re-enable as part of https://github.com/patternfly/patternfly-react/issues/11618
+test.skip(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isAriaDisabled is not passed by default`, () => {
   render(<Button>Button</Button>);
 
   const button = screen.getByRole('button');
   expect(button).not.toHaveAttribute('aria-disabled');
   expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
 });
 
-test(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isDisabled is true, but isAriaDisabled is not passed`, () => {
+// Re-enable as part of https://github.com/patternfly/patternfly-react/issues/11618
+test.skip(`aria-disabled and class ${styles.modifiers.ariaDisabled} are not rendered when isDisabled is true, but isAriaDisabled is not passed`, () => {
   render(<Button isDisabled>Disabled Button</Button>);
 
   const button = screen.getByRole('button');
   expect(button).not.toHaveAttribute('aria-disabled');
   expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
 });
 
+// Remove as part of https://github.com/patternfly/patternfly-react/issues/11618
+test(`Renders with aria-disabled of true and without class ${styles.modifiers.ariaDisabled} when isDisabled is true`, () => {
+  render(<Button isDisabled>Disabled Button</Button>);
+
+  const button = screen.getByRole('button');
+  expect(button).toHaveAttribute('aria-disabled', 'true');
+  expect(button).not.toHaveClass(styles.modifiers.ariaDisabled);
+});
+
 test(`Renders with class ${styles.modifiers.ariaDisabled} and aria-disabled attribute when isAriaDisabled = true`, () => {
   render(<Button isAriaDisabled>Disabled yet focusable button</Button>);
   const button = screen.getByRole('button');

packages/react-core/src/components/Button/__tests__/__snapshots__/Button.test.tsx.snap

@@ -3,9 +3,10 @@
 exports[`Renders basic button 1`] = `
 <DocumentFragment>
   <button
+    aria-disabled="false"
     aria-label="basic button"
     class="pf-v6-c-button pf-m-primary"
-    data-ouia-component-id="OUIA-Generated-Button-primary-31"
+    data-ouia-component-id="OUIA-Generated-Button-primary-30"
     data-ouia-component-type="PF6/Button"
     data-ouia-safe="true"
     type="button"

packages/react-core/src/components/Card/__tests__/__snapshots__/CardHeader.test.tsx.snap

@@ -21,6 +21,7 @@ exports[`CardHeader onExpand adds the toggle button 1`] = `
       class="pf-v6-c-card__header-toggle"
     >
       <button
+        aria-disabled="false"
         class="pf-v6-c-button pf-m-plain"
         data-ouia-component-id="OUIA-Generated-Button-plain-1"
         data-ouia-component-type="PF6/Button"

packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyButton.test.tsx.snap

@@ -28,6 +28,7 @@ exports[`Matches snapshot 1`] = `
       onTooltipHidden clicker
     </a>
     <button
+      aria-disabled="false"
       aria-label="Copyable input"
       aria-labelledby="button-id text-id"
       class="pf-v6-c-button pf-m-control"

packages/react-core/src/components/ClipboardCopy/__tests__/__snapshots__/ClipboardCopyToggle.test.tsx.snap

@@ -4,6 +4,7 @@ exports[`Matches snapshot 1`] = `
 <DocumentFragment>
   <button
     aria-controls="content-id"
+    aria-disabled="false"
     aria-expanded="false"
     aria-labelledby="main-id text-id"
     class="pf-v6-c-button pf-m-control"

packages/react-core/src/components/DataList/__tests__/Generated/__snapshots__/DataListToggle.test.tsx.snap

@@ -11,6 +11,7 @@ exports[`DataListToggle should match snapshot (auto-generated) 1`] = `
     >
       <button
         aria-controls="''"
+        aria-disabled="false"
         aria-expanded="false"
         aria-label="'Details'"
         class="pf-v6-c-button pf-m-plain"