Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

BModal - Add attrs and class props to the component #1808

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions packages/bootstrap-vue-next/src/components/BModal/BModal.vue
Expand Up @@ -53,7 +53,12 @@
</template>
</slot>
</div>
<div :id="`${computedId}-body`" class="modal-body" :class="bodyClasses">
<div
:id="`${computedId}-body`"
class="modal-body"
:class="bodyClasses"
v-bind="bodyAttrs"
>
<slot v-bind="sharedSlots">
{{ body }}
</slot>
Expand Down Expand Up @@ -104,8 +109,8 @@
</template>

<script setup lang="ts">
import {computed, type CSSProperties, ref, toRef, watch} from 'vue'
import {onKeyStroke, useEventListener, useFocus, useVModel} from '@vueuse/core'
import {computed, type CSSProperties, ref, toRef, watch} from 'vue'
import {useColorVariantClasses, useId, useModalManager, useSafeScrollLock} from '../../composables'
import type {BModalProps} from '../../types'
import {BvTriggerableEvent, isEmptySlot} from '../../utils'
Expand All @@ -131,7 +136,8 @@ const props = withDefaults(defineProps<BModalProps>(), {
backdropVariant: undefined,
body: undefined,
bodyBgVariant: null,
bodyClass: undefined,
bodyAttrs: undefined,
bodyClass: null,
bodyScrolling: false,
bodyTextVariant: null,
bodyVariant: null,
Expand Down
47 changes: 43 additions & 4 deletions packages/bootstrap-vue-next/src/components/BModal/modal.spec.ts
@@ -1,10 +1,10 @@
import {DOMWrapper, enableAutoUnmount, mount} from '@vue/test-utils'
import {afterEach, beforeEach, describe, expect, it} from 'vitest'
import BModal from './BModal.vue'
import BCloseButton from '../BButton/BCloseButton.vue'
import BButton from '../BButton/BButton.vue'
import {BvTriggerableEvent} from '../../utils'
import {nextTick} from 'vue'
import {BvTriggerableEvent} from '../../utils'
import BButton from '../BButton/BButton.vue'
import BCloseButton from '../BButton/BCloseButton.vue'
import BModal from './BModal.vue'

describe('modal', () => {
enableAutoUnmount(afterEach)
Expand Down Expand Up @@ -498,6 +498,45 @@ describe('modal', () => {
})
})

it('modal body div is given prop bodyClass', () => {
const wrapper = mount(BModal, {
attachTo: document.body,
global: {stubs: {teleport: true}},
props: {
bodyClass: 'foobar',
},
})

expect(wrapper.vm).toBeDefined()

const $modal = wrapper.find('div.modal')
expect($modal.exists()).toBe(true)

const $modalBody = $modal.element.querySelector('.modal-body')
expect($modalBody?.classList).toContain('foobar')
})

it('modal body div is given prop bodyAttrs', () => {
const wrapper = mount(BModal, {
attachTo: document.body,
global: {stubs: {teleport: true}},
props: {
bodyAttrs: {
role: 'foo',
},
},
})

expect(wrapper.vm).toBeDefined()

const $modal = wrapper.find('div.modal')
expect($modal.exists()).toBe(true)

const $modalBody = $modal.element.querySelector('.modal-body')
expect($modalBody?.hasAttribute('role')).toBeTruthy()
expect($modalBody?.getAttribute('role')).toBe('foo')
})

// Test isActive states

// Test emit states
Expand Down
2 changes: 2 additions & 0 deletions packages/bootstrap-vue-next/src/types/ComponentProps.ts
Expand Up @@ -2,6 +2,7 @@ import type {Boundary, Middleware, Padding, RootBoundary, Strategy} from '@float
import type {ComponentPublicInstance, RendererElement, TransitionProps} from 'vue'
import type {RouteLocationRaw} from 'vue-router'
import type {
AttrsValue,
Breakpoint,
ButtonType,
ButtonVariant,
Expand Down Expand Up @@ -287,6 +288,7 @@ export interface BModalProps {
autoFocusButton?: 'ok' | 'cancel' | 'close'
body?: string
backdropVariant?: ColorVariant | null
bodyAttrs?: Readonly<AttrsValue>
bodyBgVariant?: ColorVariant | null
bodyClass?: ClassValue
bodyScrolling?: boolean
Expand Down