Minor bugfixes and adjustments of scala3doc searchbar

Author: pikinier20

scala3doc-js/resources/scala3doc-searchbar.css

@@ -32,7 +32,7 @@
 }
 
 #scala3doc-search {
-    margin-top: 2px;
+    margin-top: 10px;
     cursor: pointer;
     position: fixed;
     top: 0;

scala3doc-js/src/searchbar/SearchbarComponent.scala

@@ -33,9 +33,10 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
     span.innerHTML = """<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path d="M19.64 18.36l-6.24-6.24a7.52 7.52 0 10-1.28 1.28l6.24 6.24zM7.5 13.4a5.9 5.9 0 115.9-5.9 5.91 5.91 0 01-5.9 5.9z"></path></svg>"""
     span.id = "scala3doc-search"
     span.onclick = (event: Event) =>
-      if (rootDiv.className.contains("hidden"))
-        rootDiv.className = rootShowClasses
-      else rootDiv.className = rootHiddenClasses
+      if (document.body.contains(rootDiv)) {
+        document.body.removeChild(rootDiv)
+      }
+      else document.body.appendChild(rootDiv)
 
     val element = createNestingDiv("search-content")(
       createNestingDiv("search-conatiner")(
@@ -72,12 +73,14 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
     val element = document.createElement("div").asInstanceOf[html.Div]
     element.addEventListener("click", (e: Event) => e.stopPropagation())
     logoClick.addEventListener("click", (e: Event) => e.stopPropagation())
-    document.body.addEventListener("click", (e: Event) => element.className = rootHiddenClasses)
-    element.className = rootHiddenClasses
+    document.body.addEventListener("click", (e: Event) =>
+      if (document.body.contains(element)) {
+        document.body.removeChild(element)
+      }
+    )
     element.id = "scala3doc-searchbar"
     element.appendChild(input)
     element.appendChild(resultsDiv)
-    document.body.appendChild(element)
     element
 
   handleNewQuery("")

scala3doc-js/src/searchbar/engine/Matchers.scala

@@ -4,7 +4,9 @@ enum Matchers(func: (PageEntry) => Int) extends Function1[PageEntry, Int]:
   export func.apply
   case ByName(query: String) extends Matchers( (p) => {
     val name = p.searchKeys.headOption.map(_.toLowerCase)
-    name.filter(_.contains(query)).map(_ => p.name.size - query.size).getOrElse(-1)
+    //Edge case for empty query string
+    if query == "" then 1
+    else name.filter(_.contains(query)).map(_ => p.name.size - query.size).getOrElse(-1)
   })
   case ByKind(kind: String) extends Matchers((p) => p.name.split(" ").headOption.filter(_ == kind).fold(-1)(_ => 1))
 

scala3doc-js/src/searchbar/engine/QueryParser.scala

@@ -15,9 +15,9 @@ class QueryParser:
     "package",
     "given",
   )
-  val kindRegex = (kinds.mkString("(","|",")") + " (.+)").r
-  val restRegex = raw"(.+)".r
-  val escapedRegex = raw"`(.+)`".r
+  val kindRegex = (kinds.mkString("(","|",")") + " (.*)").r
+  val restRegex = raw"(.*)".r
+  val escapedRegex = raw"`(.*)`".r
 
   def parse(query: String): List[Matchers] = query.toLowerCase match {
     case escapedRegex(rest) => List(Matchers.ByName(rest))

scala3doc-js/src/searchbar/engine/SearchbarEngine.scala

@@ -4,6 +4,7 @@ import math.Ordering.Implicits.seqOrdering
 
 class SearchbarEngine(pages: List[PageEntry]) {
   def query(query: List[Matchers]): List[PageEntry] = {
-    pages.map(p => p -> query.map(_(p))).filterNot(_(1).exists(_ < 0)).sortBy(_(1)).map(_(0))
+    // Results list is limited to 100 entries for performance reasons
+    pages.map(p => p -> query.map(_(p))).filterNot(_(1).exists(_ < 0)).sortBy(_(1)).map(_(0)).take(100)
   }
 }