Fix toggling of sidenav dropdowns

Author: parlough

src/_sass/_dash.scss

@@ -389,12 +389,6 @@ $dash-max-width: 1330px;
   }
 }
 
-.nav-link {
-  &:focus {
-    outline: $dash-highlight auto 2px;
-  }
-}
-
 a.frontanchor {
   padding-top: 50px;
 }

src/content/assets/js/main.js

@@ -32,12 +32,13 @@ function handleSearchShortcut(event) {
   }
 }
 
-function scrollSidenavIntoView() {
+function setupSidenav() {
   const sidenav = document.getElementById('sidenav');
   if (!sidenav) {
     return;
   }
 
+  // Scroll active entry in to view.
   const activeEntries = sidenav.querySelectorAll('a.nav-link.active');
   if (activeEntries.length > 0) {
     const activeEntry = activeEntries[activeEntries.length - 1];
@@ -145,15 +146,10 @@ function setupCopyButtons() {
 }
 
 $(function() {
+  setupSidenav();
   setupOsTabs();
   initCookieNotice();
 
-  // Sidenav
-  $('#sidenav i').on('click', function (e) {
-    e.stopPropagation();
-    $(this).parent('li').toggleClass('active');
-  });
-
   // open - close mobile navigation
   $('#menu-toggle').on('click', function (e) {
     e.stopPropagation();
@@ -170,8 +166,6 @@ $(function() {
     });
   }
 
-  scrollSidenavIntoView();
-
   // Collapsible inline TOC expand/collapse
   $(".site-toc--inline__toggle").on('click', function () {
     var root = $("#site-toc--inline");
@@ -180,6 +174,18 @@ $(function() {
 
   document.addEventListener('keydown', handleSearchShortcut);
 
+  const toggles = document.querySelectorAll('.nav-link.collapsible');
+  toggles.forEach(function (toggle) {
+    toggle.addEventListener('click', (e) => {
+      if (toggle.classList.toggle('collapsed')) {
+        toggle.ariaExpanded = 'false';
+      } else {
+        toggle.ariaExpanded = 'true';
+      }
+      e.preventDefault();
+    });
+  });
+
   createGallery(
     'galleryOne',
     'galleryTwo',