fix(b-modal): ensure header is read for accessibility with JAWS (closes

#3712) (#3713)
bootstrap-vue · Jul 19, 2019 · 6a9d0ce · 6a9d0ce
1 parent 8104250
commit 6a9d0ce
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
@@ -813,9 +813,7 @@ export const BModal = /*#__PURE__*/ Vue.extend({
           class: this.contentClass,
           attrs: {
             role: 'document',
-            id: this.safeId('__BV_modal_content_'),
-            'aria-labelledby': this.hideHeader ? null : this.safeId('__BV_modal_header_'),
-            'aria-describedby': this.safeId('__BV_modal_body_')
+            id: this.safeId('__BV_modal_content_')
           }
         },
         [header, body, footer]
@@ -848,7 +846,9 @@ export const BModal = /*#__PURE__*/ Vue.extend({
             role: 'dialog',
             tabindex: '-1',
             'aria-hidden': this.isVisible ? null : 'true',
-            'aria-modal': this.isVisible ? 'true' : null
+            'aria-modal': this.isVisible ? 'true' : null,
+            'aria-labelledby': this.hideHeader ? null : this.safeId('__BV_modal_header_'),
+            'aria-describedby': this.safeId('__BV_modal_body_')
           },
           on: { keydown: this.onEsc, click: this.onClickOut }
         },