Skip to content
This repository was archived by the owner on Mar 27, 2025. It is now read-only.

Commit 2fcc8ea

Browse files
committed
feat: simplify close button attribtues.
1 parent ebbdca3 commit 2fcc8ea

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
<BButton v-if="hasCloseSlot" v-bind="closeAttrs" @click="hide">
1616
<slot name="close" />
1717
</BButton>
18-
<BCloseButton
19-
v-else
20-
ref="closeButton"
21-
:white="closeWhite"
22-
v-bind="closeAttrs"
23-
@click="hide"
24-
/>
18+
<BCloseButton v-else ref="closeButton" v-bind="closeAttrs" @click="hide" />
2519
</template>
2620
</div>
2721
</BTransition>
@@ -123,7 +117,8 @@ const isAlertVisible = computed<boolean>(() =>
123117
)
124118
125119
const closeAttrs = computed(() => ({
126-
'variant': hasCloseSlot.value ? props.closeVariant : null,
120+
'variant': hasCloseSlot.value ? props.closeVariant : undefined,
121+
'white': !hasCloseSlot.value ? props.closeWhite : undefined,
127122
'class': closeClasses.value,
128123
'aria-label': props.closeLabel,
129124
}))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<BCloseButton
4747
v-else
4848
ref="closeButton"
49-
:white="headerCloseWhite"
5049
v-bind="headerCloseAttrs"
5150
@click="hide('close')"
5251
/>
@@ -351,6 +350,7 @@ const headerCloseClasses = computed(() => [props.headerCloseClass])
351350
352351
const headerCloseAttrs = computed(() => ({
353352
'variant': hasHeaderCloseSlot.value ? props.headerCloseVariant : undefined,
353+
'white': !hasHeaderCloseSlot.value ? props.headerCloseWhite : undefined,
354354
'class': headerCloseClasses.value,
355355
'aria-label': props.headerCloseLabel,
356356
}))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<BCloseButton
4242
v-else
4343
ref="closeButton"
44-
:white="headerCloseWhite"
4544
v-bind="headerCloseAttrs"
4645
@click="hide('close')"
4746
/>
@@ -224,6 +223,7 @@ const headerCloseClasses = computed(() => [
224223
])
225224
const headerCloseAttrs = computed(() => ({
226225
'variant': hasHeaderCloseSlot.value ? props.headerCloseVariant : undefined,
226+
'white': !hasHeaderCloseSlot.value ? props.headerCloseWhite : undefined,
227227
'class': headerCloseClasses.value,
228228
'aria-label': props.headerCloseLabel,
229229
}))

0 commit comments

Comments
 (0)