github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Guard against null in aria-menu

pull/19226/head
wenincode 2023-10-13 16:17:44 -06:00 committed by Chris Hut
parent bbedb3fff0
commit 4576fbee1e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/packages/consul-ui/app/modifiers/aria-menu.js
View File

@ -53,7 +53,7 @@ export default class AriaMenuModifier extends Modifier {
async keydown(e) { async keydown(e) {
if (e.keyCode === ESC) { if (e.keyCode === ESC) {
this.options.onclose(e); this.options.onclose(e);
this.$trigger.focus(); this.$trigger?.focus();
return; return;
} }
const $items = [...this.element.querySelectorAll(MENU_ITEMS)]; const $items = [...this.element.querySelectorAll(MENU_ITEMS)];
@ -62,7 +62,7 @@ export default class AriaMenuModifier extends Modifier {
if (e.shiftKey) { if (e.shiftKey) {
if (pos === 0) { if (pos === 0) {
this.options.onclose(e); this.options.onclose(e);
this.$trigger.focus(); this.$trigger?.focus();
} }
} else { } else {
if (pos === $items.length - 1) { if (pos === $items.length - 1) {
@ -75,7 +75,7 @@ export default class AriaMenuModifier extends Modifier {
if (typeof keys[this.orientation][e.keyCode] === 'undefined') { if (typeof keys[this.orientation][e.keyCode] === 'undefined') {
return; return;
} }
$items[keys[this.orientation][e.keyCode]($items, pos)].focus(); $items[keys[this.orientation][e.keyCode]($items, pos)]?.focus();
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
} }