Changeset 59514

Timestamp:

12/14/2024 01:30:07 AM (5 months ago)

Author:

joedolson

Message:

Comments: Avoid reverting comment reply when context menu is open.

Fix a bug where a comment reply would be discarded if esc was pressed to dismiss the context menu in Safari or Firefox.

Checks whether the contextmenu is open and ignores the esc key if it is.

Props yellowafterlife, yogeshbhutkar, joedolson.
Fixes #62346.

File:

• trunk/src/js/_enqueues/admin/edit-comments.js (modified) (2 diffs)

trunk/src/js/_enqueues/admin/edit-comments.js

@@ -1021 +1021 @@
         setTimeout(function() {
             var rtop, rbottom, scrollTop, vp, scrollBottom,
-                isComposing = false;
+                isComposing = false,
+                isContextMenuOpen = false;
 
             rtop = $('#replyrow').offset().top;
@@ -1036 +1037 @@
             $( '#replycontent' )
                 .trigger( 'focus' )
+                .on( 'contextmenu keydown', function ( e ) {
+                    // Check if the context menu is open and set state.
+                    if ( e.type === 'contextmenu' ) {
+                        isContextMenuOpen = true;
+                    }
+
+                    // Update the context menu state if the Escape key is pressed.
+                    if ( e.type === 'keydown' && e.which === 27 && isContextMenuOpen ) {
+                        isContextMenuOpen = false;
+                    }
+                } )
                 .on( 'keyup', function( e ) {
-                    // Close on Escape except when Input Method Editors (IMEs) are in use.
-                    if ( e.which === 27 && ! isComposing ) {
+                    // Close on Escape unless Input Method Editors (IMEs) are in use or the context menu is open.
+                    if ( e.which === 27 && ! isComposing && ! isContextMenuOpen ) {
                         commentReply.revert();
                     }