diff --git a/packages/react-devtools-shared/src/devtools/ContextMenu/ContextMenu.js b/packages/react-devtools-shared/src/devtools/ContextMenu/ContextMenu.js index a96634fbe46a..1cafd9ff0314 100644 --- a/packages/react-devtools-shared/src/devtools/ContextMenu/ContextMenu.js +++ b/packages/react-devtools-shared/src/devtools/ContextMenu/ContextMenu.js @@ -74,7 +74,13 @@ export default function ContextMenu({ ); useLayoutEffect(() => { - const menu = ((ref.current: any): HTMLElement); + const menu = ref.current; + + // Match the early-return condition below. If neither of these + // is true, menu being null would be a bug. + if (portalContainer == null || items.length === 0) { + return; + } function hideUnlessContains(event: Event) { if (!menu.contains(((event.target: any): Node))) {