fix(BModal): remove deprecated property and aria-label for BButton.

Author: phlegx

packages/bootstrap-vue-next/src/components/BModal.vue

@@ -42,7 +42,12 @@
                   >
                     <slot name="header-close" />
                   </BButton>
-                  <BCloseButton v-else v-bind="headerCloseAttrs" @click="hide('close')" />
+                  <BCloseButton
+                    v-else
+                    :aria-label="headerCloseLabel"
+                    v-bind="headerCloseAttrs"
+                    @click="hide('close')"
+                  />
                 </template>
               </slot>
             </div>
@@ -140,7 +145,6 @@ const props = withDefaults(
     headerClass?: ClassValue
     headerCloseClass?: ClassValue
     headerCloseLabel?: string
-    headerCloseWhite?: Booleanish
     headerCloseVariant?: ButtonVariant | null
     headerTextVariant?: ColorVariant | null
     hideBackdrop?: Booleanish
@@ -184,7 +188,6 @@ const props = withDefaults(
     headerClass: undefined,
     headerCloseClass: undefined,
     headerCloseLabel: 'Close',
-    headerCloseWhite: false,
     headerCloseVariant: 'secondary',
     footerBgVariant: null,
     footerBorderVariant: null,
@@ -369,10 +372,8 @@ const headerClasses = computed(() => [
 const headerCloseClasses = computed(() => [props.headerCloseClass])
 
 const headerCloseAttrs = computed(() => ({
-  'variant': hasHeaderCloseSlot.value ? props.headerCloseVariant : undefined,
-  'white': !hasHeaderCloseSlot.value ? props.headerCloseWhite : undefined,
-  'class': headerCloseClasses.value,
-  'aria-label': props.headerCloseLabel,
+  variant: hasHeaderCloseSlot.value ? props.headerCloseVariant : undefined,
+  class: headerCloseClasses.value,
 }))
 
 const footerClasses = computed(() => [

packages/bootstrap-vue-next/src/components/modal.spec.ts

@@ -276,16 +276,6 @@ describe('modal', () => {
     expect($bclosebutton.classes()).toContain('foobar')
   })
 
-  it('nested div BCloseButton has class when prop headerCloseWhite', () => {
-    const wrapper = mount(BModal, {
-      global: {stubs: {teleport: true}},
-      props: {headerCloseWhite: true},
-    })
-    const $div = wrapper.get('div')
-    const $bclosebutton = $div.getComponent(BCloseButton)
-    expect($bclosebutton.classes()).toContain('btn-close-white')
-  })
-
   it('nested div BCloseButton has no variant class when headerCloseVariant', () => {
     const wrapper = mount(BModal, {
       global: {stubs: {teleport: true}},
@@ -326,17 +316,6 @@ describe('modal', () => {
     expect($bbutton.classes()).toContain('foobar')
   })
 
-  it('nested div BButton has class when prop headerCloseWhite', () => {
-    const wrapper = mount(BModal, {
-      global: {stubs: {teleport: true}},
-      props: {headerCloseWhite: true},
-      slots: {'header-close': 'foobar'},
-    })
-    const $div = wrapper.get('div')
-    const $bbutton = $div.getComponent(BButton)
-    expect($bbutton.classes()).not.toContain('btn-close-white')
-  })
-
   it('nested div BButton has variant class when headerCloseVariant', () => {
     const wrapper = mount(BModal, {
       global: {stubs: {teleport: true}},
@@ -348,27 +327,6 @@ describe('modal', () => {
     expect($bbutton.classes()).toContain('btn-warning')
   })
 
-  it('nested div BButton has aria-label to be Close by default', () => {
-    const wrapper = mount(BModal, {
-      global: {stubs: {teleport: true}},
-      slots: {'header-close': 'foobar'},
-    })
-    const $div = wrapper.get('div')
-    const $bbutton = $div.getComponent(BButton)
-    expect($bbutton.attributes('aria-label')).toBe('Close')
-  })
-
-  it('nested div BButton has aria-label to be prop headerCloseLabel', () => {
-    const wrapper = mount(BModal, {
-      global: {stubs: {teleport: true}},
-      props: {headerCloseLabel: 'foobar'},
-      slots: {'header-close': 'foobar'},
-    })
-    const $div = wrapper.get('div')
-    const $bbutton = $div.getComponent(BButton)
-    expect($bbutton.attributes('aria-label')).toBe('foobar')
-  })
-
   // Test isActive states
 
   // Test emit states