From f3d44f135dbe200bed172b45615c47130171ec1a Mon Sep 17 00:00:00 2001 From: Theo Goulart Date: Sat, 7 Nov 2026 16:25:28 -0300 Subject: [PATCH 1/5] fix: remove menu keydown listener on cleanup --- packages/react/src/hooks/useMenuKeyboardNavigation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/hooks/useMenuKeyboardNavigation.ts b/packages/react/src/hooks/useMenuKeyboardNavigation.ts index 16192f2e228..a732a9b99d0 100644 --- a/packages/react/src/hooks/useMenuKeyboardNavigation.ts +++ b/packages/react/src/hooks/useMenuKeyboardNavigation.ts @@ -109,6 +109,6 @@ const useMoveFocusToMenuItem = ( } anchor?.addEventListener('keydown', handler) - return () => anchor?.addEventListener('keydown', handler) + return () => anchor?.removeEventListener('keydown', handler) }, [open, containerRef, anchorRef]) } From b1c6f6bb6ecc0615f03fc8267bec4647617ceadd Mon Sep 17 00:00:00 2001 From: Theo Goulart Date: Sat, 7 Nov 2026 16:30:23 -0300 Subject: [PATCH 2/5] test(ActionMenu): cover keyboard listener cleanup --- .../react/src/ActionMenu/ActionMenu.test.tsx | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/react/src/ActionMenu/ActionMenu.test.tsx b/packages/react/src/ActionMenu/ActionMenu.test.tsx index e0f641963bc..e7efa2cd019 100644 --- a/packages/react/src/ActionMenu/ActionMenu.test.tsx +++ b/packages/react/src/ActionMenu/ActionMenu.test.tsx @@ -221,6 +221,27 @@ describe('ActionMenu', () => { expect(component.baseElement.querySelector('[data-component="AnchoredOverlay"]')).toBeNull() }) + it('removes the anchor keydown handler after repeated open and close cycles', async () => { + const component = HTMLRender() + const button = page.getByRole('button', {name: 'Toggle Menu', exact: true}) + const anchor = button.element() + const addEventListener = vi.spyOn(anchor, 'addEventListener') + const removeEventListener = vi.spyOn(anchor, 'removeEventListener') + + for (let index = 0; index < 3; index++) { + await userEvent.click(button) + await expect.element(page.getByRole('menu')).toBeInTheDocument() + await userEvent.click(button) + await expect.element(page.getByRole('menu')).not.toBeInTheDocument() + } + + component.unmount() + + const keydownAdds = addEventListener.mock.calls.filter(([type]) => type === 'keydown') + const keydownRemovals = removeEventListener.mock.calls.filter(([type]) => type === 'keydown') + expect(keydownAdds).toHaveLength(keydownRemovals.length) + }) + it('should open Menu on MenuButton click', async () => { HTMLRender() const button = page.getByRole('button') From 1fffb52f4066c11ca43dc904a376d832e21a61de Mon Sep 17 00:00:00 2001 From: Theo Goulart Date: Sat, 7 Nov 2026 16:35:57 -0300 Subject: [PATCH 3/5] chore: add changeset for ActionMenu listener fix --- .changeset/icy-suits-lead.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/icy-suits-lead.md diff --git a/.changeset/icy-suits-lead.md b/.changeset/icy-suits-lead.md new file mode 100644 index 00000000000..0ab01b5ffbb --- /dev/null +++ b/.changeset/icy-suits-lead.md @@ -0,0 +1,5 @@ +--- +"@primer/react": patch +--- + +Fix ActionMenu anchor keydown listener cleanup. From d95c0cd11443ae6af980312e10b30afed92aee6e Mon Sep 17 00:00:00 2001 From: Theo Goulart Date: Sat, 7 Nov 2026 17:09:27 -0300 Subject: [PATCH 4/5] test: verify ActionMenu listener cleanup per cycle --- .../react/src/ActionMenu/ActionMenu.test.tsx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/react/src/ActionMenu/ActionMenu.test.tsx b/packages/react/src/ActionMenu/ActionMenu.test.tsx index e7efa2cd019..cbf0f3e5b28 100644 --- a/packages/react/src/ActionMenu/ActionMenu.test.tsx +++ b/packages/react/src/ActionMenu/ActionMenu.test.tsx @@ -229,17 +229,28 @@ describe('ActionMenu', () => { const removeEventListener = vi.spyOn(anchor, 'removeEventListener') for (let index = 0; index < 3; index++) { + const addsBeforeOpen = addEventListener.mock.calls.length await userEvent.click(button) await expect.element(page.getByRole('menu')).toBeInTheDocument() + const keydownHandlersAdded = addEventListener.mock.calls + .slice(addsBeforeOpen) + .filter(([type]) => type === 'keydown') + .map(([, listener]) => listener) + + const removalsBeforeClose = removeEventListener.mock.calls.length await userEvent.click(button) await expect.element(page.getByRole('menu')).not.toBeInTheDocument() + const keydownHandlersRemoved = removeEventListener.mock.calls + .slice(removalsBeforeClose) + .filter(([type]) => type === 'keydown') + .map(([, listener]) => listener) + + for (const listener of keydownHandlersAdded) { + expect(keydownHandlersRemoved).toContain(listener) + } } component.unmount() - - const keydownAdds = addEventListener.mock.calls.filter(([type]) => type === 'keydown') - const keydownRemovals = removeEventListener.mock.calls.filter(([type]) => type === 'keydown') - expect(keydownAdds).toHaveLength(keydownRemovals.length) }) it('should open Menu on MenuButton click', async () => { From b8e76fd16e651addd1ecfac48dc3b1b689f8bd10 Mon Sep 17 00:00:00 2001 From: Taylor Jones Date: Thu, 19 Nov 2026 09:48:54 -0600 Subject: [PATCH 5/5] test: strengthen ActionMenu listener cleanup coverage Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .changeset/icy-suits-lead.md | 2 +- packages/react/src/ActionMenu/ActionMenu.test.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.changeset/icy-suits-lead.md b/.changeset/icy-suits-lead.md index 0ab01b5ffbb..5eed4cfc226 100644 --- a/.changeset/icy-suits-lead.md +++ b/.changeset/icy-suits-lead.md @@ -2,4 +2,4 @@ "@primer/react": patch --- -Fix ActionMenu anchor keydown listener cleanup. +ActionMenu: Fix a memory leak when opening and closing menus. diff --git a/packages/react/src/ActionMenu/ActionMenu.test.tsx b/packages/react/src/ActionMenu/ActionMenu.test.tsx index cbf0f3e5b28..e438c205f3b 100644 --- a/packages/react/src/ActionMenu/ActionMenu.test.tsx +++ b/packages/react/src/ActionMenu/ActionMenu.test.tsx @@ -236,6 +236,7 @@ describe('ActionMenu', () => { .slice(addsBeforeOpen) .filter(([type]) => type === 'keydown') .map(([, listener]) => listener) + expect(keydownHandlersAdded.length).toBeGreaterThan(0) const removalsBeforeClose = removeEventListener.mock.calls.length await userEvent.click(button)