Fix Garnish.setFocusWithin() when the first focusable element is a ch…

…eckbox Resolves #11498
craftcms · Jun 24, 2022 · 07af564 · 07af564
1 parent 91136f6
commit 07af564
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft CMS 3.x
 
+## Unreleased
+
+### Fixed
+- Fixed a bug where `Garnish.setFocusWithin()` wasn’t working if the first focusable element was a checkbox. ([#11498](https://github.com/craftcms/cms/discussions/11498))
+
 ## 3.7.45.2 - 2022-06-24
 
 ### Fixed

diff --git a/src/web/assets/garnish/dist/garnish.js b/src/web/assets/garnish/dist/garnish.js
diff --git a/src/web/assets/garnish/dist/garnish.js.map b/src/web/assets/garnish/dist/garnish.js.map
diff --git a/src/web/assets/garnish/src/Garnish.js b/src/web/assets/garnish/src/Garnish.js
@@ -418,7 +418,7 @@ Garnish = $.extend(Garnish, {
    * @param {Object} container The container element. Can be either an actual element or a jQuery collection.
    */
   setFocusWithin: function (container) {
-    $(container).find(':focusable:first').focus();
+    $(container).find(':focusable:not(.checkbox):first').focus();
   },
 
   getFocusedElement: function () {