@internetarchive/ia-topnav 1.3.5-alpha11 → 1.3.5-alpha13

package/package.json

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

package/src/ia-topnav.js

@@ -293,7 +293,7 @@ export default class IATopNav extends LitElement {
           .selectedMenuOption=${this.selectedMenuOption}
           .mediaSliderOpen=${this.mediaSliderOpen}
           .menus=${this.menus}
-          tabindex="${this.mediaSliderOpen ? '1' : ''}"
+          tabindex="${this.mediaSliderOpen ? '1' : '-1'}"
           @focusToNext=${(e) => this.currentTab = e.detail}
         ></media-slider>
       </div>

package/src/lib/keyboard-navigation.js

@@ -1,6 +1,3 @@
-
-
-
 export default class KeyboardNavigation {
   /**
    * Constructor for the KeyboardNavigation class.

package/src/primary-nav.js

@@ -86,9 +86,14 @@ class PrimaryNav extends TrackedElement {
     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')
-          : this.shadowRoot.querySelector('.user-menu');
+          : lastMediaButton[0]?.shadowRoot.querySelector('a.menu-item');
 
         if (focusElement) {
           focusElement.focus();