From 55a7d08dec8253982fbcd3411db4922cc4857969 Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Sun, 15 Mar 2026 19:09:31 +0800
Subject: [PATCH 1/6] Add test

---
 .../src/ButtonBase/ButtonBase.test.js         | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index 020dc9a3106815..fb32be76441d61 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -1182,6 +1182,37 @@ describe('<ButtonBase />', () => {
         expect(onClickSpy.callCount).to.equal(0);
       });
 
+      it('should preserve native button keyboard behavior when a custom component renders a native button', async () => {
+        const onClickSpy = spy();
+        const onKeyDownSpy = spy();
+
+        /** @type {React.ForwardRefExoticComponent<React.ButtonHTMLAttributes<HTMLButtonElement>>} */
+        const MyButton = React.forwardRef((props, ref) => <button ref={ref} {...props} />);
+
+        const { user } = render(
+          <ButtonBase component={MyButton} onClick={onClickSpy} onKeyDown={onKeyDownSpy}>
+            Hello
+          </ButtonBase>,
+        );
+
+        await user.tab();
+
+        await user.keyboard('{Enter}');
+
+        expect(onKeyDownSpy.callCount).to.equal(1);
+        expect(onClickSpy.callCount).to.equal(1);
+        expect(onKeyDownSpy.firstCall.args[0]).to.have.property('defaultPrevented', false);
+
+        onClickSpy.resetHistory();
+        onKeyDownSpy.resetHistory();
+
+        await user.keyboard(' ');
+
+        expect(onKeyDownSpy.callCount).to.equal(1);
+        expect(onClickSpy.callCount).to.equal(1);
+        expect(onKeyDownSpy.firstCall.args[0]).to.have.property('defaultPrevented', false);
+      });
+
       it('prevents default on Enter with an anchor and empty href', async () => {
         const onClickSpy = spy();
         const onKeyDownSpy = spy();

From 1ddea1388873b8169e903f2ce034137325b79e3b Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Sun, 15 Mar 2026 16:02:40 +0800
Subject: [PATCH 2/6] Fix native button check

---
 packages/mui-material/src/ButtonBase/ButtonBase.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js
index bf5f9c0c3a9a91..a198f2e74df9db 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.js
@@ -192,7 +192,16 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
 
   const isNonNativeButton = () => {
     const button = buttonRef.current;
-    return component && component !== 'button' && !(button.tagName === 'A' && button.href);
+
+    if (!button) {
+      return component && component !== 'button';
+    }
+
+    if (button.tagName === 'BUTTON') {
+      return false;
+    }
+
+    return !(button.tagName === 'A' && button.href);
   };
 
   const handleKeyDown = useEventCallback((event) => {

From 9bfedcd9943c740bd1920ad5fbe238f350a7f4e3 Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Sun, 15 Mar 2026 14:09:32 +0800
Subject: [PATCH 3/6] Fix non-native ButtonBase disabled state

---
 packages/mui-material/src/ButtonBase/ButtonBase.js | 13 ++++++++++++-
 .../mui-material/src/ButtonBase/ButtonBase.test.js | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js
index a198f2e74df9db..6cd0881990c0c3 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.js
@@ -255,6 +255,17 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
     }
   });
 
+  const handleClick = useEventCallback((event) => {
+    if (disabled) {
+      event.preventDefault();
+      return;
+    }
+
+    if (onClick) {
+      onClick(event);
+    }
+  });
+
   let ComponentProp = component;
 
   if (ComponentProp === 'button' && (other.href || other.to)) {
@@ -299,7 +310,7 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
       className={clsx(classes.root, className)}
       ownerState={ownerState}
       onBlur={handleBlur}
-      onClick={onClick}
+      onClick={handleClick}
       onContextMenu={handleContextMenu}
       onFocus={handleFocus}
       onKeyDown={handleKeyDown}
diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index fb32be76441d61..c1afb6d93b14d1 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -824,6 +824,20 @@ describe('<ButtonBase />', () => {
       setProps({ disabled: false });
       expect(button).not.to.have.attribute('aria-disabled');
     });
+
+    it('should not call onClick on disabled non-native buttons', () => {
+      const onClickSpy = spy();
+
+      render(
+        <ButtonBase component="span" disabled onClick={onClickSpy}>
+          Hello
+        </ButtonBase>,
+      );
+
+      fireEvent.click(screen.getByRole('button'));
+
+      expect(onClickSpy.callCount).to.equal(0);
+    });
   });
 
   describe('prop: component', () => {

From 7cac119eb0cae8cfb389b95f6e2e4c563dcfc4a8 Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Mon, 16 Mar 2026 15:07:29 +0800
Subject: [PATCH 4/6] Fix keyUp when disabled

---
 .../mui-material/src/ButtonBase/ButtonBase.js |  3 ++-
 .../src/ButtonBase/ButtonBase.test.js         | 24 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js
index 6cd0881990c0c3..4e146ca0083e01 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.js
@@ -249,7 +249,8 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
       event.target === event.currentTarget &&
       isNonNativeButton() &&
       event.key === ' ' &&
-      !event.defaultPrevented
+      !event.defaultPrevented &&
+      !disabled
     ) {
       event.currentTarget.click();
     }
diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index c1afb6d93b14d1..0bc5359aaf69e6 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -838,6 +838,30 @@ describe('<ButtonBase />', () => {
 
       expect(onClickSpy.callCount).to.equal(0);
     });
+
+    it('should not propagate click events when Space is released on a disabled non-native button', async () => {
+      const parentClickSpy = spy();
+      const buttonClickSpy = spy();
+
+      render(
+        <div onClick={parentClickSpy}>
+          <ButtonBase component="span" disabled onClick={buttonClickSpy}>
+            Hello
+          </ButtonBase>
+        </div>,
+      );
+
+      const button = screen.getByRole('button');
+
+      await act(async () => {
+        button.focus();
+      });
+
+      fireEvent.keyUp(button, { key: ' ' });
+
+      expect(buttonClickSpy.callCount).to.equal(0);
+      expect(parentClickSpy.callCount).to.equal(0);
+    });
   });
 
   describe('prop: component', () => {

From 40f02b87a98814fb6171b0e3953f0e5b0679d5e0 Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Mon, 16 Mar 2026 17:47:00 +0800
Subject: [PATCH 5/6] Remove JS disabled click guard

---
 packages/mui-material/src/ButtonBase/ButtonBase.js | 13 +------------
 .../mui-material/src/ButtonBase/ButtonBase.test.js | 14 --------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.js b/packages/mui-material/src/ButtonBase/ButtonBase.js
index 4e146ca0083e01..39fd531b63daf5 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.js
@@ -256,17 +256,6 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
     }
   });
 
-  const handleClick = useEventCallback((event) => {
-    if (disabled) {
-      event.preventDefault();
-      return;
-    }
-
-    if (onClick) {
-      onClick(event);
-    }
-  });
-
   let ComponentProp = component;
 
   if (ComponentProp === 'button' && (other.href || other.to)) {
@@ -311,7 +300,7 @@ const ButtonBase = React.forwardRef(function ButtonBase(inProps, ref) {
       className={clsx(classes.root, className)}
       ownerState={ownerState}
       onBlur={handleBlur}
-      onClick={handleClick}
+      onClick={onClick}
       onContextMenu={handleContextMenu}
       onFocus={handleFocus}
       onKeyDown={handleKeyDown}
diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index 0bc5359aaf69e6..70d8f06d0c3d04 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -825,20 +825,6 @@ describe('<ButtonBase />', () => {
       expect(button).not.to.have.attribute('aria-disabled');
     });
 
-    it('should not call onClick on disabled non-native buttons', () => {
-      const onClickSpy = spy();
-
-      render(
-        <ButtonBase component="span" disabled onClick={onClickSpy}>
-          Hello
-        </ButtonBase>,
-      );
-
-      fireEvent.click(screen.getByRole('button'));
-
-      expect(onClickSpy.callCount).to.equal(0);
-    });
-
     it('should not propagate click events when Space is released on a disabled non-native button', async () => {
       const parentClickSpy = spy();
       const buttonClickSpy = spy();

From 02ef8d6ad0f89a572aa2a3f1d1f50aab750fe3be Mon Sep 17 00:00:00 2001
From: Albert Yu <albert@albertyu.co>
Date: Mon, 16 Mar 2026 18:58:10 +0800
Subject: [PATCH 6/6] Update test

---
 packages/mui-material/src/ButtonBase/ButtonBase.test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/mui-material/src/ButtonBase/ButtonBase.test.js b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
index 70d8f06d0c3d04..c4e6322afcd57e 100644
--- a/packages/mui-material/src/ButtonBase/ButtonBase.test.js
+++ b/packages/mui-material/src/ButtonBase/ButtonBase.test.js
@@ -829,7 +829,7 @@ describe('<ButtonBase />', () => {
       const parentClickSpy = spy();
       const buttonClickSpy = spy();
 
-      render(
+      const { user } = render(
         <div onClick={parentClickSpy}>
           <ButtonBase component="span" disabled onClick={buttonClickSpy}>
             Hello
@@ -839,11 +839,13 @@ describe('<ButtonBase />', () => {
 
       const button = screen.getByRole('button');
 
+      // We don't use `user.tab()` because normal tab focus won't land on a disabled
+      // ButtonBase, only programmatic focus can happen
       await act(async () => {
         button.focus();
       });
 
-      fireEvent.keyUp(button, { key: ' ' });
+      await user.keyboard(' ');
 
       expect(buttonClickSpy.callCount).to.equal(0);
       expect(parentClickSpy.callCount).to.equal(0);