Automatically publish Scala3doc with Scala.js files

Author: BarkingBad

project/Build.scala

@@ -1634,6 +1634,19 @@ object Build {
           ),
           Compile / buildInfoKeys := Seq[BuildInfoKey](version),
           Compile / buildInfoPackage := "dotty.dokka",
+          Compile / resourceGenerators += Def.task {
+            val jsDestinationFile = (Compile / resourceManaged).value / "dotty_res" / "scripts" / "searchbar.js"
+            sbt.IO.copyFile((fullOptJS in Compile in `scala3doc-js`).value.data, jsDestinationFile)
+            Seq(jsDestinationFile)
+          }.taskValue,
+          Compile / resourceGenerators += Def.task {
+            val cssDesitnationFile = (Compile / resourceManaged).value / "dotty_res" / "styles" / "scala3doc-searchbar.css"
+            val cssSourceFile = (resourceDirectory in Compile in `scala3doc-js`).value / "scala3doc-searchbar.css"
+            FileFunction.cached(streams.value.cacheDirectory / "css-cache") { (in: Set[File]) =>
+              in.headOption.map(sbt.IO.copyFile(_, cssDesitnationFile))
+              Set(cssDesitnationFile)
+            }.apply(Set(cssSourceFile)).toSeq
+          }.taskValue,
           testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
           buildInfoPackage in Test := "dotty.dokka.test",
           BuildInfoPlugin.buildInfoScopedSettings(Test),

scala3doc-js/resources/scala3doc-searchbar.css

@@ -2,6 +2,35 @@
     --inkuire-logo-size: 20px;
 }
 
+/* button */
+.search span {
+    background: #ED3522;
+    fill: #fff;
+    cursor: pointer;
+    border: none;
+    padding: 9px;
+    border-radius: 24px;
+    box-shadow: 0 0 16px #F27264;
+}
+.search span:hover {
+    fill: #F27264;
+}
+
+@media(max-width: 576px) {
+    .search span {
+        background: none;
+        fill: var(--icon-color);
+        cursor: pointer;
+        border: none;
+        padding: 0;
+        box-shadow: none;
+        margin-top: 2px;
+    }
+    .search span:hover {
+        fill: var(--link-hover-fg);
+    }
+}
+
 #scala3doc-search {
     margin-top: 2px;
     cursor: pointer;
@@ -11,13 +40,6 @@
     z-index: 5;
 }
 
-#scala3doc-search::before {
-    content: "";
-    display:block;
-    height: var(--inkuire-logo-size);
-    width: var(--inkuire-logo-size);
-}
-
 #scala3doc-searchbar.hidden {
     display: none;
 }

scala3doc-js/src/Main.scala

@@ -4,4 +4,4 @@ object Main extends App {
   def initializeSearchbar(): Unit = Searchbar()
 
   initializeSearchbar()
-}
+}

scala3doc-js/src/searchbar/SearchbarComponent.scala

@@ -3,9 +3,9 @@ package dotty.dokka
 import org.scalajs.dom._
 import org.scalajs.dom.html.Input
 
-class SearchbarComponent(val callback: (String) => List[PageEntry]) {
+class SearchbarComponent(val callback: (String) => List[PageEntry]):
   extension (p: PageEntry)
-    def toHTML = {
+    def toHTML =
       val wrapper = document.createElement("div")
       wrapper.classList.add("scala3doc-searchbar-result")
       wrapper.classList.add("monospace")
@@ -22,41 +22,53 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]) {
       wrapper.appendChild(resultA)
       wrapper.appendChild(location)
       wrapper
-    }
 
-  def handleNewQuery(query: String) = {
+  def handleNewQuery(query: String) =
     val result = callback(query).map(_.toHTML)
     while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
     result.foreach(resultsDiv.appendChild)
-  }
 
-  private val logoClick: html.Span = {
-    val element = document.createElement("span").asInstanceOf[html.Span]
-    element.id = "scala3doc-search"
-    element.onclick = (event: Event) =>
+  private val logoClick: html.Div =
+    val span = document.createElement("span").asInstanceOf[html.Span]
+    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
-    document.getElementById("searchBar").appendChild(element)
+
+    val element = createNestingDiv("search-content")(
+      createNestingDiv("search-conatiner")(
+        createNestingDiv("search")(
+          span
+        )
+      )
+    )
+    document.getElementById("scala3doc-searchBar").appendChild(element)
     element
-  }
 
-  private val input: html.Input = {
+
+  private val input: html.Input =
     val element = document.createElement("input").asInstanceOf[html.Input]
     element.id = "scala3doc-searchbar-input"
     element.addEventListener("input", (e) => handleNewQuery(e.target.asInstanceOf[html.Input].value))
     element
-  }
 
-  private val resultsDiv: html.Div = {
+  private val resultsDiv: html.Div =
     val element = document.createElement("div").asInstanceOf[html.Div]
     element.id = "scala3doc-searchbar-results"
     element
-  }
 
   private val rootHiddenClasses = "hidden"
   private val rootShowClasses   = ""
-  private val rootDiv: html.Div = {
+
+  private def createNestingDiv(className: String)(innerElement: html.Element): html.Div =
+    val element = document.createElement("div").asInstanceOf[html.Div]
+    element.className = className
+    element.appendChild(innerElement)
+    element
+
+  private val rootDiv: html.Div =
     val element = document.createElement("div").asInstanceOf[html.Div]
     element.addEventListener("click", (e: Event) => e.stopPropagation())
     logoClick.addEventListener("click", (e: Event) => e.stopPropagation())
@@ -67,7 +79,5 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]) {
     element.appendChild(resultsDiv)
     document.body.appendChild(element)
     element
-  }
 
   handleNewQuery("")
-}

scala3doc/resources/dotty_res/styles/search-bar.css

@@ -9,20 +9,6 @@
   background: none;
 }
 
-/* button */
-.search button {
-  background: #ED3522;
-  fill: #fff;
-  cursor: pointer;
-  border: none;
-  padding: 9px;
-  border-radius: 24px;
-  box-shadow: 0 0 16px #F27264;
-}
-.search button:hover {
-  fill: #F27264;
-}
-
 /* popup */
 .popup-wrapper {
   box-shadow: 0 0 10px var(--border-light) !important;
@@ -58,18 +44,6 @@
 
 /* Portrait phones */
 @media(max-width: 576px) {
-  .search button {
-    background: none;
-    fill: var(--icon-color);
-    cursor: pointer;
-    border: none;
-    padding: 0;
-    box-shadow: none;
-    margin-top: 2px;
-  }
-  .search button:hover {
-    fill: var(--link-hover-fg);
-  }
   .search-content {
     margin: 0 !important;
     top: 9px !important;
@@ -88,4 +62,4 @@
     min-width: 100%;
     width: auto !important;
   }
-}
+}

scala3doc/src/dotty/dokka/preprocessors/ScalaEmbeddedResourceApppender.scala

@@ -21,6 +21,7 @@ class ScalaEmbeddedResourceAppender extends PageTransformer {
           "styles/diagram.css",
           "styles/filter-bar.css",
           "styles/search-bar.css",
+          "styles/scala3doc-searchbar.css",
           "https://code.jquery.com/jquery-3.5.1.min.js",
           "https://d3js.org/d3.v6.min.js",
           "https://cdn.jsdelivr.net/npm/[email protected]/dist/graphlib-dot.min.js",
@@ -36,7 +37,8 @@ class ScalaEmbeddedResourceAppender extends PageTransformer {
           "scripts/components/Input.js",
           "scripts/components/FilterGroup.js",
           "scripts/components/Filter.js",
-          "scripts/data.js"
+          "scripts/data.js",
+          "scripts/searchbar.js"
         )).asJava,
         page.getChildren
       )

scala3doc/src/dotty/renderers/ScalaHtmlRenderer.scala

@@ -279,7 +279,7 @@ class ScalaHtmlRenderer(using ctx: DokkaContext) extends HtmlRenderer(ctx) {
               div (id := "leftToggler")(
                 span(cls := "icon-toggler")
               ),
-              div(id := "searchBar"),
+              div(id := "scala3doc-searchBar"),
               main(
                 raw(buildWithKotlinx(kotlinxContent))
               ),
@@ -297,8 +297,7 @@ class ScalaHtmlRenderer(using ctx: DokkaContext) extends HtmlRenderer(ctx) {
               )
             )
           ),
-          script(`type` := "text/javascript", src := resolveRoot(page, "scripts/pages.js")),
-          script(`type` := "text/javascript", src := resolveRoot(page, "scripts/main.js"))
+          script(`type` := "text/javascript", src := resolveRoot(page, "scripts/pages.js"))
       )
     ).toString