Skip to content

Commit 7a48b9c

Browse files
committed
refactor: CCollapse: remove toggler functionality
1 parent c302b5a commit 7a48b9c

File tree

4 files changed

+4
-38
lines changed

4 files changed

+4
-38
lines changed

src/components/Collapse/CCollapse.vue

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ const props = {
1515
default: 'ease-in-out'
1616
},
1717
show: Boolean,
18-
navbar: Boolean,
19-
toggler: String
18+
navbar: Boolean
2019
}
2120
2221
export default {
@@ -40,23 +39,11 @@ export default {
4039
},
4140
mounted () {
4241
this.$el.style.display = this.visible ? '' : 'none'
43-
this.$nextTick(() => {
44-
this.el = document.getElementById(this.toggler)
45-
if (this.el) {
46-
this.el.addEventListener('click', this.collapse)
47-
}
48-
})
4942
},
5043
beforeDestroy () {
51-
if (this.el) {
52-
this.el.removeEventListener('click', this.collapse)
53-
}
5444
clearTimeout(this.heightWatcher)
5545
},
5646
methods: {
57-
collapse () {
58-
this.visible = !this.visible
59-
},
6047
collapseController (val) {
6148
if (this.collapsing === false) {
6249
val ? this.toggle(true) : this.toggle(false)

src/components/Collapse/test/CCollapse.spec.js

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,12 @@ const togglerWrapper = mount(CCollapse, {
2121
propsData: {
2222
duration: 500,
2323
show: true,
24-
navbar: true,
25-
toggler: 'toggler_id'
24+
navbar: true
2625
},
2726
slots: {
28-
default: '<button id="toggler_id">button</button>'
27+
default: 'Collapse content'
2928
}
3029
})
31-
// const App = Vue.extend({
32-
// components: { CCollapse },
33-
// render (h) {
34-
// return h('div', {}, [
35-
// h('CCollapse', { props: { toggler: 'toggler_id' }}, ['content']),
36-
// h('button', { attrs: { id: 'toggler_id' }}, ['button']),
37-
// ])
38-
// }
39-
// })
40-
41-
// const togglerWrapper = mount(App)
4230

4331
describe(ComponentName, () => {
4432
it('has a name', () => {
@@ -76,15 +64,6 @@ describe(ComponentName, () => {
7664
}, 700)
7765
jest.runAllTimers()
7866
})
79-
it('toggle on toggler click', () => {
80-
togglerWrapper.find('button').trigger('click')
81-
expect(togglerWrapper.vm.visible).toBe(false)
82-
})
83-
it('removes toggler event listener on destroy', () => {
84-
const spy = jest.spyOn(togglerWrapper.vm.el, 'removeEventListener')
85-
togglerWrapper.destroy()
86-
expect(spy).toBeCalled()
87-
})
8867
it('destroy with no errors', () => {
8968
try {
9069
customWrapper.destroy()

src/components/Collapse/test/__snapshots__/CCollapse.spec.js.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exports[`CCollapse renders correctly 2`] = `
1111
<div
1212
class="navbar-collapse"
1313
style="display: none;"
14+
toggler="some_id"
1415
>
1516
CCollapse content
1617
</div>

src/components/index.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ export declare class CCollapse extends Vue {
117117
transition: string
118118
show: boolean
119119
navbar: boolean
120-
toggler: string
121120
}
122121

123122
export declare class CDropdown extends Vue {

0 commit comments

Comments
 (0)