Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/js/_enqueues/admin/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -1789,34 +1789,38 @@ $( function() {
return;
}

var focusIsInToggle = $.contains( $( '#wp-admin-bar-menu-toggle' )[0], event.target );
var focusIsInSidebar = $.contains( $( '#adminmenuwrap' )[0], event.target );
var toggleButton = $( '#wp-admin-bar-menu-toggle' )[0];
var sidebar = $( '#adminmenumain' )[0] || $( '#adminmenuwrap' )[0];
var focusIsInToggle = toggleButton && ( toggleButton === event.target || $.contains( toggleButton, event.target ) );
var focusIsInSidebar = sidebar && ( sidebar === event.target || $.contains( sidebar, event.target ) );

if ( ! focusIsInToggle && ! focusIsInSidebar ) {
$( '#wp-admin-bar-menu-toggle' ).trigger( 'click.wp-responsive' );
$wpwrap.removeClass( 'wp-responsive-open' );
$( '#wp-admin-bar-menu-toggle a' ).attr( 'aria-expanded', 'false' );
}
} );

// Close sidebar when a keypress completes outside of toggle and sidebar.
$( document ).on( 'keyup', function( event ) {
var toggleButton = $( '#wp-admin-bar-menu-toggle' )[0];
var toggleButton = $( '#wp-admin-bar-menu-toggle' )[0];
if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) ) {
return;
return;
}
if ( 27 === event.keyCode ) {
$( toggleButton ).trigger( 'click.wp-responsive' );
$( toggleButton ).find( 'a' ).trigger( 'focus' );
$wpwrap.removeClass( 'wp-responsive-open' );
$( toggleButton ).find( 'a' ).attr( 'aria-expanded', 'false' ).trigger( 'focus' );
} else {
if ( 9 === event.keyCode ) {
var sidebar = $( '#adminmenuwrap' )[0];
var sidebar = $( '#adminmenumain' )[0] || $( '#adminmenuwrap' )[0];
var focusedElement = event.relatedTarget || document.activeElement;
// A brief delay is required to allow focus to switch to another element.
setTimeout( function() {
var focusIsInToggle = $.contains( toggleButton, focusedElement );
var focusIsInSidebar = $.contains( sidebar, focusedElement );
var focusIsInToggle = toggleButton && ( toggleButton === focusedElement || $.contains( toggleButton, focusedElement ) );
var focusIsInSidebar = sidebar && ( sidebar === focusedElement || $.contains( sidebar, focusedElement ) );

if ( ! focusIsInToggle && ! focusIsInSidebar ) {
$( toggleButton ).trigger( 'click.wp-responsive' );
$wpwrap.removeClass( 'wp-responsive-open' );
$( toggleButton ).find( 'a' ).attr( 'aria-expanded', 'false' );
}
}, 10 );
}
Expand Down
16 changes: 9 additions & 7 deletions src/wp-admin/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -4152,8 +4152,16 @@ img {
margin-top: -2px;
}

.wp-responsive-open #wpbody {
/* Disable horizontal scroll when responsive menu is open
since we push the main content and footer off to the right. */
#wpwrap.wp-responsive-open {
overflow-x: hidden;
}

.wp-responsive-open #wpcontent,
.wp-responsive-open #wpfooter {
right: -16em;
left: auto;
}

code {
Expand Down Expand Up @@ -4382,12 +4390,6 @@ img {

/* Smartphone */
@media screen and (max-width: 600px) {
/* Disable horizontal scroll when responsive menu is open
since we push the main content off to the right. */
#wpwrap.wp-responsive-open {
overflow-x: hidden;
}

html.wp-toolbar {
padding-top: 0;
}
Expand Down
Loading