diff --git a/src/js/_enqueues/admin/common.js b/src/js/_enqueues/admin/common.js index 43534fe60714b..13ae77892ffe8 100644 --- a/src/js/_enqueues/admin/common.js +++ b/src/js/_enqueues/admin/common.js @@ -1825,16 +1825,34 @@ $( function() { // Add menu events. $adminmenu.on( 'click.wp-responsive', 'li.wp-has-submenu > a', function( event ) { + var $link, $menuItem, state; + if ( ! $adminmenu.data('wp-responsive') ) { return; } - let state = ( 'false' === $( this ).attr( 'aria-expanded' ) ) ? 'true' : 'false'; - $( this ).parent( 'li' ).toggleClass( 'selected' ); - $( this ).attr( 'aria-expanded', state ); - $( this ).trigger( 'focus' ); + + $link = $( this ); + $menuItem = $link.parent( 'li' ); + state = ( 'false' === $link.attr( 'aria-expanded' ) ) ? 'true' : 'false'; + + $adminmenu.find( 'li.selected' ).not( $menuItem ).removeClass( 'selected' ) + .children( 'a' ).attr( 'aria-expanded', 'false' ); + + $menuItem.toggleClass( 'selected' ); + $link.attr( 'aria-expanded', state ); + $link.trigger( 'focus' ); event.preventDefault(); }); + $adminmenu.on( 'click.wp-responsive', '.wp-submenu a', function() { + if ( ! $adminmenu.data( 'wp-responsive' ) ) { + return; + } + + $adminmenu.find( 'li.selected' ).removeClass( 'selected' ) + .children( 'a' ).attr( 'aria-expanded', 'false' ); + }); + self.trigger(); $document.on( 'wp-window-resized.wp-responsive', this.trigger.bind( this ) ); @@ -1885,6 +1903,8 @@ $( function() { } $adminmenu.data( 'wp-responsive', 1 ); + $adminmenu.find( 'li.selected' ).not( '.wp-has-current-submenu' ).removeClass( 'selected' ) + .children( 'a' ).attr( 'aria-expanded', 'false' ); this.disableSortables(); }, diff --git a/src/wp-admin/css/admin-menu.css b/src/wp-admin/css/admin-menu.css index 3f8158cc01953..06ad951f4dd21 100644 --- a/src/wp-admin/css/admin-menu.css +++ b/src/wp-admin/css/admin-menu.css @@ -93,14 +93,14 @@ } #adminmenu a:hover, -#adminmenu li.menu-top > a:focus, +#adminmenu li.menu-top > a:focus-visible, #adminmenu .wp-submenu a:hover, -#adminmenu .wp-submenu a:focus { +#adminmenu .wp-submenu a:focus-visible { color: #72aee6; } #adminmenu a:hover, -#adminmenu a:focus, +#adminmenu a:focus-visible, .folded #adminmenu .wp-submenu-head:hover { box-shadow: inset 4px 0 0 0 currentColor; transition: box-shadow 0.1s linear; @@ -159,7 +159,7 @@ /* ensure that wp-submenu's box shadow doesn't appear on top of the focused menu item's background. */ #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, -#adminmenu li > a.menu-top:focus { +#adminmenu li > a.menu-top:focus-visible { position: relative; background-color: #1d2327; color: #72aee6; @@ -167,7 +167,7 @@ .folded #adminmenu li.menu-top:hover, .folded #adminmenu li.opensub > a.menu-top, -.folded #adminmenu li > a.menu-top:focus { +.folded #adminmenu li > a.menu-top:focus-visible { z-index: 10000; } @@ -656,7 +656,7 @@ li#wp-admin-bar-menu-toggle { .auto-fold #adminmenu li.menu-top:hover, .auto-fold #adminmenu li.opensub > a.menu-top, - .auto-fold #adminmenu li > a.menu-top:focus { + .auto-fold #adminmenu li > a.menu-top:focus-visible { z-index: 10000; } diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss index 6b5541411c1e9..4a4bf49c53aa6 100644 --- a/src/wp-admin/css/colors/_admin.scss +++ b/src/wp-admin/css/colors/_admin.scss @@ -270,7 +270,7 @@ input[type="radio"]:focus { #adminmenu a:hover, #adminmenu li.menu-top:hover, #adminmenu li.opensub > a.menu-top, -#adminmenu li > a.menu-top:focus { +#adminmenu li > a.menu-top:focus-visible { color: variables.$menu-highlight-text; background-color: variables.$menu-highlight-background; } diff --git a/src/wp-admin/css/view-transitions.css b/src/wp-admin/css/view-transitions.css index 78adf39075692..9d6fa72a53334 100644 --- a/src/wp-admin/css/view-transitions.css +++ b/src/wp-admin/css/view-transitions.css @@ -3,6 +3,8 @@ navigation: auto; } + #adminmenu > .menu-top.wp-has-current-submenu, + #adminmenu > .menu-top.current { /* * Give each top-level menu item its own view transition name — its id, * such as "menu-posts" — so each one is captured as an independent group diff --git a/tests/phpunit/tests/view-transitions/wpEnqueueViewTransitionsAdminCss.php b/tests/phpunit/tests/view-transitions/wpEnqueueViewTransitionsAdminCss.php index 2ff70a2bfdc16..7835edeee3e7c 100644 --- a/tests/phpunit/tests/view-transitions/wpEnqueueViewTransitionsAdminCss.php +++ b/tests/phpunit/tests/view-transitions/wpEnqueueViewTransitionsAdminCss.php @@ -42,6 +42,7 @@ public function test_inline_css_included() { $this->assertIsArray( $after_data, 'Expected `after` data to be an array.' ); $css = wp_get_view_transitions_admin_css(); $this->assertStringContainsString( '@view-transition', $css ); + $this->assertStringContainsString( '.menu-top.wp-has-current-submenu', $css ); $this->assertContains( $css, $after_data ); }