Skip to content

fix(FloatingPortal): guard addEventListener against null portalNode under concurrent React #4740

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
ossaidqadri wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

fix(FloatingPortal): guard addEventListener against null portalNode under concurrent React #4740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions packages/react/src/floating-ui-react/components/FloatingPortal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,11 @@ export const FloatingPortal = React.forwardRef(function FloatingPortal(

// Listen to the event on the capture phase so they run before the focus
// trap elements onFocus prop is called.
// Guard with `portalNode &&` to defend against concurrent React renders
// where the effect fires before the ref is attached (issue #4739).
return mergeCleanups(
addEventListener(portalNode, 'focusin', onFocus, true),
addEventListener(portalNode, 'focusout', onFocus, true),
portalNode && addEventListener(portalNode, 'focusin', onFocus, true),
portalNode && addEventListener(portalNode, 'focusout', onFocus, true),
);
}, [portalNode, modal]);

Expand Down
Loading