Skip to content

Dialog: Workaround broken focus re-triggering in jQuery 3.4/3.5 #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2021
Merged

Dialog: Workaround broken focus re-triggering in jQuery 3.4/3.5 #1946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions ui/widgets/dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,22 +325,23 @@ $.widget( "ui.dialog", {
hasFocus.eq( 0 ).trigger( "focus" );
},

_keepFocus: function( event ) {
function checkFocus() {
var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
isActive = this.uiDialog[ 0 ] === activeElement ||
$.contains( this.uiDialog[ 0 ], activeElement );
if ( !isActive ) {
this._focusTabbable();
}
_restoreTabbableFocus: function() {
var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
isActive = this.uiDialog[ 0 ] === activeElement ||
$.contains( this.uiDialog[ 0 ], activeElement );
if ( !isActive ) {
this._focusTabbable();
}
},

_keepFocus: function( event ) {
event.preventDefault();
checkFocus.call( this );
this._restoreTabbableFocus();

// support: IE
// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
// so we check again later
this._delay( checkFocus );
this._delay( this._restoreTabbableFocus );
},

_createWrapper: function() {
Expand Down Expand Up @@ -853,6 +854,8 @@ $.widget( "ui.dialog", {
return;
}

var jqMinor = $.fn.jquery.substring( 0, 4 );

// We use a delay in case the overlay is created from an
// event that we're going to be cancelling (#2804)
var isOpening = true;
Expand All @@ -874,6 +877,15 @@ $.widget( "ui.dialog", {
if ( !instance._allowInteraction( event ) ) {
event.preventDefault();
instance._focusTabbable();

// Support: jQuery >=3.4 <3.6 only
// Focus re-triggering in jQuery 3.4/3.5 makes the original element
// have its focus event propagated last, breaking the re-targeting.
// Trigger focus in a delay in addition if needed to avoid the issue
// See https://github.com/jquery/jquery/issues/4382
if ( jqMinor === "3.4." || jqMinor === "3.5." ) {
instance._delay( instance._restoreTabbableFocus );
}
}
}.bind( this ) );
}
Expand Down