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

feat(b-navbar-toggle): add disabled prop #5397

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
tmorehouse merged 7 commits into from
May 18, 2020
Merged

feat(b-navbar-toggle): add disabled prop #5397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e06cebb
feat(b-navbar-toggle): add `disabled` prop
tmorehouse May 18, 2020
069fd53
Update package.json
tmorehouse May 18, 2020
be25c19
Update navbar-toggle.spec.js
tmorehouse May 18, 2020
0237398
Merge branch 'dev' into nav-toggle-disable
tmorehouse May 18, 2020
0fb3cf2
Update navbar-toggle.js
tmorehouse May 18, 2020
a2b1ca4
Update package.json
jacobmllr95 May 18, 2020
d4b756e
Update navbar-toggle.js
jacobmllr95 May 18, 2020
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
22 changes: 17 additions & 5 deletions src/components/navbar/navbar-toggle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export const BNavbarToggle = /*#__PURE__*/ Vue.extend({
target: {
type: String,
required: true
},
disabled: {
type: Boolean,
default: false
}
},
data() {
Expand All @@ -36,8 +40,10 @@ export const BNavbarToggle = /*#__PURE__*/ Vue.extend({
},
methods: {
onClick(evt) {
// Emit courtesy `click` event
this.$emit('click', evt)
if (!this.disabled) {
// Emit courtesy `click` event
this.$emit('click', evt)
}
},
handleStateEvt(id, state) {
// We listen for state events so that we can pass the
Expand All @@ -48,17 +54,23 @@ export const BNavbarToggle = /*#__PURE__*/ Vue.extend({
}
},
render(h) {
const expanded = this.toggleState
const { disabled } = this

return h(
'button',
{
staticClass: CLASS_NAME,
class: { disabled },
directives: [{ name: 'BToggle', value: this.target }],
attrs: { type: 'button', 'aria-label': this.label },
attrs: {
type: 'button',
disabled,
'aria-label': this.label
},
on: { click: this.onClick }
},
[
this.normalizeSlot('default', { expanded }) ||
this.normalizeSlot('default', { expanded: this.toggleState }) ||
h('span', { staticClass: `${CLASS_NAME}-icon` })
]
)
Expand Down
18 changes: 18 additions & 0 deletions src/components/navbar/navbar-toggle.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,22 @@ describe('navbar-toggle', () => {

wrapper.destroy()
})

it('disabled prop works', async () => {
const wrapper = mount(BNavbarToggle, {
propsData: {
target: 'target-9',
disabled: true
}
})

expect(wrapper.emitted('click')).not.toBeDefined()
expect(wrapper.element.hasAttribute('disabled')).toBe(true)
expect(wrapper.classes()).toContain('disabled')

await wrapper.trigger('click')
expect(wrapper.emitted('click')).not.toBeDefined()

wrapper.destroy()
})
})
5 changes: 5 additions & 0 deletions src/components/navbar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@
"prop": "label",
"settings": true,
"description": "String to place in the toggle's 'aria-label' attribute"
},
{
"prop": "disabled",
"version": "2.15.0",
"description": "When `true`, disables the navbar toggle button, and adds class `disabled` to the button"
}
],
"events": [
Expand Down