Merge pull request #16535 from craftcms/bugfix/16528-prevent-autofocu…

…s-on-t9n-and-action-menu-btn

prevent autofocus on t9n and action menu btn

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Fixed JavaScript error that occurred if there was problem sending a password-reset email.
 - Fixed an error that could occur when working with an entry whose type is no longer allowed by its section/field. ([#16539](https://github.com/craftcms/cms/issues/16539))
 - Fixed a bug where tooltips were displaying behind slideouts. ([#16529](https://github.com/craftcms/cms/issues/16529))
+- Fixed a bug where field translation indicators and action menu buttons could be autofocussed when creating a new entry within a Matrix field, or opening an element editor slideout. ([#16528](https://github.com/craftcms/cms/issues/16528))
 
 ## 5.6.1 - 2025-01-22
 

src/helpers/Cp.php

@@ -1532,7 +1532,7 @@ public static function fieldHtml(string|callable $input, array $config = []): st
 
         $translationDescription = $config['translationDescription'] ?? Craft::t('app', 'This field is translatable.');
         $translationIconHtml = Html::button('', [
-            'class' => ['t9n-indicator'],
+            'class' => ['t9n-indicator', 'prevent-autofocus'],
             'data' => [
                 'icon' => 'language',
             ],
@@ -1610,7 +1610,7 @@ public static function fieldHtml(string|callable $input, array $config = []): st
                         ($showActionMenu ? static::disclosureMenu($config['actionMenuItems'], [
                             'hiddenLabel' => Craft::t('app', 'Actions'),
                             'buttonAttributes' => [
-                                'class' => ['action-btn', 'small'],
+                                'class' => ['action-btn', 'small', 'prevent-autofocus'],
                             ],
                         ]) : '') .
                         ($showAttribute ? static::renderTemplate('_includes/forms/copytextbtn.twig', [

src/web/assets/matrix/src/MatrixInput.js

@@ -295,7 +295,11 @@
                   // Scroll to the entry
                   Garnish.scrollContainerToElement($entry);
                   // Focus on the first focusable element
-                  $entry.find('.flex-fields :focusable').first().focus();
+                  $entry
+                    .find('.flex-fields :focusable')
+                    .not('.prevent-autofocus')
+                    .first()
+                    .focus();
                 }
 
                 // Resume the element editor

tests/unit/helpers/CpHelperTest.php

@@ -144,7 +144,7 @@ public function testFieldHtml(): void
         self::assertStringContainsString('aria-labelledby="', $fieldset);
         self::assertStringContainsString('role="group"', $fieldset);
         // translatable
-        self::assertStringContainsString('class="t9n-indicator"', Cp::fieldHtml('<input>', ['label' => 'Label', 'translatable' => true]));
+        self::assertStringContainsString('class="t9n-indicator prevent-autofocus"', Cp::fieldHtml('<input>', ['label' => 'Label', 'translatable' => true]));
         // instructions
         $withInstructions = Cp::fieldHtml('<input>', ['instructionsId' => 'inst-id', 'instructions' => '**Test**']);
         self::assertStringContainsString('id="inst-id"', $withInstructions);