diff --git a/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx b/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
index 069f9b99e6..044dc9de27 100644
--- a/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
+++ b/packages/react/src/collapsible/root/CollapsibleRoot.test.tsx
@@ -32,6 +32,21 @@ describe('', () => {
});
});
+ describe('collapsible status', () => {
+ it('disabled status', async () => {
+ const { getByRole } = await render(
+
+
+
+ ,
+ );
+
+ 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
index 99d5619949..e50912fa24 100644
--- 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,
) {
- 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,