From e8fdeb2adbeaee2c3a8757ae21779da6c851c49d Mon Sep 17 00:00:00 2001 From: Jordan Pakrosnis Date: Tue, 28 Jan 2025 15:03:19 -0500 Subject: [PATCH] Address ESLint issues in mega menu --- .../src/interface/MegaMenu/MegaMenu.js | 19 +++++++++++-------- .../larva-js/src/interface/MegaMenu/index.js | 4 ++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/larva-js/src/interface/MegaMenu/MegaMenu.js b/packages/larva-js/src/interface/MegaMenu/MegaMenu.js index bf0ed7a82..71c16b661 100644 --- a/packages/larva-js/src/interface/MegaMenu/MegaMenu.js +++ b/packages/larva-js/src/interface/MegaMenu/MegaMenu.js @@ -1,3 +1,7 @@ +// no-global-active-element not needed for non-React context. +// https://wordpress.stackexchange.com/a/387511 +/* eslint-disable @wordpress/no-global-active-element */ + export default class MegaMenu { constructor( el ) { this.el = el; @@ -63,15 +67,14 @@ export default class MegaMenu { lastFocusableElement.focus(); event.preventDefault(); } - } else { + // tab key - if ( - document.activeElement === lastFocusableElement && - firstFocusableElement - ) { - firstFocusableElement.focus(); - event.preventDefault(); - } + } else if ( + document.activeElement === lastFocusableElement && + firstFocusableElement + ) { + firstFocusableElement.focus(); + event.preventDefault(); } }; diff --git a/packages/larva-js/src/interface/MegaMenu/index.js b/packages/larva-js/src/interface/MegaMenu/index.js index 2405add3b..b9a761497 100644 --- a/packages/larva-js/src/interface/MegaMenu/index.js +++ b/packages/larva-js/src/interface/MegaMenu/index.js @@ -1,3 +1,7 @@ +// no-global-active-element not needed for non-React context. +// https://wordpress.stackexchange.com/a/387511 +/* eslint-disable @wordpress/no-global-active-element */ + import MegaMenu from './MegaMenu.js'; export default function initMegaMenu() {