ModalDialog: focus first tabbable element when focus leaves dialog #1689

(cherry picked from commit f76e0bc)

src/main/resources/assets/admin/common/js/ui/dialog/ModalDialog.ts

@@ -244,7 +244,7 @@ export abstract class ModalDialog
                 // last focusable - Cancel
                 // first focusable - X
                 if (buttonRowIsFocused) { // last element lost focus
-                    this.tabbable[0].giveFocus();
+                    this.focusFirstTabbable();
                 } else {
                     this.tabbable[this.tabbable.length - 1].giveFocus();
                 }
@@ -271,6 +271,12 @@ export abstract class ModalDialog
         return false;
     }
 
+    protected focusFirstTabbable() {
+        this.tabbable.some((el: Element) => {
+            return el.giveFocus();
+        });
+    }
+
     private createResizeObserver() {
         if (window['ResizeObserver']) {
             this.resizeObserver = new window['ResizeObserver'](() => {