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

feat(b-nav, b-nav-item-dropdown): remove deprecated slot and props #3867

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 3 commits into from
Aug 13, 2019
Merged

feat(b-nav, b-nav-item-dropdown): remove deprecated slot and props #3867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cb9aa1
feat(nav): remove deprecations
jacobmllr95 Aug 13, 2019
a3c1f2b
Update nav.js
tmorehouse Aug 13, 2019
b4375e7
Merge branch 'dev' into feat-nav-remove-deprecations
tmorehouse Aug 13, 2019
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
4 changes: 0 additions & 4 deletions src/components/nav/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,6 @@ shown. When there are a large number of dropdowns rendered on the same page, per
impacted due to larger overall memory utilization. You can instruct `<b-nav-item-dropdown>` to
render the menu contents only when it is shown by setting the `lazy` prop to true.

## Using in navbar

Prop `is-nav-bar` has been deprecated and will be removed in a future release.

## Tabbed local content support

See the [`<b-tabs>`](/docs/components/tabs) component for creating tabbable panes of local content
Expand Down
28 changes: 2 additions & 26 deletions src/components/nav/nav-item-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,7 @@ import { BLink } from '../link/link'

// -- Constants --

export const props = {
...pluckProps(['menuClass', 'toggleClass', 'noCaret', 'role'], BDropdownProps),
extraMenuClasses: {
type: String,
default: '',
// `deprecated` -> Don't use this prop
// `deprecation` -> Refers to a change in prop usage
deprecated: 'Setting prop "extra-menu-classes" is deprecated. Use "menu-class" prop instead.'
},
extraToggleClasses: {
type: String,
default: '',
// `deprecated` -> Don't use this prop
// `deprecation` -> Refers to a change in prop usage
deprecated:
'Setting prop "extra-toggle-classes" is deprecated. Use "toggle-class" prop instead.'
}
}
export const props = pluckProps(['menuClass', 'toggleClass', 'noCaret', 'role'], BDropdownProps)

// @vue/component
export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({
Expand All @@ -43,7 +26,6 @@ export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({
},
menuClasses() {
return [
this.extraMenuClasses, // Deprecated
this.menuClass,
{
'dropdown-menu-right': this.right,
Expand All @@ -52,13 +34,7 @@ export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({
]
},
toggleClasses() {
return [
this.extraToggleClasses, // Deprecated
this.toggleClass,
{
'dropdown-toggle-no-caret': this.noCaret
}
]
return [this.toggleClass, { 'dropdown-toggle-no-caret': this.noCaret }]
}
},
render(h) {
Expand Down
19 changes: 4 additions & 15 deletions src/components/nav/nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { mergeData } from 'vue-functional-data-merge'

// -- Constants --

const DEPRECATED_MSG =
'Setting prop "is-nav-bar" is deprecated. Use the <b-navbar-nav> component instead.'

export const props = {
tag: {
type: String,
Expand Down Expand Up @@ -38,13 +35,6 @@ export const props = {
small: {
type: Boolean,
default: false
},
isNavBar: {
type: Boolean,
default: false,
// `deprecated` -> Don't use this prop
// `deprecation` -> Refers to a change in prop usage
deprecated: DEPRECATED_MSG
}
}

Expand All @@ -65,12 +55,11 @@ export const BNav = /*#__PURE__*/ Vue.extend({
return h(
props.tag,
mergeData(data, {
staticClass: 'nav',
class: {
nav: !props.isNavBar,
'navbar-nav': props.isNavBar,
'nav-tabs': props.tabs && !props.isNavBar,
'nav-pills': props.pills && !props.isNavBar,
'flex-column': props.vertical && !props.isNavBar,
'nav-tabs': props.tabs,
'nav-pills': props.pills,
'flex-column': props.vertical,
'nav-fill': !props.vertical && props.fill,
'nav-justified': !props.vertical && props.justified,
[computeJustifyContent(props.align)]: !props.vertical && props.align,
Expand Down
55 changes: 0 additions & 55 deletions src/components/nav/nav.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,6 @@ describe('nav', () => {
expect(wrapper.text()).toBe('foobar')
})

it('supports "is-navbar-nav" mode', async () => {
const wrapper = mount(BNav, {
propsData: {
isNavBar: true
}
})

expect(wrapper.is('ul')).toBe(true)
expect(wrapper.classes()).toContain('navbar-nav')
expect(wrapper.classes().length).toBe(1)
expect(wrapper.text()).toBe('')
})

it('applies pill style', async () => {
const wrapper = mount(BNav, {
propsData: {
Expand All @@ -64,20 +51,6 @@ describe('nav', () => {
expect(wrapper.text()).toBe('')
})

it("doesn't apply pill style when in 'is-navbar-nav' mode", async () => {
const wrapper = mount(BNav, {
propsData: {
pills: true,
isNavBar: true
}
})

expect(wrapper.is('ul')).toBe(true)
expect(wrapper.classes()).toContain('navbar-nav')
expect(wrapper.classes().length).toBe(1)
expect(wrapper.text()).toBe('')
})

it('applies tab style', async () => {
const wrapper = mount(BNav, {
propsData: {
Expand All @@ -92,20 +65,6 @@ describe('nav', () => {
expect(wrapper.text()).toBe('')
})

it("doesn't apply tab style when in 'is-navbar-nav' mode", async () => {
const wrapper = mount(BNav, {
propsData: {
tabs: true,
isNavBar: true
}
})

expect(wrapper.is('ul')).toBe(true)
expect(wrapper.classes()).toContain('navbar-nav')
expect(wrapper.classes().length).toBe(1)
expect(wrapper.text()).toBe('')
})

it('applies vertical style', async () => {
const wrapper = mount(BNav, {
propsData: {
Expand All @@ -120,20 +79,6 @@ describe('nav', () => {
expect(wrapper.text()).toBe('')
})

it("doesn't apply vertical style when in 'is-navbar-nav' mode", async () => {
const wrapper = mount(BNav, {
propsData: {
vertical: true,
isNavBar: true
}
})

expect(wrapper.is('ul')).toBe(true)
expect(wrapper.classes()).toContain('navbar-nav')
expect(wrapper.classes().length).toBe(1)
expect(wrapper.text()).toBe('')
})

it('applies justify style when justified', async () => {
const wrapper = mount(BNav, {
propsData: {
Expand Down
3 changes: 0 additions & 3 deletions src/components/navbar/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ securely aligned.
- `<b-nav-item-dropdown>` for navbar dropdown menus
- `<b-nav-form>` for adding simple forms to the navbar.

**Note:** _The use of `<b-nav is-nav-bar>` inside a `<b-navbar>` has been deprecated. Use component
`<b-navbar-nav>` instead._

### `<b-nav-item>`

`<b-nav-item>` is the primary link (and `<router-link>`) component. Providing a `to` prop value will
Expand Down