Refactor version dropdown

Author: pikinier20

scaladoc-js/resources/versions-dropdown.css

@@ -1,12 +1,23 @@
 /* The container <div> - needed to position the dropdown content */
+
 .versions-dropdown {
+  margin-left: 10px;
+  margin-right: 10px;
   position: relative;
 }
 
 /* Dropdown Button */
 .dropdownbtn {
   padding: 4px 12px;
   border: none;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-radius: 3px;
+}
+
+.dropdownbtnactive {
+  background-color: var(--leftbar-dropdown-bg);
 }
 
 /* Dropdown button on hover & focus */
@@ -15,43 +26,75 @@
   cursor: pointer;
 }
 
+.dropdownbtn span.ar {
+  display: none;
+}
+
+.dropdownbtnactive span.ar {
+  display: unset;
+  position:absolute;
+  right: 10px;
+  z-index: 100;
+}
+
+.dropdownbtnactive span.ar:before {
+  content: '\e903';
+}
+
+.dropdownbtnactive.expanded span.ar:before {
+  content: '\e905';
+}
+
 /* The search field */
 #dropdown-input {
   box-sizing: border-box;
-  background-image: url('searchicon.png');
-  background-position: 14px 12px;
-  background-repeat: no-repeat;
-  font-size: 16px;
-  padding: 14px 20px 12px 45px;
-  border: none;
-  border-bottom: 1px solid #ddd;
+  background-color: var(--leftbar-dropdown-bg);
+  color: var(--leftbar-fg);
+  width: 100%;
+  font-size: var(--leftbar-font-size);
+  border-radius: 3px;
+  padding: 4px 12px;
 }
 
+#dropdown-input::placeholder{
+  color: var(--inactive-fg);
+}
 
-/* The search field when it gets focus/clicked on */
-#dropdown-input:focus {outline: 3px solid #ddd;}
+#dropdown-input, #dropdown-input:focus {
+  outline: none;
+  border: none;
+  border-bottom: 1px solid var(--border-medium);
+}
 
 
 /* Dropdown Content (Hidden by Default) */
 .dropdown-content {
   display: none;
   position: absolute;
-  background-color: #f6f6f6;
+  top: 0px;
+  left: 0px;
+  width: 100%;
+  background-color: var(--leftbar-dropdown-bg);
+  font-size: var(--leftbar-font-size);
   min-width: 230px;
-  border: 1px solid #ddd;
+  border-radius: 3px;
   z-index: 1;
 }
 
 /* Links inside the dropdown */
 .dropdown-content a {
-  color: black;
-  padding: 12px 16px;
+  color: var(--leftbar-fg);
   text-decoration: none;
+  padding: 4px 12px;
   display: block;
+  border-radius: 3px;
 }
 
 /* Change color of dropdown links on hover */
-.dropdown-content a:hover {background-color: #f1f1f1}
+.dropdown-content a:hover {
+  background-color: var(--leftbar-hover-bg);
+  color: var(--leftbar-fg);
+}
 
 /* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */
 .show {

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

@@ -60,14 +60,11 @@ class DropdownHandler:
         addVersionsList(json)
 
   document.addEventListener("click", (e: Event) => {
-    if e.target.asInstanceOf[html.Element].id != "dropdown-button" then
-      document.getElementById("dropdown-content").classList.remove("show")
-      document.getElementById("dropdown-button").classList.remove("expanded")
+    document.getElementById("dropdown-content").classList.remove("show")
+    document.getElementById("dropdown-button").classList.remove("expanded")
   })
 
-  document.getElementById("version").asInstanceOf[html.Span].onclick = (e: Event) => {
-    e.stopPropagation
-  }
+  document.getElementById("version").asInstanceOf[html.Span].addEventListener("click", (e: Event) => e.stopPropagation())
 end DropdownHandler
 
 @JSExportTopLevel("dropdownHandler")
@@ -76,6 +73,7 @@ def dropdownHandler() =
      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() =

scaladoc/resources/dotty_res/styles/colors.css

@@ -77,6 +77,8 @@
   --leftbar-hover-fg: var(--grey900);
   --leftbar-border: var(--grey300);
 
+  --leftbar-dropdown-bg: var(--grey200);
+
   --footer-bg: var(--white);
   --footer-fg: var(--grey700);
 
@@ -125,6 +127,8 @@
   --leftbar-hover-fg: var(--grey300);
   --leftbar-border: var(--grey800);
 
+  --leftbar-dropdown-bg: var(--grey850);
+
   --footer-bg: var(--grey930);
   --footer-fg: var(--grey400);
 

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

@@ -278,10 +278,10 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           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()"),
+                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()"),
+                ),
               ),
             )
           ),