Skip to content

[accordion] Fix trigger behavior bugs #4833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atomiks merged 3 commits into from
May 27, 2026
Merged

[accordion] Fix trigger behavior bugs #4833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1462a7
[accordion] Fix trigger behavior bugs
atomiks May 18, 2026
3e874f0
Merge branch 'master' into codex/fix-accordion-behavior
atomiks May 26, 2026
905a09d
Merge branch 'master' into codex/fix-accordion-behavior
atomiks May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/react/src/accordion/item/AccordionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const AccordionItem = React.forwardRef(function AccordionItem(
return;
}

handleValueChange(value, nextOpen);
handleValueChange(value, nextOpen, eventDetails);
},
);

Expand Down Expand Up @@ -117,16 +117,16 @@ export const AccordionItem = React.forwardRef(function AccordionItem(
);

const defaultTriggerId = useBaseUiId();
const [triggerId, setTriggerId] = React.useState<string | undefined>(defaultTriggerId);
const [triggerId, setTriggerId] = React.useState<string | undefined>();

const accordionItemContext: AccordionItemContext = React.useMemo(
() => ({
open: isOpen,
state,
setTriggerId,
triggerId,
triggerId: triggerId ?? defaultTriggerId,
}),
[isOpen, state, setTriggerId, triggerId],
[defaultTriggerId, isOpen, state, setTriggerId, triggerId],
);

const element = useRenderElement('div', componentProps, {
Expand Down
39 changes: 39 additions & 0 deletions packages/react/src/accordion/panel/AccordionPanel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,45 @@ describe('<Accordion.Panel />', () => {
});
});

it('passes root keepMounted to closed panels', async () => {
await render(
<Accordion.Root keepMounted>
<Accordion.Item value={0}>
<Accordion.Header>
<Accordion.Trigger>Trigger</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel>{PANEL_CONTENT}</Accordion.Panel>
</Accordion.Item>
</Accordion.Root>,
);

expect(screen.getByText(PANEL_CONTENT)).toHaveAttribute('hidden');
});

it('passes root hiddenUntilFound to closed panels and allows panel overrides', async () => {
await render(
<Accordion.Root hiddenUntilFound keepMounted>
<Accordion.Item value={0}>
<Accordion.Header>
<Accordion.Trigger>Trigger 1</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel>{PANEL_CONTENT}</Accordion.Panel>
</Accordion.Item>
<Accordion.Item value={1}>
<Accordion.Header>
<Accordion.Trigger>Trigger 2</Accordion.Trigger>
</Accordion.Header>
<Accordion.Panel hiddenUntilFound={false} keepMounted={false}>
Overridden panel
</Accordion.Panel>
</Accordion.Item>
</Accordion.Root>,
);

expect(screen.getByText(PANEL_CONTENT).getAttribute('hidden')).toBe('until-found');
expect(screen.queryByText('Overridden panel')).toBe(null);
});

describe.skipIf(isJSDOM)('CSS transitions', () => {
it('keeps the closing panel visible until its exit transition completes when switching items', async () => {
const { user } = await render(
Expand Down
Loading
Loading