8000 fix(b-tabs): cleanup rendering logic by jacobmllr95 · Pull Request #6154 · bootstrap-vue/bootstrap-vue · GitHub
[go: up one dir, main page]
Skip to content

fix(b-tabs): cleanup rendering logic #6154

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
merged 19 commits into from
Dec 9, 2020
Merged

fix(b-tabs): cleanup rendering logic #6154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
db8c7d6
fix(b-tabs): tabs detection for SSR
jacobmllr95 Dec 7, 2020
2f3c7b8
Update tab.js
jacobmllr95 Dec 8, 2020
eb51bc7
Update tabs.js
jacobmllr95 Dec 8, 2020
9e0e7f9
testing
jacobmllr95 Dec 8, 2020
2474c9c
Update safe-types.js
jacobmllr95 Dec 8, 2020
b439be9
Update dom.js
jacobmllr95 Dec 8, 2020
5738655
Update tabs.js
jacobmllr95 Dec 8, 2020
332a451
Update tabs.js
jacobmllr95 Dec 8, 2020
097da3a
Update tabs.js
jacobmllr95 Dec 8, 2020
007455 8000 e
Update tabs.js
jacobmllr95 Dec 8, 2020
2cdc7a3
Update tabs.js
jacobmllr95 Dec 8, 2020
7bf6280
fix(b-tabs): improve rendering logic
jacobmllr95 Dec 8, 2020
3700830
Merge branch 'dev' into fix-tabs-ssr
jacobmllr95 Dec 8, 2020
ed1a45b
Update tabs.js
jacobmllr95 Dec 8, 2020
8aa41bd
Update tabs.js
jacobmllr95 Dec 8, 2020
bff2a7a
Update tab.js
jacobmllr95 Dec 8, 2020
c329d38
Update tabs.js
jacobmllr95 Dec 8, 2020
66e2ded
Merge branch 'dev' into fix-tabs-ssr
jacobmllr95 Dec 9, 2020
a0c0d0f
Update tabs.js
jacobmllr95 Dec 9, 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
27 changes: 12 additions & 15 deletions src/components/tabs/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ export const BTab = /*#__PURE__*/ Vue.extend({
props,
data() {
return {
localActive: this[MODEL_PROP_NAME_ACTIVE] && !this.disabled,
show: false
localActive: this[MODEL_PROP_NAME_ACTIVE] && !this.disabled
}
},
computed: {
// For parent sniffing of child
_isTab() {
return true
},
tabClasses() {
const { localActive: active, disabled } = this

Expand All @@ -80,17 +83,9 @@ export const BTab = /*#__PURE__*/ Vue.extend({
},
computedLazy() {
return this.bvTabs.lazy || this.lazy
},
// For parent sniffing of child
_isTab() {
return true
}
},
watch: {
localActive(newValue) {
// Make `active` prop work with `.sync` modifier
this.$emit(MODEL_EVENT_NAME_ACTIVE, newValue)
},
[MODEL_PROP_NAME_ACTIVE](newValue, oldValue) {
if (newValue !== oldValue) {
if (newValue) {
Expand All @@ -114,13 +109,15 @@ export const BTab = /*#__PURE__*/ Vue.extend({
firstTab()
}
}
},
localActive(newValue) {
// Make `active` prop work with `.sync` modifier
this.$emit(MODEL_EVENT_NAME_ACTIVE, newValue)
}
},
mounted() {
// Inform b-tabs of our presence
// Inform `<b-tabs>` of our presence
this.registerTab()
// Initially show on mount if active and not disabled
this.show = this.localActive
},
updated() {
// Force the tab button content to update (since slots are not reactive)
Expand All @@ -130,8 +127,8 @@ export const BTab = /*#__PURE__*/ Vue.extend({
updateButton(this)
}
},
destroyed() {
// inform b-tabs of our departure
beforeDestroy() {
// Inform `<b-tabs>` of our departure
this.unregisterTab()
},
methods: {
Expand Down
5 changes: 1 addition & 4 deletions src/components/tabs/tab.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils'
import { waitNT, waitRAF } from '../../../tests/utils'
import { waitNT } from '../../../tests/utils'
import { BTab } from './tab'

describe('tab', () => {
Expand Down Expand Up @@ -31,7 +31,6 @@ describe('tab', () => {

expect(wrapper.vm._isTab).toBe(true)
expect(wrapper.vm.localActive).toBe(false)
expect(wrapper.vm.show).toBe(false)

wrapper.destroy()
})
Expand Down Expand Up @@ -86,15 +85,13 @@ describe('tab', () => {

await wrapper.setData({ localActive: true })
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).toContain('active')
expect(wrapper.classes()).not.toContain('disabled')
expect(wrapper.classes()).not.toContain('card-body')

await wrapper.setData({ localActive: false })
await waitNT(wrapper.vm)
await waitRAF()

expect(wrapper.classes()).not.toContain('active')
expect(wrapper.classes()).not.toContain('disabled')
Expand Down
Loading
0