fix(ContextSubMenuItem): fix popper container

patternfly · Feb 4, 2025 · 5e0b053 · 5e0b053
1 parent dc28e8b
commit 5e0b053
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/packages/module/src/components/contextmenu/ContextSubMenuItem.tsx b/packages/module/src/components/contextmenu/ContextSubMenuItem.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Dropdown, DropdownItem } from '@patternfly/react-core';
+import { Menu, DropdownItem } from '@patternfly/react-core';
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import { css } from '@patternfly/react-styles';
 import topologyStyles from '../../css/topology-components';
@@ -11,6 +11,11 @@ interface ContextSubMenuItemProps {
   children: React.ReactNode[];
 }
 
+/** Check if an event target is also a node. Needed to stop runtime errors where the target does not implement Node. */
+const isNode = (node: any): boolean => {
+  return node && typeof node === 'object' && node.nodeType && node.nodeName;
+};
+
 const ContextSubMenuItem: React.FunctionComponent<ContextSubMenuItemProps> = ({ label, children, ...other }) => {
   const nodeRef = React.useRef<HTMLButtonElement>(null);
   const subMenuRef = React.useRef<HTMLDivElement>(null);
@@ -29,7 +34,10 @@ const ContextSubMenuItem: React.FunctionComponent<ContextSubMenuItemProps> = ({
         onMouseEnter={() => setOpen(true)}
         onMouseLeave={(e) => {
           // if the mouse leaves this item, close the sub menu only if the mouse did not enter the sub menu itself
-          if (!subMenuRef.current || !subMenuRef.current.contains(e.relatedTarget as Node)) {
+          if (
+            !subMenuRef.current ||
+            (isNode(e.relatedTarget) && !subMenuRef.current.contains(e.relatedTarget as Node))
+          ) {
             setOpen(false);
           }
         }}
@@ -51,22 +59,18 @@ const ContextSubMenuItem: React.FunctionComponent<ContextSubMenuItemProps> = ({
         closeOnOutsideClick
         onRequestClose={(e) => {
           // only close the sub menu if clicking anywhere outside the menu item that owns the sub menu
-          if (!e || !nodeRef.current || !nodeRef.current.contains(e.target as Node)) {
+          if (!e || !nodeRef.current || (isNode(e.target) && !nodeRef.current.contains(e.target as Node))) {
             setOpen(false);
           }
         }}
         reference={referenceCb}
-        // use the parent node to capture the li
-        container={nodeRef.current ? nodeRef.current.parentElement : nodeRef.current}
+        container={nodeRef.current?.closest('.pf-v6-c-menu__content')}
         returnFocus
       >
-        <div
-          ref={subMenuRef}
-          role="presentation"
-          className="pf-v6-c-dropdown pf-m-expanded"
+        <Menu
           onMouseLeave={(e) => {
             // only close the sub menu if the mouse does not enter the item
-            if (!nodeRef.current || !nodeRef.current.contains(e.relatedTarget as Node)) {
+            if (!nodeRef.current || (isNode(e.relatedTarget) && !nodeRef.current.contains(e.relatedTarget as Node))) {
               setOpen(false);
             }
           }}
@@ -77,11 +81,12 @@ const ContextSubMenuItem: React.FunctionComponent<ContextSubMenuItemProps> = ({
               e.stopPropagation();
             }
           }}
+          ref={subMenuRef}
+          role="presentation"
+          isNavFlyout
         >
-          <Dropdown toggle={() => <></>} className={css(topologyStyles.topologyContextMenuCDropdownMenu)}>
-            {children}
-          </Dropdown>
-        </div>
+          {children}
+        </Menu>
       </Popper>
     </>
   );

diff --git a/packages/module/src/css/topology-components.css b/packages/module/src/css/topology-components.css
@@ -228,10 +228,6 @@
   outline: none;
 }
 
-.pf-topology-context-menu__c-dropdown__menu {
-  position: initial !important;
-}
-
 .pf-topology-context-sub-menu {
   position: relative;
   padding-right: var(--pf-t--global--spacer--lg) !important;