From b373b98d487a2ca3305113f62026ea6e52dd425b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 6 Oct 2021 16:49:53 +0100
Subject: [PATCH] Simplify aria menu item roles/selectors

---
 src/components/structures/ContextMenu.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/ContextMenu.tsx b/src/components/structures/ContextMenu.tsx
index e2ec5d232c..dc6cbb59cd 100644
--- a/src/components/structures/ContextMenu.tsx
+++ b/src/components/structures/ContextMenu.tsx
@@ -44,9 +44,6 @@ function getOrCreateContainer(): HTMLDivElement {
     return container;
 }
 
-const ARIA_MENU_ITEM_ROLES = new Set(["menuitem", "menuitemcheckbox", "menuitemradio"]);
-const ARIA_MENU_ITEM_SELECTOR = '[role^="menuitem"], [role^="menuitemcheckbox"], [role^="menuitemradio"]';
-
 export interface IPosition {
     top?: number;
     bottom?: number;
@@ -117,7 +114,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
         // We don't need to clean up when unmounting, so ignore
         if (!element) return;
 
-        const first = element.querySelector<HTMLElement>(ARIA_MENU_ITEM_SELECTOR)
+        const first = element.querySelector<HTMLElement>('[role^="menuitem"]')
             || element.querySelector<HTMLElement>('[tab-index]');
 
         if (first) {
@@ -196,7 +193,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
                     descending = true;
                 }
             }
-        } while (element && !ARIA_MENU_ITEM_ROLES.has(element.getAttribute("role")));
+        } while (element && !element.getAttribute("role")?.startsWith("menuitem"));
 
         if (element) {
             (element as HTMLElement).focus();