Refactor TieredMenu and Menu escapes #5639

primefaces · Dec 25, 2023 · c41b7d7 · c41b7d7
1 parent 68942b6
commit c41b7d7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/components/lib/menu/Menu.js b/components/lib/menu/Menu.js
@@ -139,7 +139,7 @@ export const Menu = React.memo(
                     }
 
                 case 'Tab':
-                    props.popup && visibleState && hide();
+                    props.popup && visibleState && hide(event);
                     break;
 
                 default:
@@ -157,7 +157,7 @@ export const Menu = React.memo(
         const onArrowUpKey = (event) => {
             if (event.altKey && popup) {
                 DomHandler.focus(targetRef.current);
-                hide();
+                hide(event);
                 event.preventDefault();
             } else {
                 const optionIndex = findPrevOptionIndex(focusedOptionIndex);

diff --git a/components/lib/tieredmenu/TieredMenu.js b/components/lib/tieredmenu/TieredMenu.js
@@ -157,6 +157,7 @@ export const TieredMenu = React.memo(
                     break;
 
                 case 'Escape':
+                    props.popup && DomHandler.focus(targetRef.current);
                     onEscapeKey(event);
                     break;
 
@@ -268,6 +269,10 @@ export const TieredMenu = React.memo(
 
         const onArrowUpKey = (event) => {
             if (event.altKey) {
+                if (props.popup) {
+                    DomHandler.focus(targetRef.current);
+                }
+
                 if (focusedItemInfo.index !== -1) {
                     const processedItem = visibleItems[focusedItemInfo.index];
                     const grouped = isProccessedItemGroup(processedItem);
@@ -330,6 +335,7 @@ export const TieredMenu = React.memo(
                 const element = DomHandler.findSingle(getMenuElement(), `li[id="${`${focusedItemId}`}"]`);
                 const anchorElement = element && DomHandler.findSingle(element, '[data-pc-section="action"]');
 
+                props.popup && DomHandler.focus(targetRef.current);
                 anchorElement ? anchorElement.click() : element && element.click();
             }