From 03d63d517ab1329a0629d1322629eefc843fdb18 Mon Sep 17 00:00:00 2001 From: Olivia206 <olivia.simonet206@gmail.com> Date: Thu, 18 Apr 2024 15:35:04 +0200 Subject: [PATCH] cleaned focus trap js --- assets/js/theme/utils/focus-trap.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/js/theme/utils/focus-trap.js b/assets/js/theme/utils/focus-trap.js index ba6c8fe7..ee5c0102 100644 --- a/assets/js/theme/utils/focus-trap.js +++ b/assets/js/theme/utils/focus-trap.js @@ -1,10 +1,9 @@ export function focusTrap(event, element, isOpened) { - const focusables = 'a, button, input, textarea, select, details, [tabindex], [contenteditable="true"]'; - const elements = element.querySelectorAll(focusables); - - const focusableInDialog = Array.from(elements).filter(element => element.tabIndex >= 0); - const firstFocusable = focusableInDialog[0]; - const lastFocusable = focusableInDialog.at(-1); + const focusables = 'a, button, input, textarea, select, details, [tabindex], [contenteditable="true"]', + elements = element.querySelectorAll(focusables), + focusableInDialog = Array.from(elements).filter(element => element.tabIndex >= 0), + firstFocusable = focusableInDialog[0], + lastFocusable = focusableInDialog.at(-1); if (!isOpened) { return; @@ -13,7 +12,7 @@ export function focusTrap(event, element, isOpened) { lastFocusable.focus(); event.preventDefault(); } - else if (!element.contains(event.target)) { + else if (!element.contains(event.target)) { firstFocusable.focus(); event.preventDefault(); } -- GitLab