From 227fdb8b741a71e300062d80e9471fef87a5ff11 Mon Sep 17 00:00:00 2001 From: Joe Dolson Date: Thu, 14 Sep 2023 22:33:50 +0000 Subject: [PATCH] Media: Fix focus loss when closing Image Rotation menu. Only shift focus into menu when opening the menu. Check `aria-expanded` value of toggle before moving focus. Props joedolson. Fixes #59353. git-svn-id: https://develop.svn.wordpress.org/trunk@56591 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/lib/image-edit.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/js/_enqueues/lib/image-edit.js b/src/js/_enqueues/lib/image-edit.js index 8f44e930be..f1e63a0157 100644 --- a/src/js/_enqueues/lib/image-edit.js +++ b/src/js/_enqueues/lib/image-edit.js @@ -236,8 +236,10 @@ // Open menu and set z-index to appear above image crop area if it is enabled. $target .toggleClass( 'imgedit-popup-menu-open' ).slideToggle( 'fast' ).css( { 'z-index' : 200000 } ); - // Move focus to first item in menu. - $target.find( 'button' ).first().trigger( 'focus' ); + // Move focus to first item in menu when opening menu. + if ( 'true' === $el.attr( 'aria-expanded' ) ) { + $target.find( 'button' ).first().trigger( 'focus' ); + } return false; },