From 51f13935f6fad80cad4a22772b296c90c6b80775 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Wed, 16 Aug 2023 11:03:01 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20fix(modal):=20modal=20dialog?= =?UTF-8?q?=20trapfocus=20issue=20with=20tinymce=20link=20input.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/shared-ui/modal-dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/shared-ui/modal-dialog.js b/assets/js/shared-ui/modal-dialog.js index 7d94f4c5..7f0ea6eb 100644 --- a/assets/js/shared-ui/modal-dialog.js +++ b/assets/js/shared-ui/modal-dialog.js @@ -846,7 +846,7 @@ aria.Dialog.prototype.trapFocus = function( event ) { - if ( aria.Utils.IgnoreUtilFocusChanges ) { + if ( aria.Utils.IgnoreUtilFocusChanges || ( event.target.parentElement && event.target.parentElement.classList.contains( 'wp-link-input' ) ) ) { return; } From 27495b5a1f30d792b15fc54b9d783fb478bf3068 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Fri, 18 Aug 2023 09:42:08 +0530 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix(modal):=20modal=20dialog?= =?UTF-8?q?=20trapfocus=20issue=20with=20tinymce=20link=20input.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/js/shared-ui/modal-dialog.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/js/shared-ui/modal-dialog.js b/assets/js/shared-ui/modal-dialog.js index 7f0ea6eb..a3991e7c 100644 --- a/assets/js/shared-ui/modal-dialog.js +++ b/assets/js/shared-ui/modal-dialog.js @@ -845,8 +845,9 @@ }; // end removeListeners. aria.Dialog.prototype.trapFocus = function( event ) { + const { parentElement } = event.target; - if ( aria.Utils.IgnoreUtilFocusChanges || ( event.target.parentElement && event.target.parentElement.classList.contains( 'wp-link-input' ) ) ) { + if ( aria.Utils.IgnoreUtilFocusChanges || ( parentElement && parentElement.classList.contains( 'wp-link-input' ) ) ) { return; }