search in topbar

BaseSecrete · Sep 13, 2024 · 7a0b48b · 7a0b48b
1 parent 0d93d80
commit 7a0b48b
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 40 deletions.
diff --git a/.../template/rorvswild/_sidebar_search.rhtml → ...r/template/rorvswild/_dialog_search.rhtml b/.../template/rorvswild/_sidebar_search.rhtml → ...r/template/rorvswild/_dialog_search.rhtml
@@ -1,4 +1,4 @@
-<div id="search-section" role="search" class="project-section initially-hidden">
+<dialog id="search-dialog" role="search" class="search-dialog initially-hidden">
   <form action="#" method="get" accept-charset="utf-8">
     <div id="search-field-wrapper">
       <input id="search-field" role="combobox" aria-label="Search"
@@ -9,6 +9,7 @@
 
     <ul id="search-results" aria-label="Search Results"
         aria-busy="false" aria-expanded="false"
-        aria-atomic="false" class="initially-hidden"></ul>
+        aria-atomic="false" class="initially-hidden">
+    </ul>
   </form>
-</div>
+</dialog>
diff --git a/lib/rdoc/generator/template/rorvswild/_navigation.rhtml b/lib/rdoc/generator/template/rorvswild/_navigation.rhtml
@@ -1,7 +1,4 @@
 <nav id="navigation" role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
   <%= render '_sidebar_classes.rhtml' %>
   <%= render '_sidebar_pages.rhtml' %>
   <%= render '_footer.rhtml' %>

diff --git a/lib/rdoc/generator/template/rorvswild/_topbar.rhtml b/lib/rdoc/generator/template/rorvswild/_topbar.rhtml
@@ -1,4 +1,9 @@
 <header class="topbar">
   <%= render '_sidebar_toggle.rhtml' %>
   <a href="<%= rel_prefix %>/index.html" rel="home"><%= @options.title %></a>
-</header>
+  <button type="button" aria-label="Search" class="search-button">
+    search
+  </button>
+</header>
+
+<%= render '_dialog_search.rhtml' %>
diff --git a/lib/rdoc/generator/template/rorvswild/css/rdoc.css b/lib/rdoc/generator/template/rorvswild/css/rdoc.css
@@ -449,6 +449,39 @@ nav.contextual {
 }
 
 /* 9. Search */
+
+.search-button {
+  background-color: var(--color-background);
+  border: none;
+  border-radius: 4px;
+  color:var(--color-text-light);
+  box-shadow: none;
+}
+
+.search-button:hover,
+.search-button:focus {
+  color:var(--color-text);
+}
+
+.search-dialog {
+  background-color: var(--color-background);
+  width: calc(100% - 4em);
+  max-width: 1000px;
+  max-height: calc(100svh - 80px);
+  margin: 0 auto;
+  top: 40px;
+  border: 0;
+  border-radius: 8px;
+  box-shadow: 
+    0 0 0 1px var(--color-border), 
+    0 0 24px 8px oklch(0.02 0.05 269 /1);
+}
+
+.search-dialog::backdrop {
+  background-color: oklch(0.1 0.02 269 /0.9);
+  backdrop-filter: blur(4px);
+}
+
 #search-section {
   padding: 1em 1em 0;
   background-color: var(--color-background);
@@ -466,16 +499,14 @@ nav.contextual {
   padding: 0.5em 1em 0.5em 2em;
   border: 1px solid var(--color-border);
   color: var(--color-text);
-  border-radius: 20px;
+  border-radius: 4px;
   font-size: 14px;
   outline: none;
   transition: border-color 0.3s ease;
   background-color: var(--color-background);
 }
 
-#search-field:focus {
-  border-color: var(--color-primary);
-}
+#search-field:focus { border-color: var(--color-primary); }
 
 #search-field::placeholder {
   color: var(--color-text);
@@ -493,7 +524,6 @@ nav.contextual {
   opacity: 0.6;
 }
 
-/* 10. Utility Classes */
 .hide { display: none !important; }
 .initially-hidden { display: none; }
 
@@ -586,9 +616,7 @@ em {
   font-weight: bold;
 }
 
-.method-detail {
-  margin: 1.5rem 0 0;
-}
+.method-detail { margin: 1.5rem 0 0; }
 
 .method-detail + .method-detail {
   margin: 1.5rem 0 0;
@@ -650,7 +678,12 @@ em {
 }
 
 /* @group search results */
-#search-results { font-weight: 300; }
+#search-results { 
+  margin: 0;
+  color: var(--color-text);
+}
+
+#search-results li:first-of-type { margin-top: 2rem; }
 
 #search-results .search-match { font-weight: normal; }
 
@@ -690,21 +723,12 @@ em {
 /* 11. Media Queries */
 
 @media (max-width: 480px) {
-  nav { width: 100%; }
-
   main {
     margin: 1em auto;
     padding: 0 1em;
     max-width: 100%;
   }
 
-  #navigation-toggle {
-    right: 10px;
-    left: auto;
-  }
-
-  #navigation-toggle[aria-expanded="true"] { left: auto; }
-
   table {
     display: block;
     overflow-x: auto;
@@ -778,8 +802,7 @@ em {
 
     --color-topbar: oklch(0.5 0.18 29);
     --color-topbar-text: oklch(0.99 0.001 269);
-
-    /* greys */
+
     --color-text: oklch(0.84 0.02 269);
     --color-text-light: oklch(0.74 0.02 269);
     --color-title: oklch(0.91 0.02 269);
@@ -791,7 +814,6 @@ em {
 
   pre,
   code {
-    /* syntax highlighting */
     --color-constant: oklch(0.84 0.09 260);  /* Bright blue for constants */
     --color-keyword: var(--color-primary);  /* Red for keywords */
     --color-ivar: oklch(0.85 0.09 59);  /* Orange for instance variables */

diff --git a/lib/rdoc/generator/template/rorvswild/js/darkfish.js b/lib/rdoc/generator/template/rorvswild/js/darkfish.js
@@ -40,11 +40,33 @@ function hookSourceViews() {
 };
 
 function hookSearch() {
+
+  const searchButton = document.querySelector('button[aria-label="Search"]');
+  const searchDialog = document.getElementById('search-dialog');
+
+  if (searchButton && searchDialog) {
+    searchButton.addEventListener('click', function(event) {
+      event.preventDefault();
+      searchDialog.showModal();
+      searchDialog.querySelector('input[name="q"]').focus();
+    });
+  }
+
+  // Close dialog when clicking on the backdrop
+  searchDialog.addEventListener('click', function(event) {
+    const rect = this.getBoundingClientRect();
+    const isInDialog = (rect.top <= event.clientY && event.clientY <= rect.top + rect.height &&
+                        rect.left <= event.clientX && event.clientX <= rect.left + rect.width);
+    if (!isInDialog) {
+      this.close();
+    }
+  });
+
   var input  = document.querySelector('#search-field');
   var result = document.querySelector('#search-results');
   result.classList.remove("initially-hidden");
 
-  var search_section = document.querySelector('#search-section');
+  var search_section = document.querySelector('#search-dialog');
   search_section.classList.remove("initially-hidden");
 
   var search = new Search(search_data, input, result);

diff --git a/lib/rdoc/generator/template/rorvswild/servlet_not_found.rhtml b/lib/rdoc/generator/template/rorvswild/servlet_not_found.rhtml
@@ -2,11 +2,6 @@
 <%= render '_sidebar_toggle.rhtml' %>
 
 <nav id="navigation" role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_navigation.rhtml' %>
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
   <%= render '_sidebar_pages.rhtml' %>
   <%= render '_sidebar_classes.rhtml' %>
 

diff --git a/lib/rdoc/generator/template/rorvswild/servlet_root.rhtml b/lib/rdoc/generator/template/rorvswild/servlet_root.rhtml
@@ -8,8 +8,6 @@
         <a href="<%= rel_prefix %>/" rel="home">Home</a>
       </h2>
     </div>
-
-    <%= render '_sidebar_search.rhtml' %>
   </div>
 
   <%= render '_sidebar_installed.rhtml' %>

diff --git a/lib/rdoc/generator/template/rorvswild/table_of_contents.rhtml b/lib/rdoc/generator/template/rorvswild/table_of_contents.rhtml
@@ -1,10 +1,6 @@
 <body id="top" class="table-of-contents">
 
 <nav id="navigation" role="navigation">
-  <div id="project-navigation">
-    <%= render '_sidebar_search.rhtml' %>
-  </div>
-
   <%= render '_footer.rhtml' %>
 </nav>
 <main role="main">
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,8 +8,6 @@ @@
             <a href="<%= rel_prefix %>/" rel="home">Home</a>
           </h2>
         </div>
-        <%= render '_sidebar_search.rhtml' %>
       </div>
       <%= render '_sidebar_installed.rhtml' %>
@@ Expand Down @@