Skip to content

[DOM] Clean up Fragment listeners on signal abort #37457

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
eps1lon merged 4 commits into from
Sep 1, 2026
Merged

[DOM] Clean up Fragment listeners on signal abort #37457

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cac9e3f
add tests
chirokas Aug 30, 2026
e8d0b94
[DOM] Clean up Fragment listeners on signal abort
chirokas Aug 30, 2026
1cd230c
Use `.bind` instead of closures for `onAbort` and `cleanup`
chirokas Aug 31, 2026
2ff47b7
Use strict null checks
chirokas Aug 31, 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
Next Next commit
add tests
  • Loading branch information
@chirokas
chirokas committed Sep 1, 2026
commit cac9e3f332491505b527b7be70968d720aa08c51
116 changes: 116 additions & 0 deletions packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,122 @@ describe('FragmentRefs', () => {
expect(logs).toEqual([]);
});

// @gate enableFragmentRefs
it('should remove the listener when the signal is aborted before registration', async () => {
const fragmentRef = React.createRef();
const childRef = React.createRef();
const root = ReactDOMClient.createRoot(container);
let logs = [];

function registeredListener() {
logs.push('registered');
}

await act(() => {
root.render(
<Fragment ref={fragmentRef}>
<div ref={childRef}>child</div>
</Fragment>,
);
});

const signal = AbortSignal.abort();
fragmentRef.current.addEventListener('click', registeredListener, {
signal,
});
childRef.current.click();
expect(logs).toEqual([]);

// The event listener can be re-added
fragmentRef.current.addEventListener('click', registeredListener);
logs = [];
childRef.current.click();
expect(logs).toEqual(['registered']);
});

// @gate enableFragmentRefs
it('should remove the listener when the signal is aborted after registration', async () => {
const fragmentRef = React.createRef();
const childRef = React.createRef();
const root = ReactDOMClient.createRoot(container);
let logs = [];

function registeredListener() {
logs.push('registered');
}

await act(() => {
root.render(
<Fragment ref={fragmentRef}>
<div ref={childRef}>child</div>
</Fragment>,
);
});

const controller = new AbortController();
fragmentRef.current.addEventListener('click', registeredListener, {
signal: controller.signal,
});
childRef.current.click();
expect(logs).toEqual(['registered']);

logs = [];
controller.abort();
childRef.current.click();
expect(logs).toEqual([]);

// The event listener can be re-added
fragmentRef.current.addEventListener('click', registeredListener);
logs = [];
childRef.current.click();
expect(logs).toEqual(['registered']);
});

// @gate enableFragmentRefs
it('should NOT remove the new subscription when the signal for the old subscription is aborted', async () => {
const fragmentRef = React.createRef();
const childRef = React.createRef();
const root = ReactDOMClient.createRoot(container);
let logs = [];

function registeredListener() {
logs.push('registered');
}

await act(() => {
root.render(
<Fragment ref={fragmentRef}>
<div ref={childRef}>child</div>
</Fragment>,
);
});

const controller = new AbortController();
fragmentRef.current.addEventListener('click', registeredListener, {
signal: controller.signal,
});
childRef.current.click();
expect(logs).toEqual(['registered']);

fragmentRef.current.removeEventListener('click', registeredListener);
logs = [];
childRef.current.click();
expect(logs).toEqual([]);

// Added without a signal
fragmentRef.current.addEventListener('click', registeredListener);
logs = [];
childRef.current.click();
// Listener is called
expect(logs).toEqual(['registered']);

logs = [];
controller.abort();
childRef.current.click();
// Listener is called
expect(logs).toEqual(['registered']);
});

// @gate enableFragmentRefs && enableFragmentRefsTextNodes
it('adds an event listener to a newly added text child', async () => {
const fragmentRef = React.createRef();
Expand Down