fix Button disabled prop priority

mui · Feb 9, 2024 · bd1a2a1 · bd1a2a1
1 parent 5ae79e6
commit bd1a2a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/mui-joy/src/Button/Button.tsx b/packages/mui-joy/src/Button/Button.tsx
@@ -219,7 +219,7 @@ const Button = React.forwardRef(function Button(inProps, ref) {
   const size = inProps.size || buttonGroup.size || sizeProp;
   const color = inProps.color || buttonGroup.color || colorProp;
   const disabled =
-    (inProps.disabled || inProps.loading) ?? (buttonGroup.disabled || disabledProp || loading);
+    (inProps.loading || inProps.disabled) ?? (buttonGroup.disabled || disabledProp || loading);
 
   const buttonRef = React.useRef<HTMLElement>(null);
   const handleRef = useForkRef(buttonRef, ref);

diff --git a/packages/mui-joy/src/ButtonGroup/ButtonGroup.test.tsx b/packages/mui-joy/src/ButtonGroup/ButtonGroup.test.tsx
@@ -194,4 +194,15 @@ describe('<ButtonGroup />', () => {
     expect(getAllByRole('button')[0]).to.have.property('disabled', true);
     expect(getAllByRole('button')[1]).to.have.property('disabled', true);
   });
+
+  it('pass disabled to buttons inless it is overriden', () => {
+    const { getAllByRole } = render(
+      <ButtonGroup disabled>
+        <Button disabled={false} />
+        <IconButton disabled={false} />
+      </ButtonGroup>,
+    );
+    expect(getAllByRole('button')[0]).not.to.have.property('disabled', true);
+    expect(getAllByRole('button')[1]).not.to.have.property('disabled', true);
+  });
 });