[Collapsible] Update props destructuring to fix Trigger disabled state (

mui#1469) Co-authored-by: Albert Yu <[email protected]>
atomiks · Feb 28, 2025 · 2cefe46 · 2cefe46
1 parent 38cef89
commit 2cefe46
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx b/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
@@ -32,6 +32,21 @@ describe('<Collapsible.Root />', () => {
     });
   });
 
+  describe('collapsible status', () => {
+    it('disabled status', async () => {
+      const { getByRole } = await render(
+        <Collapsible.Root disabled>
+          <Collapsible.Trigger />
+          <Collapsible.Panel data-testid="panel" />
+        </Collapsible.Root>,
+      );
+
+      const trigger = getByRole('button');
+
+      expect(trigger).to.have.attribute('data-disabled');
+    });
+  });
+
   describe('open state', () => {
     it('controlled mode', async () => {
       const { queryByText, getByRole, setProps } = await render(

diff --git a/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx b/packages/react/src/collapsible/trigger/CollapsibleTrigger.tsx
@@ -18,9 +18,9 @@ const CollapsibleTrigger = React.forwardRef(function CollapsibleTrigger(
   props: CollapsibleTrigger.Props,
   forwardedRef: React.ForwardedRef<HTMLButtonElement>,
 ) {
-  const { className, disabled = false, id, render, ...otherProps } = props;
+  const { panelId, open, setOpen, state, disabled: contextDisabled } = useCollapsibleRootContext();
 
-  const { panelId, open, setOpen, state } = useCollapsibleRootContext();
+  const { className, disabled = contextDisabled, id, render, ...otherProps } = props;
 
   const { getRootProps } = useCollapsibleTrigger({
     disabled,