Do not change focus if activeComponent is in modal content. (#378)

This allows focus to be set in @shown handler of a modal without the focusFirst handler overriding.
bootstrap-vue · May 11, 2017 · 25e1959 · 25e1959
1 parent a734d99
commit 25e1959
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/components/modal.vue b/lib/components/modal.vue
@@ -240,6 +240,11 @@
                 }
             },
             focusFirst() {
+                // If activeElement is child of content, no need to change focus
+                if (document.activeElement && this.$refs.content.contains(document.activeElement)) {
+                    return;
+                }
+
                 // Focus the modal's first focusable item, searching footer, then body, then header, else the modal
                 let el;
                 if (this.$refs.footer) {