prepare base header structure

Author: Filip Łukasik

scaladoc-js/main/src/versions-dropdown/DropdownHandler.scala

@@ -23,9 +23,9 @@ class DropdownHandler:
 
   private def addVersionsList(json: String) =
     val ver = JSON.parse(json).asInstanceOf[Versions]
-    val ddc = document.getElementById("dropdown-content")
+    val ddc = document.getElementById("version-dropdown")
     for (k, v) <- ver.versions do
-      var child = a(href := v)(k)
+      val child = span(cls := "text-button", href := v)(k)
       ddc.appendChild(child)
     val arrow = span(cls := "ar")()
     document.getElementById("dropdown-button").appendChild(arrow)
@@ -68,24 +68,7 @@ end DropdownHandler
 
 @JSExportTopLevel("dropdownHandler")
 def dropdownHandler() =
-  if document.getElementById("dropdown-content").getElementsByTagName("a").size > 0 &&
-     window.getSelection.toString.length == 0 then
-    document.getElementById("dropdown-content").classList.toggle("show")
-    document.getElementById("dropdown-button").classList.toggle("expanded")
-    document.getElementById("dropdown-input").asInstanceOf[html.Input].focus()
-
-@JSExportTopLevel("filterFunction")
-def filterFunction() =
-  val input = document.getElementById("dropdown-input").asInstanceOf[html.Input]
-  val filter = input.value.toUpperCase
-  val div = document.getElementById("dropdown-content")
-  val as = div.getElementsByTagName("a")
-
-  as.foreach { a =>
-    val txtValue = a.innerText
-    val cl = a.asInstanceOf[html.Anchor].classList
-    if txtValue.toUpperCase.indexOf(filter) > -1 then
-      cl.remove("filtered")
-    else
-      cl.add("filtered")
-  }
+  // if document.getElementById("dropdown-content").getElementsByTagName("a").size > 0 &&
+  //    window.getSelection.toString.length == 0 then
+    document.getElementById("version-dropdown").classList.toggle("expanded")
+    // document.getElementById("dropdown-button").classList.toggle("expanded")

scaladoc/resources/dotty_res/scripts/ux.js

@@ -17,11 +17,6 @@ window.addEventListener("DOMContentLoaded", () => {
     }
   }
 
-  $(".icon-button.hamburger").on('click', function () {
-    $("#hamburger-dropdown").toggleClass("expanded")
-    $(this).toggleClass("selected")
-  });
-
   $(".side-menu span").on('click', function () {
     $(this).parent().toggleClass("expanded")
   });

scaladoc/resources/dotty_res/styles/theme/components/button/text-button.css

@@ -1,6 +1,7 @@
 .text-button a {
   color: var(--action-primary-content-default);
   text-decoration: none;
+  cursor: pointer;
 }
 
 .text-button:hover a {

scaladoc/resources/dotty_res/styles/theme/components/dropdown-menu.css

@@ -9,8 +9,7 @@
   display: none;
   position: absolute;
   padding: calc(3 * var(--base-spacing));
-  top: calc(6 * var(--base-spacing));
-  right: calc(2 * var(--base-spacing));
+  z-index: 2;
 }
 
 .dropdown-menu > *:not(:last-child) {

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

@@ -207,47 +207,57 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
       div(id := "header")(
         div(cls := "header-container-left")(
           projectLogo,
+          span(onclick := "dropdownHandler()", cls := "text-button")(
+            a()(
+              args.projectVersion.map(v => div(cls:="projectVersion")(v)).getOrElse("")
+            ),
+            div(id := "version-dropdown", cls := "dropdown-menu") (
+              span(cls := "text-button")(
+                a() (
+                "Download",
+                )
+              ),
+            )
+          ),
         ),
 
         div(cls:="header-container-center")(
           input(`type` := "text", placeholder := "Search...", id := "dropdown-input", onkeyup := "filterFunction()"),
         ),
 
          div(cls:="header-container-right")(
+          span(cls := "text-button")(
+            a(href := "https://www.scala-lang.org/download/") (
+              "Download",
+            )
+          ),
+          span(cls := "text-button")(
+            a(href := "https://docs.scala-lang.org/") (
+              "Documentation",
+            )
+          ),
+          span(cls := "text-button")(
+            a(href := "https://index.scala-lang.org") (
+              "Libraries",
+            )
+          ),
+          span(cls := "text-button")(
+            a(href := "https://www.scala-lang.org/contribute/") (
+              "Contribute",
+            )
+          ),
+          span(cls := "text-button")(
+            a(href := "https://www.scala-lang.org/contribute/") (
+              "Blog",
+            )
+          ),
+          span(cls := "text-button")(
+            a(href := "https://www.scala-lang.org/blog/") (
+              "Community",
+            )
+          ),
           button(id := "theme-toggle", cls := "icon-button"),
-          button(cls := "icon-button hamburger"),
-          div(id := "hamburger-dropdown", cls := "dropdown-menu body-small")(
-            span(cls := "text-button")(
-              a(href := "https://www.scala-lang.org/download/") (
-                "Download",
-              )
-            ),
-            span(cls := "text-button")(
-              a(href := "https://docs.scala-lang.org/") (
-                "Documentation",
-              )
-            ),
-            span(cls := "text-button")(
-              a(href := "https://index.scala-lang.org") (
-                "Libraries",
-              )
-            ),
-            span(cls := "text-button")(
-              a(href := "https://www.scala-lang.org/contribute/") (
-                "Contribute",
-              )
-            ),
-             span(cls := "text-button")(
-              a(href := "https://www.scala-lang.org/contribute/") (
-                "Blog",
-              )
-            ),
-            span(cls := "text-button")(
-              a(href := "https://www.scala-lang.org/blog/") (
-                "Community",
-              )
-            ),
-          )
+
         ),
 
 
@@ -285,16 +295,6 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
         //   span(
         //     div(cls:="projectName")(args.name)
         //   ),
-        //   div(id := "version")(
-        //     div(cls := "versions-dropdown")(
-        //       div(onclick := "dropdownHandler()", id := "dropdown-button", cls := "dropdownbtn dropdownbtnactive")(
-        //         args.projectVersion.map(v => div(cls:="projectVersion")(v)).getOrElse(""),
-        //         div(id := "dropdown-content", cls := "dropdown-content")(
-        //           input(`type` := "text", placeholder := "Search...", id := "dropdown-input", onkeyup := "filterFunction()"),
-        //         ),
-        //       ),
-        //     )
-        //   ),
         //   div(cls := "socials")(
         //     socialLinks()
         //   )
@@ -324,7 +324,7 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
         div (id := "leftToggler")(
           span(cls := "icon-toggler")
         ),
-        div(id := "scaladoc-searchBar"),
+        // div(id := "scaladoc-searchBar"),
         // main(id := "main-content")(
         //   parentsHtml,
         //   div(id := "content")(content),