From a4bf77588f812ffad0e0a512259cf30d71a2b9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Bl=C3=A4sta?= Date: Wed, 5 Apr 2023 11:42:52 +0200 Subject: [PATCH] fix: only ativate buttons on first level when expanding --- src/ui/collapse.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ui/collapse.js b/src/ui/collapse.js index a2ecd7143..adb9948ca 100644 --- a/src/ui/collapse.js +++ b/src/ui/collapse.js @@ -41,9 +41,11 @@ export default function Collapse(options = {}) { // Set tabindex for all buttons to include or exclude in taborder depending on if expanded or not const setTabIndex = function setTabIndex(idx) { - // Skips the last button since it's slidenav and should be excluded from tab order - for (let i = 0; i < containerEl.getElementsByTagName('button').length - 1; i += 1) { - containerEl.getElementsByTagName('button')[i].tabIndex = idx; + for (let i = 0; i < containerEl.getElementsByTagName('button').length; i += 1) { + // Checks if the button is a direct child of the opened group and not a grandchild which shouldn't be activated until that group is opened + if (containerEl.id === containerEl.getElementsByTagName('button')[i].closest('.collapse-container').id) { + containerEl.getElementsByTagName('button')[i].tabIndex = idx; + } } };