Fix #2837: TieredMenu/ContextMenu hieght handling (#3737)

primefaces · Dec 2, 2022 · d5331d1 · d5331d1
1 parent 8fcccaf
commit d5331d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/components/lib/contextmenu/ContextMenuSub.js b/components/lib/contextmenu/ContextMenuSub.js
@@ -48,11 +48,11 @@ export const ContextMenuSub = React.memo((props) => {
 
     const position = () => {
         const parentItem = submenuRef.current.parentElement;
-        const containerOffset = DomHandler.getOffset(submenuRef.current.parentElement);
+        const containerOffset = DomHandler.getOffset(parentItem);
         const viewport = DomHandler.getViewport();
         const sublistWidth = submenuRef.current.offsetParent ? submenuRef.current.offsetWidth : DomHandler.getHiddenElementOuterWidth(submenuRef.current);
         const itemOuterWidth = DomHandler.getOuterWidth(parentItem.children[0]);
-        const top = parseInt(containerOffset.top, 10) + submenuRef.current.offsetHeight;
+        const top = parseInt(containerOffset.top, 10) + submenuRef.current.offsetHeight - DomHandler.getWindowScrollTop();
 
         if (top > viewport.height) {
             submenuRef.current.style.top = viewport.height - top + 'px';

diff --git a/components/lib/tieredmenu/TieredMenuSub.js b/components/lib/tieredmenu/TieredMenuSub.js
@@ -23,6 +23,13 @@ export const TieredMenuSub = React.memo((props) => {
             const viewport = DomHandler.getViewport();
             const sublistWidth = elementRef.current.offsetParent ? elementRef.current.offsetWidth : DomHandler.getHiddenElementOuterWidth(elementRef.current);
             const itemOuterWidth = DomHandler.getOuterWidth(parentItem.children[0]);
+            const top = parseInt(containerOffset.top, 10) + elementRef.current.offsetHeight - DomHandler.getWindowScrollTop();
+
+            if (top > viewport.height) {
+                elementRef.current.style.top = viewport.height - top + 'px';
+            } else {
+                elementRef.current.style.top = '0px';
+            }
 
             if (parseInt(containerOffset.left, 10) + itemOuterWidth + sublistWidth > viewport.width - DomHandler.calculateScrollbarWidth()) {
                 DomHandler.addClass(elementRef.current, 'p-submenu-list-flipped');