Merge pull request #17105 from craftcms/bugfix/17099-nested-element-edit-btn-and-focus

card edit button and focus

Author: brandonkelly

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed a SQL error that could occur when executing an element query, if the `orderBy` param contained unexpected syntax.
 - Fixed a bug where nested element cards could be missing their action menus if their “Max” setting had been reached. ([#17103](https://github.com/craftcms/cms/issues/17103))
+- Fixed a bug where focus wasn’t always returned to the edit button, when closing an element editor slideout. ([#17099](https://github.com/craftcms/cms/issues/17099))
 - Fixed styling issues. ([#17100](https://github.com/craftcms/cms/pull/17100), [#17098](https://github.com/craftcms/cms/issues/17098))
 
 ## 5.7.0 - 2025-04-15

src/helpers/Cp.php

@@ -629,6 +629,8 @@ public static function elementCardHtml(ElementInterface $element, array $config
   if ($cpEditUrl && Garnish.isCtrlKeyPressed(ev.originalEvent)) {
     window.open($cpEditUrl);
   } else {
+    // focus on the button so that when the slideout is closed, it's returned to the button
+    $(ev.currentTarget).focus();
     Craft.createElementEditor($elementType, $settings);
   }
 });

src/web/assets/cp/dist/cp.js

@@ -581,6 +581,8 @@ Craft.NestedElementManager = Garnish.Base.extend(
             // Override the default event listener
             $editBtn.off('activate');
             this.addListener($editBtn, 'activate', (ev) => {
+              // focus on the button so that when the slideout is closed, it's returned to the button
+              $editBtn.focus();
               const cpUrl = $element.data('cpUrl');
               if (cpUrl && Garnish.isCtrlKeyPressed(ev.originalEvent)) {
                 window.open(cpUrl);