Skip to content

fix(Accordion): leaking stale summaryButtons refs on panel removal #3193

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

Open
zigzagdev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(Accordion): leaking stale summaryButtons refs on panel removal #3193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fdadc9
Fix Accordion leaking stale summaryButtons refs on panel removal
zigzagdev Aug 29, 2026
78421b1
Add regression test for stale Accordion summaryButtons refs
zigzagdev Aug 29, 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
27 changes: 27 additions & 0 deletions components/accordion/__tests__/accordion.browser-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,33 @@ describe('Accordion', function describeFunction() {
lastAccordionButton.getDOMNode() === document.activeElement
).to.equal(true);
});

it('focuses the correct remaining button after a panel is removed', () => {
wrapper = mount(<AccordionExample />, { attachTo: mountNode });
const exampleInstance = wrapper.find(AccordionExample).instance();

exampleInstance.setState((state) => ({
items: state.items.filter((item) => item.id !== '2'),
}));
wrapper.update();

const accordionButtons = wrapper.find(
'button.slds-accordion__summary-action'
);
expect(accordionButtons).to.have.lengthOf(2);

expect(() =>
accordionButtons.at(0).simulate('keyDown', {
key: 'ArrowDown',
keyCode: 40,
which: 40,
})
).to.not.throw();

expect(
accordionButtons.at(1).getDOMNode() === document.activeElement
).to.equal(true);
});
});

describe('Open panel', () => {
Expand Down
19 changes: 11 additions & 8 deletions components/accordion/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class Accordion extends Component {
componentDidUpdate(prevProps, prevState) {
if (
this.state.currButtonIndex !== null &&
this.state.currButtonIndex !== prevState.currButtonIndex
this.state.currButtonIndex !== prevState.currButtonIndex &&
this.summaryButtons[this.state.currButtonIndex]
) {
this.summaryButtons[this.state.currButtonIndex].focus();
}
Expand All @@ -69,7 +70,7 @@ class Accordion extends Component {
let buttonIndex = this.state.currButtonIndex;
if (buttonIndex === null) {
buttonIndex = this.summaryButtons.findIndex(
(el) => el.id === e.target.id
(el) => el && el.id === e.target.id
);
}

Expand All @@ -94,11 +95,13 @@ class Accordion extends Component {
}
}

addSummaryButton(button) {
const btnInArr = this.summaryButtons.find((el) => button === el);
if (button !== null && btnInArr === undefined) {
addSummaryButton(index, button) {
if (button === null) {
// eslint-disable-next-line fp/no-delete
delete this.summaryButtons[index];
} else {
// eslint-disable-next-line fp/no-mutating-methods
this.summaryButtons.push(button);
this.summaryButtons[index] = button;
}
}

Expand All @@ -108,9 +111,9 @@ class Accordion extends Component {
name={this.props.id || this.generatedId}
className={classNames('slds-accordion', this.props.className)}
>
{React.Children.map(this.props.children, (child) =>
{React.Children.map(this.props.children, (child, index) =>
React.cloneElement(child, {
refs: { summaryButton: this.addSummaryButton.bind(this) },
refs: { summaryButton: this.addSummaryButton.bind(this, index) },
onClickSummary: this.onClickSummary.bind(this),
onKeyDownSummary: this.onKeyDownSummary.bind(this),
})
Expand Down