vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Administration: Fix unusable mobile admin menu in Safari.

Browse Source 
Replace the `focusout` event handler added in [55326] with a combination of `blur` and `keyup` handler. This change handles Safari not setting focus on clicked elements.

Props afercia, joedolson, travel_girl, oglekler, rajinsharwar, marybaum, rcorrales, binsaifullah, shubhamsedani, ashikur698.
Fixes #58912.

git-svn-id: https://develop.svn.wordpress.org/trunk@56810 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Joe Dolson 2023-10-09 23:00:11 +00:00
parent fbe3732917
commit 93cc3b17a0
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/js/_enqueues/admin/common.js
View File

@ -1702,24 +1702,45 @@ $( function() {
}
} );
// Close sidebar when focus moves outside of toggle and sidebar.
$( '#wp-admin-bar-menu-toggle, #adminmenumain' ).on( 'focusout', function() {
var focusIsInToggle, focusIsInSidebar;
// Close sidebar when target moves outside of toggle and sidebar.
$( document ).on( 'click', function( event ) {
if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) || ! document.hasFocus() ) {
return;
}
// A brief delay is required to allow focus to switch to another element.
setTimeout( function() {
focusIsInToggle = $.contains( $( '#wp-admin-bar-menu-toggle' )[0], $( ':focus' )[0] );
focusIsInSidebar = $.contains( $( '#adminmenumain' )[0], $( ':focus' )[0] );
if ( ! focusIsInToggle && ! focusIsInSidebar ) {
$( '#wp-admin-bar-menu-toggle' ).trigger( 'click.wp-responsive' );
}
}, 10 );
var focusIsInToggle = $.contains( $( '#wp-admin-bar-menu-toggle' )[0], event.target );
var focusIsInSidebar = $.contains( $( '#adminmenuwrap' )[0], event.target );
if ( ! focusIsInToggle && ! focusIsInSidebar ) {
$( '#wp-admin-bar-menu-toggle' ).trigger( 'click.wp-responsive' );
}
} );
// Close sidebar when a keypress completes outside of toggle and sidebar.
$( document ).on( 'keyup', function( event ) {
var toggleButton = $( '#wp-admin-bar-menu-toggle' )[0];
if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) ) {
return;
}
if ( 27 === event.keyCode ) {
$( toggleButton ).trigger( 'click.wp-responsive' );
$( toggleButton ).find( 'a' ).trigger( 'focus' );
} else {
if ( 9 === event.keyCode ) {
var sidebar = $( '#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 );
if ( ! focusIsInToggle && ! focusIsInSidebar ) {
$( toggleButton ).trigger( 'click.wp-responsive' );
}
}, 10 );
}
}
});
// Add menu events.
$adminmenu.on( 'click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {