From feda63d6a74c5e009bc1c12777b50bd94cd07771 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Jan 2024 10:20:11 -0500 Subject: [PATCH] Automatically expand menu section containing the active link --- netbox/project-static/dist/netbox.js | Bin 456691 -> 456696 bytes netbox/project-static/dist/netbox.js.map | Bin 370752 -> 370753 bytes netbox/project-static/src/sidenav.ts | 14 +++++++------- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index c56916132626e4e8eda2a925fa26eb1beb14229d..4035a8b0840b68cc44ec1bd35bc6ced854c4515e 100644 GIT binary patch delta 41 xcmezTUi!y->4p}@7N!>F7M2#)Eo>hj^QIK#7o_Bu=jrCA=9O;$`IzmOFaU}c60-mR delta 36 scmezIUi$NU>4p}@7N!>F7M2#)Eo>hjb0p{IF7M3ln-)H)y>bN^Pdg}x_ItJ=wJ2^V%ID-T{K}4vIr=w%4 zjZCh4Iwt9)Iy#y-=_ETkChH_RI-5>+n#Jlbkf;+1)$0i~ a*4cRa!da}=Fj1gpe~_r<_BXRwLwEuIM=QVp delta 145 zcmX?jLF~WF7M3ln-)DM<>$p2Qdg}x_ItJ<_IyzfAf%u*vB2>rI(J@@d z+0nHOEa(g3N9y=HItJ^cJ2^Ur=%hM2mOJSrJ31zVv{p=ap2g}f5Udjl)$0i~)wyi? WqFJogFj1gpe~_r*_P4WGLwEt;Fe~x^ diff --git a/netbox/project-static/src/sidenav.ts b/netbox/project-static/src/sidenav.ts index 97a86e4d2..4dabc27b1 100644 --- a/netbox/project-static/src/sidenav.ts +++ b/netbox/project-static/src/sidenav.ts @@ -205,22 +205,22 @@ class SideNav { * @param action Expand or Collapse */ private activateLink(link: HTMLDivElement, action: 'expand' | 'collapse'): void { - // Find the closest .collapse element, which should contain `link`. - const collapse = link.closest('.collapse') as Nullable; - if (isElement(collapse)) { - // Find the closest `.nav-link`, which should be adjacent to the `.collapse` element. - const groupLink = collapse.parentElement?.querySelector('.nav-link'); + // Find the closest .dropdown-menu element, which should contain `link`. + const dropdownMenu = link.closest('.dropdown-menu') as Nullable; + if (isElement(dropdownMenu)) { + // Find the closest `.nav-link`, which should be adjacent to the `.dropdown-menu` element. + const groupLink = dropdownMenu.parentElement?.querySelector('.nav-link'); if (isElement(groupLink)) { groupLink.classList.add('active'); switch (action) { case 'expand': groupLink.setAttribute('aria-expanded', 'true'); - collapse.classList.add('show'); + dropdownMenu.classList.add('show'); link.classList.add('active'); break; case 'collapse': groupLink.setAttribute('aria-expanded', 'false'); - collapse.classList.remove('show'); + dropdownMenu.classList.remove('show'); link.classList.remove('active'); break; }