fix event propagation when in contextual help or on submenutrigger

fixes case where arrowLeft was propagating through contextualhelp dialogs which we only want to have be closed via ESC. Also fixes event propagation for default cases for submenu triggers so that we can call it in useMenuItem useKeyboard. Now we still properly close only the submenu trigger menu when focus is on the trigger and the submenu is open

Author: LFDanLu

packages/@react-aria/menu/src/useMenuItem.ts

@@ -248,7 +248,11 @@ export function useMenuItem<T>(props: AriaMenuItemProps, state: TreeState<T>, re
           }
           break;
         default:
-          e.continuePropagation();
+          if (!isTrigger) {
+            e.continuePropagation();
+          }
+
+          onKeyDown?.(e);
           break;
       }
     },
@@ -265,7 +269,7 @@ export function useMenuItem<T>(props: AriaMenuItemProps, state: TreeState<T>, re
       // Key down from useSubmenuTrigger's submenuTriggerProps is not incorporated into useKeyboard here since we
       // cannot sufficiently distinguish when propagation should be continued or stopped in this section of code.
       // It should only stop propagation if handling the ArrowRight case when the submenutrigger's menu is open and focus is on the trigger,
-      ...mergeProps(domProps, itemProps, pressProps, hoverProps, keyboardProps, focusProps, {onKeyDown, onKeyUp}),
+      ...mergeProps(domProps, itemProps, pressProps, hoverProps, keyboardProps, focusProps),
       tabIndex: itemProps.tabIndex != null ? -1 : undefined
     },
     labelProps: {

packages/@react-aria/menu/src/useSubmenuTrigger.ts

@@ -90,14 +90,14 @@ export function UNSTABLE_useSubmenuTrigger<T>(props: AriaSubmenuTriggerProps, st
   let submenuKeyDown = (e: KeyboardEvent) => {
     switch (e.key) {
       case 'ArrowLeft':
-        if (direction === 'ltr') {
+        if (direction === 'ltr' && e.currentTarget.contains(e.target as Element)) {
           e.stopPropagation();
           onSubmenuClose();
           ref.current.focus();
         }
         break;
       case 'ArrowRight':
-        if (direction === 'rtl') {
+        if (direction === 'rtl' && e.currentTarget.contains(e.target as Element)) {
           e.stopPropagation();
           onSubmenuClose();
           ref.current.focus();
@@ -132,8 +132,9 @@ export function UNSTABLE_useSubmenuTrigger<T>(props: AriaSubmenuTriggerProps, st
               onSubmenuOpen('first');
             }
           } else if (state.isOpen) {
-            e.stopPropagation();
             onSubmenuClose();
+          } else {
+            e.continuePropagation();
           }
         }
 
@@ -147,11 +148,18 @@ export function UNSTABLE_useSubmenuTrigger<T>(props: AriaSubmenuTriggerProps, st
               onSubmenuOpen('first');
             }
           } else if (state.isOpen) {
-            e.stopPropagation();
             onSubmenuClose();
+          } else {
+            e.continuePropagation();
           }
         }
         break;
+      case 'Escape':
+        state.closeAll();
+        break;
+      default:
+        e.continuePropagation();
+        break;
     }
   };