From afa715c860c59c9b47d59d4514bfc54db1615dae Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Wed, 16 Mar 2022 17:36:39 -0400
Subject: [PATCH] improve docs search a11y

---
 cspell.json                          |  2 ++
 docs/assets/plugins/search/search.js | 27 ++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/cspell.json b/cspell.json
index a6027071f..0f6de2b33 100644
--- a/cspell.json
+++ b/cspell.json
@@ -1,6 +1,7 @@
 {
   "version": "0.2",
   "words": [
+    "activedescendant",
     "allowfullscreen",
     "animationend",
     "Animista",
@@ -63,6 +64,7 @@
     "labelledby",
     "Laravel",
     "LaViska",
+    "listbox",
     "litelement",
     "lowercasing",
     "Lucide",
diff --git a/docs/assets/plugins/search/search.js b/docs/assets/plugins/search/search.js
index 937a89c6b..d8ec37b1f 100644
--- a/docs/assets/plugins/search/search.js
+++ b/docs/assets/plugins/search/search.js
@@ -52,12 +52,21 @@
     siteSearch.hidden = true;
     siteSearch.innerHTML = `
       <div class="site-search__overlay"></div>
-      <div class="site-search__panel">
+      <div
+        id="site-search-panel"
+        class="site-search__panel"
+        role="combobox"
+        aria-expanded="false"
+        aria-owns="site-search-results"
+        aria-activedescendant=""
+      >
         <header class="site-search__header">
           <sl-input
             class="site-search__input"
             type="search"
             placeholder="Search this site"
+            aria-autocomplete="list"
+            aria-controls="site-search-results"
             size="large"
             clearable
           >
@@ -65,7 +74,13 @@
           </sl-input>
         </header>
         <div class="site-search__body">
-          <ul class="site-search__results"></ul>
+          <ul
+            id="site-search-results"
+            class="site-search__results"
+            role="listbox"
+            aria-labelledby="site-search-panel"
+          >
+          </ul>
           <div class="site-search__empty">No results found.</div>
         </div>
         <footer class="site-search__footer">
@@ -100,7 +115,7 @@
       isShowing = true;
       document.body.classList.add('site-search-visible');
       siteSearch.hidden = false;
-      input.focus();
+      requestAnimationFrame(() => input.focus());
       updateResults();
 
       await Promise.all([
@@ -205,6 +220,9 @@
         // Update the selected item
         items.forEach(item => {
           if (item === nextEl) {
+            const a = nextEl.querySelector('a');
+            panel.setAttribute('aria-activedescendant', a.id);
+
             item.setAttribute('aria-selected', 'true');
             nextEl.scrollIntoView({ block: 'nearest' });
           } else {
@@ -237,6 +255,9 @@
           const a = document.createElement('a');
           let icon = 'file-text';
 
+          a.setAttribute('role', 'option');
+          a.setAttribute('id', `search-result-item-${match.ref}`);
+
           if (page.url.includes('getting-started/')) {
             icon = 'lightbulb';
           }