🌐 AI搜索 & 代理 主页
Skip to content

feat(b-dropdown): add toggle-attrs prop (closes #3694) #6339

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
jacobmllr95 merged 5 commits into from
Jan 21, 2021
Merged

feat(b-dropdown): add toggle-attrs prop (closes #3694) #6339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76f25aa
feat(b-dropdown): add `toggle-attrs` prop
Jan 20, 2021
c49337f
Merge branch 'dev' into phegman/add-toggle-attrs-prop-to-dropdown
jacobmllr95 Jan 21, 2021
a0b86b6
Merge branch 'dev' into phegman/add-toggle-attrs-prop-to-dropdown
jacobmllr95 Jan 21, 2021
362b65a
Update dropdown.js
jacobmllr95 Jan 21, 2021
a31f67f
Update dropdown.spec.js
jacobmllr95 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/dropdown/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { NAME_DROPDOWN } from '../../constants/components'
import {
PROP_TYPE_ARRAY_OBJECT_STRING,
PROP_TYPE_BOOLEAN,
PROP_TYPE_OBJECT,
PROP_TYPE_OBJECT_STRING,
PROP_TYPE_STRING
} from '../../constants/props'
Expand Down Expand Up @@ -40,6 +41,7 @@ export const props = makePropsConfigurable(
splitTo: makeProp(PROP_TYPE_OBJECT_STRING),
splitVariant: makeProp(PROP_TYPE_STRING),
text: makeProp(PROP_TYPE_STRING),
toggleAttrs: makeProp(PROP_TYPE_OBJECT, {}),
toggleClass: makeProp(PROP_TYPE_ARRAY_OBJECT_STRING),
toggleTag: makeProp(PROP_TYPE_STRING, 'button'),
// TODO: This really should be `toggleLabel`
Expand Down Expand Up @@ -145,6 +147,9 @@ export const BDropdown = /*#__PURE__*/ Vue.extend({
staticClass: 'dropdown-toggle',
class: this.toggleClasses,
attrs: {
// Merge in user supplied attributes
...this.toggleAttrs,
// Must have attributes
id: this.safeId('_BV_toggle_'),
'aria-haspopup': 'true',
'aria-expanded': toString(visible)
Expand Down
43 changes: 42 additions & 1 deletion src/components/dropdown/dropdown.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,9 @@ describe('dropdown', () => {
block: true
}
})

expect(wrapper.classes()).not.toContain('btn-group')

wrapper.destroy()
})

Expand All @@ -312,8 +314,10 @@ describe('dropdown', () => {
split: true
}
})

expect(wrapper.classes()).toContain('btn-group')
expect(wrapper.classes()).toContain('d-flex')

wrapper.destroy()
})

Expand All @@ -324,7 +328,9 @@ describe('dropdown', () => {
noCaret: true
}
})

expect(wrapper.find('.dropdown-toggle').classes()).toContain('dropdown-toggle-no-caret')

wrapper.destroy()
})

Expand All @@ -336,7 +342,9 @@ describe('dropdown', () => {
split: true
}
})

expect(wrapper.find('.dropdown-toggle').classes()).not.toContain('dropdown-toggle-no-caret')

wrapper.destroy()
})

Expand All @@ -347,7 +355,22 @@ describe('dropdown', () => {
toggleTag: 'div'
}
})

expect(wrapper.find('.dropdown-toggle').element.tagName).toBe('DIV')

wrapper.destroy()
})

it('should have attributes on toggle when "toggle-attrs" prop is set', async () => {
const wrapper = mount(BDropdown, {
attachTo: createContainer(),
propsData: {
toggleAttrs: { 'data-foo-bar': 'foo-bar' }
}
})

expect(wrapper.find('.dropdown-toggle').attributes('data-foo-bar')).toBe('foo-bar')

wrapper.destroy()
})

Expand All @@ -358,17 +381,21 @@ describe('dropdown', () => {
dropup: true
}
})

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropup')
expect(wrapper.classes()).not.toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).not.toContain('show')

wrapper.vm.show()
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropup')
expect(wrapper.classes()).toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).toContain('show')

wrapper.destroy()
})

Expand All @@ -379,17 +406,21 @@ describe('dropdown', () => {
dropright: true
}
})

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropright')
expect(wrapper.classes()).not.toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).not.toContain('show')

wrapper.vm.show()
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropright')
expect(wrapper.classes()).toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).toContain('show')

wrapper.destroy()
})

Expand All @@ -400,17 +431,21 @@ describe('dropdown', () => {
dropleft: true
}
})

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropleft')
expect(wrapper.classes()).not.toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).not.toContain('show')

wrapper.vm.show()
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('dropleft')
expect(wrapper.classes()).toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).toContain('show')

wrapper.destroy()
})

Expand All @@ -423,10 +458,12 @@ describe('dropdown', () => {
split: true
}
})

const $buttons = wrapper.findAll('button')
const $split = $buttons.at(0)

expect($split.classes()).toContain(splitClass)

wrapper.destroy()
})

it('menu should have class dropdown-menu-right when prop right set', async () => {
Expand All @@ -436,17 +473,21 @@ describe('dropdown', () => {
right: true
}
})

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).not.toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).toContain('dropdown-menu-right')
expect(wrapper.find('.dropdown-menu').classes()).not.toContain('show')

wrapper.vm.show()
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).toContain('dropdown')
expect(wrapper.classes()).toContain('show')
expect(wrapper.find('.dropdown-menu').classes()).toContain('dropdown-menu-right')
expect(wrapper.find('.dropdown-menu').classes()).toContain('show')

wrapper.destroy()
})

Expand Down
5 changes: 5 additions & 0 deletions src/components/dropdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@
"prop": "text",
"description": "Text to place in the toggle button, or in the split button is split mode"
},
{
"prop": "toggleAttrs",
"version": "2.22.0",
"description": "Additional attributes to apply to the toggle button"
},
{
"prop": "toggleClass",
"description": "CSS class (or classes) to add to the toggle button"
Expand Down