@internetarchive/ia-topnav 1.3.5-alpha2 → 1.3.5-alpha21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-topnav",
-  "version": "1.3.5-alpha2",
+  "version": "1.3.5-alpha21",
   "description": "Top nav for Internet Archive",
   "license": "AGPL-3.0-only",
   "main": "index.js",

package/src/dropdown-menu.js

@@ -57,6 +57,7 @@ class DropdownMenu extends TrackedElement {
     return html`<a
       href="${formatUrl(link.url, this.baseHost)}"
       class="${link.class}"
+      tabindex="${this.open ? '' : '-1'}"
       @click=${this.trackClick}
       data-event-click-tracking="${this.config.eventCategory}|Nav${link.analyticsEvent}"
       aria-label=${calloutText ? `New feature: ${link.title}` : nothing}>

package/src/ia-topnav.js

@@ -62,6 +62,7 @@ export default class IATopNav extends LitElement {
       username: { type: String },
       userProfileImagePath: { type: String },
       secondIdentitySlotMode: { type: String },
+      currentTab: { type: Object },
     };
   }
 
@@ -77,11 +78,12 @@ export default class IATopNav extends LitElement {
     this.searchIn = '';
     this.selectedMenuOption = '';
     this.secondIdentitySlotMode = '';
+    this.currentTab = {};
   }
 
   updated(props) {
     if (props.has('username') || props.has('localLinks') || props.has('baseHost') ||
-        props.has('waybackPagesArchived') || props.has('itemIdentifier')) {
+      props.has('waybackPagesArchived') || props.has('itemIdentifier')) {
       this.menuSetup();
     }
   }
@@ -89,7 +91,10 @@ export default class IATopNav extends LitElement {
   firstUpdated() {
     // close open menu on `esc` click 
     document.addEventListener('keydown', e => {
-      if (e.key === 'Escape') this.closeMenus();
+      if (e.key === 'Escape') {
+        this.openMenu = '';
+        this.mediaSliderOpen = false;
+      }
     }, false);
   }
 
@@ -199,6 +204,7 @@ export default class IATopNav extends LitElement {
         tabindex="${this.userMenuTabIndex}"
         @menuToggled=${this.menuToggled}
         @trackClick=${this.trackClick}
+        @focusToOtherMenuItem=${(e) => this.currentTab = e.detail}
       ></user-menu>
     `;
   }
@@ -274,6 +280,7 @@ export default class IATopNav extends LitElement {
           .selectedMenuOption=${this.selectedMenuOption}
           .username=${this.username}
           .userProfileImagePath=${this.userProfileImagePath}
+          .currentTab=${this.currentTab}
           ?hideSearch=${this.hideSearch}
           @mediaTypeSelected=${this.mediaTypeSelected}
           @toggleSearchMenu=${this.toggleSearchMenu}
@@ -289,6 +296,8 @@ export default class IATopNav extends LitElement {
           .selectedMenuOption=${this.selectedMenuOption}
           .mediaSliderOpen=${this.mediaSliderOpen}
           .menus=${this.menus}
+          tabindex="${this.mediaSliderOpen ? '1' : '-1'}"
+          @focusToOtherMenuItem=${(e) => this.currentTab = e.detail}
         ></media-slider>
       </div>
       ${this.username ? this.userMenu : this.signedOutDropdown}
@@ -305,6 +314,7 @@ export default class IATopNav extends LitElement {
       <desktop-subnav
         .baseHost=${this.baseHost}
         .menuItems=${this.desktopSubnavMenuItems}
+        @focus=${this.closeMenus}
       ></desktop-subnav>
       <div id="close-layer" class="${this.closeLayerClass}" @click=${this.closeMenus}></div>
     `;

package/src/lib/keyboard-navigation.js

@@ -0,0 +1,128 @@
+export default class KeyboardNavigation {
+  /**
+   * Constructor for the KeyboardNavigation class.
+   * @param {HTMLElement} elementsContainer - The container element that holds the focusable elements.
+   * @param {string} menuOption - The type of menu option ('web' or 'usermenu').
+   */
+  constructor(elementsContainer, menuOption) {
+    this.elementsContainer = elementsContainer;
+    this.menuOption = menuOption;
+    this.focusableElements = this.getFocusableElements();
+    this.focusedIndex = this.getInitialFocusedIndex();
+
+    this.focusableElements[this.focusedIndex]?.focus();
+    this.handleKeyDown = this.handleKeyDown.bind(this);
+  }
+
+  /**
+   * Returns the initial focused index based on the menu option.
+   * @returns {number} The initial focused index (0 for 'web', 1 for 'usermenu').
+   */
+  getInitialFocusedIndex() {
+    return this.menuOption === 'usermenu' ? 1 : 0;
+  }
+
+  /**
+   * Gets an array of focusable elements within the container.
+   * @returns {HTMLElement[]} An array of focusable elements.
+   */
+  getFocusableElements() {
+    const focusableTagSelectors = 'a[href], button, input, [tabindex]:not([tabindex="-1"])';
+    const isDisabledOrHidden = el => !el.hasAttribute('disabled') && !el.getAttribute('aria-hidden');
+
+    let elements;
+    if (this.menuOption === 'web') {
+      // wayback focusable elements
+      const waybackSlider = this.elementsContainer.querySelector('wayback-slider').shadowRoot;
+      const waybackSearch = waybackSlider.querySelector('wayback-search');
+      const waybackSearchElements = Array.from(waybackSearch.shadowRoot.querySelectorAll(focusableTagSelectors));
+
+      const normalElements = Array.from(waybackSlider.querySelectorAll(focusableTagSelectors));
+
+      // wayback save-form focusable elements
+      const savePageForm = waybackSlider.querySelector('save-page-form');
+      const savePageFormElements = Array.from(savePageForm.shadowRoot.querySelectorAll(focusableTagSelectors));
+
+      elements = [...waybackSearchElements, ...normalElements, ...savePageFormElements];
+    } else {
+      elements = this.elementsContainer.querySelectorAll(focusableTagSelectors);
+    }
+
+    return Array.from(elements).filter(isDisabledOrHidden);
+  }
+
+  /**
+   * Handles keyboard events and focuses the appropriate element.
+   * @param {KeyboardEvent} event - The keyboard event object.
+   */
+  handleKeyDown(event) {
+    const { key } = event;
+    const isArrowKey = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'].includes(key);
+    const isTabKey = key === 'Tab';
+
+    if (isArrowKey) {
+      this.handleArrowKey(key);
+      event.preventDefault();
+    } else if (isTabKey) {
+      this.handleTabKey(event);
+    }
+  }
+
+  /**
+   * Handles arrow key events and focuses the next or previous element for topnav sub-nav and usermenu
+   * @param {string} key - The key that was pressed ('ArrowDown', 'ArrowRight', 'ArrowUp', or 'ArrowLeft').
+   */
+  handleArrowKey(key) {
+    const isDownOrRight = ['ArrowDown', 'ArrowRight'].includes(key);
+    isDownOrRight ? this.focusNext() : this.focusPrevious();
+  }
+
+  /**
+   * Focuses the previous focusable element in the container.
+   */
+  focusPrevious() {
+    if (this.focusableElements.length === 0) return;
+    this.focusedIndex = (this.focusedIndex - 1 + this.focusableElements.length) % this.focusableElements.length;
+    this.focusableElements[this.focusedIndex]?.focus();
+  }
+
+  /**
+   * Focuses the next focusable element in the container.
+   */
+  focusNext() {
+    if (this.focusableElements.length === 0) return;
+    this.focusedIndex = (this.focusedIndex + 1) % this.focusableElements.length;
+    this.focusableElements[this.focusedIndex]?.focus();
+  }
+
+  /**
+   * Handles the Tab key event and focuses the next or previous menu item.
+   * @param {KeyboardEvent} event - The keyboard event object.
+   */
+  handleTabKey(event) {
+    if (this.menuOption) {
+      const isShiftPressed = event.shiftKey;
+      this.focusToOtherMenuItems(isShiftPressed);
+    }
+
+    this.focusableElements[this.focusedIndex]?.blur();
+    event.preventDefault();
+  }
+
+  /**
+   * Focuses the other parent menu items based on the provided flag.
+   * @param {boolean} isPrevious - A flag indicating whether to focus the previous menu item.
+   */
+  focusToOtherMenuItems(isPrevious = false) {
+    this.elementsContainer.dispatchEvent(
+      new CustomEvent('focusToOtherMenuItem', {
+        bubbles: true,
+        composed: true,
+        detail: {
+          mediatype: this.menuOption,
+          moveTo: isPrevious ? 'prev' : 'next',
+        },
+      })
+    );
+  }
+}

package/src/media-menu.js

@@ -67,6 +67,7 @@ class MediaMenu extends LitElement {
       config: { type: Object },
       openMenu: { type: String },
       selectedMenuOption: { type: String },
+      currentTab: { type: Object },
     };
   }
 
@@ -75,6 +76,26 @@ class MediaMenu extends LitElement {
     this.config = {};
     this.openMenu = '';
     this.selectedMenuOption = '';
+    this.currentTab = {};
+  }
+
+  updated(props) {
+    if (props.has('currentTab')) {
+      const mediaButtons = Array.from(this.shadowRoot.querySelectorAll('media-button'));
+
+      mediaButtons.map((button, index) => {
+        const linkItem = button.shadowRoot.querySelector('a.menu-item');
+        if (linkItem) {
+          if (linkItem.classList.contains(`${this.selectedMenuOption}`)) {
+            linkItem.classList.remove('selected');
+            linkItem.blur();
+
+            const newFocusIndex = this.currentTab.moveTo === 'next' ? index + 1 : index - 1;
+            mediaButtons[newFocusIndex].shadowRoot.querySelector('a.menu-item').focus();
+          }
+        }
+      });
+    }
   }
 
   get mediaMenuOptionsTemplate() {
@@ -96,6 +117,7 @@ class MediaMenu extends LitElement {
           .mediatype=${menu}
           .openMenu=${this.openMenu}
           .selected=${selected}
+          .selectedMenuOption=${this.selectedMenuOption}
           data-mediatype="${menu}"
         ></media-button>
       `;
@@ -117,7 +139,6 @@ class MediaMenu extends LitElement {
         <div class="overflow-clip">
           <nav
             class="media-menu-inner"
-            aria-hidden="${!this.menuOpened}"
             aria-expanded="${this.menuOpened}"
           >
             <div class="menu-group">

package/src/media-slider.js

@@ -1,6 +1,7 @@
 import { LitElement, html } from 'https://offshoot.prod.archive.org/lit.js';
 import './media-subnav.js';
 import mediaSliderCSS from './styles/media-slider.js';
+import KeyboardNavigation from './lib/keyboard-navigation.js';
 
 class MediaSlider extends LitElement {
   static get styles() {
@@ -26,6 +27,19 @@ class MediaSlider extends LitElement {
     this.selectedMenuOption = 'texts';
   }
 
+  updated(props) {
+    if (props.has('selectedMenuOption') && this.selectedMenuOption) {
+      const container = this.shadowRoot?.querySelector('.has-focused')?.shadowRoot;
+  
+      if (container) {
+        const keyboardNavigation = new KeyboardNavigation(container, this.selectedMenuOption);
+        this.addEventListener('keydown', keyboardNavigation.handleKeyDown);
+        this.removeEventListener('keydown', this.previousKeydownListener);
+        this.previousKeydownListener = keyboardNavigation.handleKeyDown;
+      }
+    }
+  }
+
   shouldUpdate() {
     const scrollPane = this.shadowRoot ? this.shadowRoot.querySelector('.information-menu') : null;
 
@@ -47,49 +61,49 @@ class MediaSlider extends LitElement {
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'audio' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'audio' ? 'has-focused' : 'hidden'}"
                 menu="audio"
                 .menuItems=${this.menus.audio}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'images' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'images' ? 'has-focused' : 'hidden'}"
                 menu="images"
                 .menuItems=${this.menus.images}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'software' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'software' ? 'has-focused' : 'hidden'}"
                 menu="software"
                 .menuItems=${this.menus.software}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'texts' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'texts' ? 'has-focused' : 'hidden'}"
                 menu="texts"
                 .menuItems=${this.menus.texts}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'video' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'video' ? 'has-focused' : 'hidden'}"
                 menu="video"
                 .menuItems=${this.menus.video}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'web' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'web' ? 'has-focused' : 'hidden'}"
                 menu="web"
                 .menuItems=${this.menus.web}
               ></media-subnav>
               <media-subnav
                 .baseHost=${this.baseHost}
                 .config=${this.config}
-                class="${this.selectedMenuOption === 'more' ? '' : 'hidden'}"
+                class="${this.selectedMenuOption === 'more' ? 'has-focused' : 'hidden'}"
                 menu="more"
                 .menuItems=${this.menus.more}
               ></media-subnav>

package/src/nav-search.js

@@ -98,9 +98,8 @@ class NavSearch extends TrackedElement {
             class="search-field"
             placeholder="Search"
             autocomplete="off"
-            tabindex="2"
-            @focus=${this.toggleSearchMenu}
             value=${this.searchQuery || ''}
+            @focus=${this.toggleSearchMenu}
           />
           ${this.searchInsideInput}
           <button

package/src/primary-nav.js

@@ -31,6 +31,7 @@ class PrimaryNav extends TrackedElement {
       userMenuOpen: { type: Boolean },
       username: { type: String },
       userProfileImagePath: { type: String },
+      currentTab: { type: Object },
     };
   }
 
@@ -44,6 +45,7 @@ class PrimaryNav extends TrackedElement {
     this.userMenuOpen = false;
     this.mediaBaseHost = 'https://archive.org';
     this.secondIdentitySlotMode = '';
+    this.currentTab = {};
   }
 
   toggleMediaMenu(e) {
@@ -79,6 +81,33 @@ class PrimaryNav extends TrackedElement {
     );
   }
 
+  updated(props) {
+    const { currentTab } = this;
+    const isUserMenuTab = currentTab && currentTab.mediatype === 'usermenu';
+    if (props.has('currentTab')) {
+      if (isUserMenuTab) {
+        const mediaButtons = Array.from(this.shadowRoot.querySelector('media-menu').shadowRoot.querySelectorAll('media-button'));
+        const lastMediaButton = mediaButtons.filter(element => {
+          return element.shadowRoot.querySelector('a').classList.contains('images')
+        });
+
+        const focusElement = currentTab.moveTo === 'next'
+          ? this.shadowRoot.querySelector('a.upload')
+          : lastMediaButton[0]?.shadowRoot.querySelector('a.menu-item');
+
+        if (focusElement) {
+          focusElement.focus();
+        }
+      } else if (this.currentTab.moveTo === 'next') {
+        if (this.shadowRoot.querySelector('.user-menu')) {
+          this.shadowRoot.querySelector('.user-menu').focus();
+        } else {
+          this.shadowRoot.querySelector('login-button').shadowRoot.querySelectorAll('span a')[0]?.focus();
+        }
+      }
+    }
+  }
+
   get userIcon() {
     const userMenuClass = this.openMenu === 'user' ? 'active' : '';
     const userMenuToolTip = this.openMenu === 'user' ? 'Close user menu' : 'Expand user menu';
@@ -87,7 +116,6 @@ class PrimaryNav extends TrackedElement {
       <button
         class="user-menu ${userMenuClass}"
         title="${userMenuToolTip}"
-        tabindex="-1"
         @click="${this.toggleUserMenu}"
         data-event-click-tracking="${this.config.eventCategory}|NavUserMenu"
       >
@@ -107,7 +135,6 @@ class PrimaryNav extends TrackedElement {
         .config=${this.config}
         .dropdownOpen=${this.signedOutMenuOpen}
         .openMenu=${this.openMenu}
-        tabindex="-1"
         @signedOutMenuToggled=${this.signedOutMenuToggled}
       ></login-button>
     `;
@@ -157,12 +184,8 @@ class PrimaryNav extends TrackedElement {
     return html`
       <a href="${formatUrl('/create', this.baseHost)}"
         class="upload"
-        tabindex="1"
-        @focus=${(e) => {
-          if (e.relatedTarget !== null) {
-            this.toggleSearchMenu(e)
-          }
-        }}>
+        @focus=${this.toggleMediaMenu}
+      >
       ${icons.upload}
       <span>Upload</span>
     </a>`;
@@ -191,6 +214,15 @@ class PrimaryNav extends TrackedElement {
     const mediaMenuTabIndex = this.openMenu === 'media' ? '' : '-1';
     return html`
       <nav class=${this.hideSearch ? 'hide-search' : nothing}>
+        <button
+          class="hamburger"
+          @click="${this.toggleMediaMenu}"
+          data-event-click-tracking="${this.config.eventCategory}|NavHamburger"
+          title="Open main menu"
+        >
+          <icon-hamburger ?active=${this.openMenu === 'media'}></icon-hamburger>
+        </button>
+
         <div class=${`branding ${this.secondLogoClass}`}>
           <a
             href=${formatUrl('/', this.baseHost)}
@@ -198,35 +230,24 @@ class PrimaryNav extends TrackedElement {
             data-event-click-tracking="${this.config.eventCategory}|NavHome"
             title="Go home"
             class="link-home"
-            tabindex="-1"
             >${icons.iaLogo}${logoWordmarkStacked}</a
           >
           ${this.secondLogoSlot}
         </div>
-
-        <div class="right-side-section">
-          ${this.mobileDonateHeart}
-          ${this.searchMenu}
-          ${this.uploadButtonTemplate}
-          ${this.userStateTemplate}
-        </div>
         <media-menu
           .baseHost=${this.baseHost}
           .config=${this.config}
           ?mediaMenuAnimate="${this.mediaMenuAnimate}"
-          tabindex="${mediaMenuTabIndex}"
           .selectedMenuOption=${this.selectedMenuOption}
           .openMenu=${this.openMenu}
+          .currentTab=${this.currentTab}
         ></media-menu>
-        <button
-          class="hamburger"
-          @click="${this.toggleMediaMenu}"
-          tabindex="1"
-          data-event-click-tracking="${this.config.eventCategory}|NavHamburger"
-          title="Open main menu"
-        >
-          <icon-hamburger ?active=${this.openMenu === 'media'}></icon-hamburger>
-        </button>
+        <div class="right-side-section">
+          ${this.mobileDonateHeart}
+          ${this.userStateTemplate}
+          ${this.uploadButtonTemplate}
+          ${this.searchMenu}
+        </div>
       </nav>
     `;
   }

package/src/search-menu.js

@@ -30,26 +30,33 @@ class SearchMenu extends TrackedElement {
   }
 
   firstUpdated() {
-    this.shadowRoot.addEventListener('keyup', (e) => {
-      const searchTypes = this.shadowRoot.querySelectorAll('.search-menu-inner label input[type=radio]');
-      const length = searchTypes.length - 1;
-
-      // early return if searchTypes not found
-      if (!length) return;
-
-      const searchTypeHandler = (index) => {
-        const searchType = searchTypes[index];
-        searchType.checked = true;
-        searchType.dispatchEvent(new Event('change'));
-        searchType.focus();
-      };
-
-      if (e.key === 'Home') {
-        searchTypeHandler(0);
-      } else if (e.key === 'End') {
-        searchTypeHandler(length);
-      }
-    });
+    this.shadowRoot.addEventListener('keydown', e => this.handleKeyDownEvent(e));
+  }
+
+  disconnectedCallback() {
+    // Clean up event listener when the element is removed
+    this.shadowRoot.removeEventListener('keydown', e => this.handleKeyDownEvent(e));
+  }
+
+  handleKeyDownEvent(e) {
+    const searchTypes = this.shadowRoot.querySelectorAll('.search-menu-inner label input[type=radio]');
+
+    const length = searchTypes.length - 1;
+    if (!length) return;
+
+    const searchTypeHandler = (index) => {
+      e.preventDefault();
+      const searchType = searchTypes[index];
+      searchType.checked = true;
+      searchType.dispatchEvent(new Event('change'));
+      searchType.focus();
+    };
+
+    if (e.key === 'Home') {
+      searchTypeHandler(0);
+    } else if (e.key === 'End') {
+      searchTypeHandler(length);
+    }
   }
 
   selectSearchType(e) {
@@ -93,7 +100,7 @@ class SearchMenu extends TrackedElement {
       }
       return html`
         <label @click="${this.selectSearchType}">
-          <input tabindex="3" form="nav-search" type="radio" name="sin" value="${value}" ?checked=${isDefault} @change=${this.searchInChanged} />
+          <input form="nav-search" type="radio" name="sin" value="${value}" ?checked=${isDefault} @change=${this.searchInChanged} />
           Search ${label}
         </label>
       `;
@@ -107,7 +114,7 @@ class SearchMenu extends TrackedElement {
   }
 
   render() {
-    const searchMenuHidden = Boolean(!this.searchMenuOpen).toString();
+    const searchMenuHidden = Boolean(!this.openMenu).toString();
     const searchMenuExpanded = Boolean(this.searchMenuOpen).toString();
 
     if (this.hideSearch) {
@@ -127,7 +134,6 @@ class SearchMenu extends TrackedElement {
             href="${formatUrl('/advancedsearch.php', this.baseHost)}"
             @click=${this.trackClick}
             data-event-click-tracking="${this.config.eventCategory}|NavAdvancedSearch"
-            tabindex="4"
             >Advanced Search</a
           >
         </div>

package/src/styles/dropdown-menu.js

@@ -92,6 +92,7 @@ export default css`
 
   @media (min-width: 890px) {
     nav {
+      display: flex;
       overflow: visible;
       top: 0;
       left: auto;
@@ -146,6 +147,7 @@ export default css`
     a:focus {
       color: var(--linkHoverColor);
       background: var(--linkColor);
+      outline: none;
     }
 
     .initial,

package/src/styles/login-button.js

@@ -42,6 +42,7 @@ export default css`
   span a {
     color: inherit;
     text-decoration: none;
+    outline: 0;
   }
 
   a:hover,

package/src/styles/media-menu.js

@@ -23,10 +23,6 @@ export default css`
 
   /* Mobile view styles */
   @media (max-width: 889px) {
-    .media-menu-container {
-      position: relative;
-    }
-
     .media-menu-inner {
       position: absolute;
       width: 100%;
@@ -39,7 +35,7 @@ export default css`
     .overflow-clip {
       position: absolute;
       z-index: -1; /** needs to be under the navigation, otherwise it intercepts clicks */
-      top: 0;
+      top: 4rem;
       left: 0;
       height: 0;
       width: 100%;

package/src/styles/primary-nav.js

@@ -2,15 +2,13 @@ import { css } from 'https://offshoot.prod.archive.org/lit.js';
 
 export default css`
   button:focus,
-  a:focus,
   input:focus {
     outline: none;
   }
 
   nav {
     position: relative;
-    display: -ms-grid;
-    display: grid;
+    display: flex;
     height: 4rem;
     grid-template-areas: 'hamburger empty heart search user';
     -ms-grid-columns: 4rem minmax(1rem, 100%) 4rem 4rem 4rem;
@@ -29,6 +27,7 @@ export default css`
 
   .right-side-section {
     display: flex;
+    margin-left: auto;
     user-select: none;
   }
   button {
@@ -86,6 +85,9 @@ export default css`
     fill: var(--activeColor);
   }
 
+  .mobile-donate-link {
+    display: inline-block;
+  }
   .mobile-donate-link svg {
     height: 4rem;
     width: 4rem;
@@ -151,8 +153,10 @@ export default css`
     height: 100%;
   }
 
-  .user-menu:hover {
+  button.user-menu:hover,
+  button.user-menu:focus {
     color: var(--linkHoverColor);
+    outline: none;
   }
 
   .user-menu.active {
@@ -170,6 +174,10 @@ export default css`
     text-decoration: none;
     display: inline-flex;
   }
+  a.link-home:focus,
+  a.link-home:focus-visible {
+    outline-offset: 1px;
+  }
 
   @media only screen and (min-width: 890px) and (max-device-width: 905px) {
     .branding.second-logo {
@@ -187,6 +195,13 @@ export default css`
     slot[name='opt-sec-logo'] {
       display: none;
     }
+
+    .right-side-section {
+      display: initial;
+    }
+    .right-side-section .user-info {
+      float: right;
+    }
   }
 
   @media (min-width: 890px) {
@@ -195,12 +210,8 @@ export default css`
       --userIconHeight: 3.2rem;
     }
 
-    .right-side-section {
-      display: contents;
-    }
-
     nav {
-      display: block;
+      display: flex;
       z-index: 4;
       height: 5rem;
       padding-right: 1.5rem;
@@ -210,10 +221,6 @@ export default css`
       display: none;
     }
 
-    .branding {
-      margin-top: 1rem;
-    }
-
     .ia-logo,
     .ia-wordmark {
       margin-right: 10px;
@@ -265,6 +272,9 @@ export default css`
     .upload:hover {
       color: var(--linkHoverColor);
     }
+    .upload:focus-visible {
+      outline: none;
+    }
 
     .upload svg {
       vertical-align: middle;

package/src/styles/search-menu.js

@@ -10,6 +10,7 @@ export default css`
     outline-color: var(--linkColor);
     outline-width: 0.16rem;
     outline-style: auto;
+    outline-offset: 2px !important;
   }
   .search-menu-inner {
     position: absolute;
@@ -89,6 +90,8 @@ export default css`
 
     label {
       padding: 0;
+      font-weight: normal;
+      margin: 0;
     }
 
     label + label {

package/src/user-menu.js

@@ -1,6 +1,7 @@
 import { html } from 'https://offshoot.prod.archive.org/lit.js';
 import DropdownMenu from './dropdown-menu.js';
 import userMenuCSS from './styles/user-menu.js';
+import KeyboardNavigation from './lib/keyboard-navigation.js';
 
 class UserMenu extends DropdownMenu {
   static get styles() {
@@ -21,6 +22,19 @@ class UserMenu extends DropdownMenu {
     this.username = '';
   }
 
+  updated(props) {
+    if (props.has('open') && this.open) {
+      const container = this.shadowRoot?.querySelector('.nav-container');
+
+      if (container) {
+        const keyboardNavigation = new KeyboardNavigation(container, 'usermenu');
+        this.addEventListener('keydown', keyboardNavigation.handleKeyDown);
+        this.removeEventListener('keydown', this.previousKeydownListener);
+        this.previousKeydownListener = keyboardNavigation.handleKeyDown;
+      }
+    }
+  }
+
   render() {
     return html`
       <div class="nav-container">