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

fix(b-table): minor code optimizations to filter debouncing #4167

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 6 commits into from
Sep 30, 2019
Merged

fix(b-table): minor code optimizations to filter debouncing #4167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3dc1b84
fix(b-table): minor optimizations to filter debouncing
tmorehouse Sep 29, 2019
b1b2637
Merge branch 'dev' into tmorehouse/table-filter-debounce
tmorehouse Sep 29, 2019
e44329c
Update table-filtering.spec.js
tmorehouse Sep 29, 2019
7bba402
Merge branch 'dev' into tmorehouse/table-filter-debounce
tmorehouse Sep 30, 2019
54f9d57
Merge branch 'dev' into tmorehouse/table-filter-debounce
tmorehouse Sep 30, 2019
8b6c584
Merge branch 'dev' into tmorehouse/table-filter-debounce
tmorehouse Sep 30, 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
24 changes: 9 additions & 15 deletions src/components/table/helpers/mixin-filtering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,21 +96,18 @@ export default {
// We need a deep watcher in case the user passes
// an object when using `filter-function`
deep: true,
handler(newFilter, oldFilter) {
handler(newCriteria, oldCriteria) {
const timeout = this.computedFilterDebounce
if (this.$_filterTimer) {
clearTimeout(this.$_filterTimer)
this.$_filterTimer = null
}
if (timeout) {
clearTimeout(this.$_filterTimer)
this.$_filterTimer = null
if (timeout && timeout > 0) {
// If we have a debounce time, delay the update of `localFilter`
this.$_filterTimer = setTimeout(() => {
this.$_filterTimer = null
this.localFilter = this.filterSanitize(this.filter)
this.localFilter = this.filterSanitize(newCriteria)
}, timeout)
} else {
// Otherwise, immediately update `localFilter` with `newFilter` value
this.localFilter = this.filterSanitize(newFilter)
this.localFilter = this.filterSanitize(newCriteria)
}
}
},
Expand Down Expand Up @@ -154,12 +151,9 @@ export default {
this.isFiltered = Boolean(this.localFilter)
})
},
beforeDestroy() {
/* istanbul ignore next */
if (this.$_filterTimer) {
clearTimeout(this.$_filterTimer)
this.$_filterTimer = null
}
beforeDestroy() /* istanbul ignore next */ {
clearTimeout(this.$_filterTimer)
this.$_filterTimer = null
},
methods: {
filterSanitize(criteria) {
Expand Down
17 changes: 16 additions & 1 deletion src/components/table/table-filtering.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ describe('table > filtering', () => {

it('filter debouncing works', async () => {
jest.useFakeTimers()
let lastFilterTimer = null
const wrapper = mount(BTable, {
propsData: {
fields: testFields,
Expand All @@ -254,6 +255,7 @@ describe('table > filtering', () => {
expect(wrapper.emitted('input').length).toBe(1)
expect(wrapper.emitted('input')[0][0]).toEqual(testItems)
expect(wrapper.vm.$_filterTimer).toBe(null)
lastFilterTimer = wrapper.vm.$_filterTimer

// Set filter to a single character
wrapper.setProps({
Expand All @@ -262,6 +264,9 @@ describe('table > filtering', () => {
await waitNT(wrapper.vm)
expect(wrapper.emitted('input').length).toBe(1)
expect(wrapper.vm.$_filterTimer).not.toBe(null)
expect(wrapper.vm.$_filterTimer).not.toEqual(lastFilterTimer)
lastFilterTimer = wrapper.vm.$_filterTimer
expect(wrapper.vm.localFilter).not.toEqual('1')

// Change filter
wrapper.setProps({
Expand All @@ -270,12 +275,17 @@ describe('table > filtering', () => {
await waitNT(wrapper.vm)
expect(wrapper.emitted('input').length).toBe(1)
expect(wrapper.vm.$_filterTimer).not.toBe(null)
expect(wrapper.vm.$_filterTimer).not.toEqual(lastFilterTimer)
lastFilterTimer = wrapper.vm.$_filterTimer
expect(wrapper.vm.localFilter).not.toEqual('z')

jest.runTimersToTime(101)
await waitNT(wrapper.vm)
expect(wrapper.emitted('input').length).toBe(2)
expect(wrapper.emitted('input')[1][0]).toEqual([testItems[2]])
expect(wrapper.vm.$_filterTimer).toBe(null)
expect(wrapper.vm.$_filterTimer).toEqual(lastFilterTimer)
lastFilterTimer = wrapper.vm.$_filterTimer
expect(wrapper.vm.localFilter).toEqual('z')

// Change filter
wrapper.setProps({
Expand All @@ -284,6 +294,10 @@ describe('table > filtering', () => {
await waitNT(wrapper.vm)
expect(wrapper.vm.$_filterTimer).not.toBe(null)
expect(wrapper.emitted('input').length).toBe(2)
expect(wrapper.vm.$_filterTimer).not.toEqual(lastFilterTimer)
lastFilterTimer = wrapper.vm.$_filterTimer
expect(wrapper.vm.localFilter).not.toEqual('1')
expect(wrapper.vm.localFilter).toEqual('z')

// Change filter-debounce to no debouncing
wrapper.setProps({
Expand All @@ -295,6 +309,7 @@ describe('table > filtering', () => {
// Should immediately filter the items
expect(wrapper.emitted('input').length).toBe(3)
expect(wrapper.emitted('input')[2][0]).toEqual([testItems[1]])
expect(wrapper.vm.localFilter).toEqual('1')

wrapper.destroy()
})
Expand Down