Skip to content

Commit 2f92fcc

Browse files
authored
refactor: decrease array data provider calls for filtering and sorting (#6982)
1 parent cbfe9da commit 2f92fcc

3 files changed

Lines changed: 37 additions & 2 deletions

File tree

‎packages/grid/src/vaadin-grid-array-data-provider-mixin.js‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const ArrayDataProviderMixin = (superClass) =>
2525
}
2626

2727
static get observers() {
28-
return ['__dataProviderOrItemsChanged(dataProvider, items, isAttached, _filters, _sorters, items.*)'];
28+
return ['__dataProviderOrItemsChanged(dataProvider, items, isAttached, items.*)'];
2929
}
3030

3131
/** @private */
@@ -37,6 +37,18 @@ export const ArrayDataProviderMixin = (superClass) =>
3737
this.dataProvider = arrayDataProvider;
3838
}
3939

40+
/**
41+
* @override
42+
* @protected
43+
*/
44+
_onDataProviderPageReceived() {
45+
super._onDataProviderPageReceived();
46+
47+
if (this._arrayDataProvider) {
48+
this.size = this._flatSize;
49+
}
50+
}
51+
4052
/** @private */
4153
__dataProviderOrItemsChanged(dataProvider, items, isAttached) {
4254
if (!isAttached) {
@@ -59,7 +71,6 @@ export const ArrayDataProviderMixin = (superClass) =>
5971
} else if (this._arrayDataProvider.__items === items) {
6072
// The items array was modified
6173
this.clearCache();
62-
this.size = this._flatSize;
6374
} else {
6475
// The items array was replaced
6576
this.__setArrayDataProvider(items);

‎packages/grid/test/filtering.common.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,18 @@ describe('array data provider', () => {
318318
expect(getVisibleItems(grid).length).to.equal(3);
319319
});
320320

321+
it('should invoke data provider only once when removing a column with filter', () => {
322+
const spy = sinon.spy(grid.dataProvider);
323+
grid._arrayDataProvider = spy;
324+
grid.dataProvider = spy;
325+
spy.resetHistory();
326+
327+
grid.removeChild(grid.firstElementChild);
328+
flushGrid(grid);
329+
330+
expect(spy).to.be.calledOnce;
331+
});
332+
321333
it('should not filter items before grid is re-attached', () => {
322334
filterFirst.value = 'bar';
323335
flushFilters(grid);

‎packages/grid/test/sorting.common.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,18 @@ describe('sorting', () => {
502502
expect(getBodyCellContent(grid, 1, 0).innerText).to.equal('1');
503503
expect(getBodyCellContent(grid, 2, 0).innerText).to.equal('2');
504504
});
505+
506+
it('should invoke data provider only once when removing a column with sorter', () => {
507+
const spy = sinon.spy(grid.dataProvider);
508+
grid._arrayDataProvider = spy;
509+
grid.dataProvider = spy;
510+
spy.resetHistory();
511+
512+
grid.removeChild(columns[0]);
513+
flushGrid(grid);
514+
515+
expect(spy).to.be.calledOnce;
516+
});
505517
});
506518

507519
describe('data provider', () => {

0 commit comments

Comments
 (0)