Merge pull request #13 from szymon-rd/current-page-inactive-link

current page link click no reload

Author: Florian3k

scaladoc/resources/dotty_res/scripts/ux.js

@@ -44,20 +44,19 @@ window.addEventListener("DOMContentLoaded", () => {
     }
   }
 
-  $(".side-menu span").on('click', function () {
-    $(this).parent().toggleClass("expanded")
-  });
-
   $(".ar").on('click', function (e) {
     $(this).parent().parent().toggleClass("expanded")
     $(this).toggleClass("expanded")
     e.stopPropagation()
   });
 
   document.querySelectorAll(".nh").forEach(el => el.addEventListener('click', () => {
-    el.lastChild.click()
-    el.first.addClass("expanded")
-    el.parent.addClass("expanded")
+    if (el.lastChild.href.replace("#", "") === window.location.href.replace("#", "")) {
+      el.parentElement.classList.toggle("expanded")
+      el.firstChild.classList.toggle("expanded")
+    } else {
+      el.lastChild.click()
+    }
   }))
 
   document.querySelectorAll(".supertypes").forEach(el => el.firstChild.addEventListener('click', () => {
@@ -71,12 +70,6 @@ window.addEventListener("DOMContentLoaded", () => {
     el.firstChild.classList.toggle("expand");
   }))
 
-  document.querySelectorAll(".nh").forEach(el => el.addEventListener('click', () => {
-    el.lastChild.click()
-    el.first.addClass("expanded")
-    el.parent.addClass("expanded")
-  }))
-
   const observer = new IntersectionObserver(entries => {
     entries.forEach(entry => {
       const id = entry.target.getAttribute('id');
@@ -92,8 +85,6 @@ window.addEventListener("DOMContentLoaded", () => {
     observer.observe(section);
   });
 
-  document.querySelectorAll(".side-menu a").forEach(elem => elem.addEventListener('click', e => e.stopPropagation()))
-
   if (location.hash) {
     var target = location.hash.substring(1);
     // setting the 'expand' class on the top-level container causes undesireable styles

scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

@@ -137,7 +137,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
         Seq(
           span(cls := s"nh " + attrs.mkString(" "))(
             if withArrow then Seq(button(cls := s"ar icon-button ${if isSelected || expanded then "expanded" else ""}")) else Nil,
-            a(href := pathToPage(pageLink.dri, nav.link.dri))(icon, span(name))
+            a(href := (if isSelected then "#" else pathToPage(pageLink.dri, nav.link.dri)))(icon, span(name))
           )
         )
 

scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala

@@ -25,11 +25,11 @@ class NavigationTest extends BaseHtmlTest:
       NavMenuTestEntry("A directory", "dir/index.html", Seq(
         NavMenuTestEntry("Nested in a directory", "dir/nested.html", Nil)
       )),
-      NavMenuTestEntry("Adoc", "Adoc.html", Seq())
+      NavMenuTestEntry("Adoc", "#", Seq())
     )
 
     val apiNav = Seq(
-      NavMenuTestEntry("tests.site", "site.html", Seq(
+      NavMenuTestEntry("tests.site", "#", Seq(
         NavMenuTestEntry("some.other", "site/some/other.html", Seq(
           NavMenuTestEntry("SomeOtherPackage", "site/some/other/SomeOtherPackage.html", Nil),
         )),