Make modal window focus circulate correctly (#10497)

1 files changed, 11 insertions, 2 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/FocusUtil.java b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java
index 0f517d89ed..fe0f765f47 100644
--- a/client/src/main/java/com/vaadin/client/ui/FocusUtil.java
+++ b/client/src/main/java/com/vaadin/client/ui/FocusUtil.java
@@ -119,8 +119,17 @@ public class FocusUtil {
      */
     public static void focusOnFirstFocusableElement(Element parent) {
         Element[] focusableChildren = getFocusableChildren(parent);
-        if (focusableChildren.length > 0) {
-            focusableChildren[0].focus();
+        if (focusableChildren.length == 0) {
+            return;
+        }
+        // find the first element that doesn't have "disabled" in the class name
+        for (int i = 0; i < focusableChildren.length; i++) {
+            Element element = focusableChildren[i];
+            String classes = element.getAttribute("class");
+            if (classes == null || !classes.toLowerCase().contains("disabled")) {
+                element.focus();
+                return;
+            }
         }
     }