Skip to content

Commit 62d18c2

Browse files
authored
fix: run the class name generator only for loaded rows (#3789)
1 parent 47f51a1 commit 62d18c2

2 files changed

Lines changed: 32 additions & 1 deletion

File tree

‎packages/grid/src/vaadin-grid-styling-mixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const StylingMixin = (superClass) =>
4949
*/
5050
generateCellClassNames() {
5151
Array.from(this.$.items.children)
52-
.filter((row) => !row.hidden)
52+
.filter((row) => !row.hidden && !row.hasAttribute('loading'))
5353
.forEach((row) => this._generateCellClassNames(row, this.__getRowModel(row)));
5454
}
5555

‎packages/grid/test/class-name-generator.test.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,35 @@ describe('class name generator', () => {
125125
assertClassList(getContainerCell(grid.$.items, 1, 0), ['odd']);
126126
assertClassList(getContainerCell(grid.$.items, 1, 1), ['odd']);
127127
});
128+
129+
describe('async data provider', () => {
130+
let clock;
131+
132+
beforeEach(() => {
133+
clock = sinon.useFakeTimers({
134+
shouldClearNativeTimers: true,
135+
});
136+
137+
grid.dataProvider = (params, callback) => {
138+
setTimeout(() => infiniteDataProvider(params, callback), 10);
139+
};
140+
});
141+
142+
afterEach(() => {
143+
clock.restore();
144+
});
145+
146+
it('should only run the generator for the rows that are loaded', async () => {
147+
const spy = sinon.spy();
148+
grid.cellClassNameGenerator = spy;
149+
spy.resetHistory();
150+
151+
grid.generateCellClassNames();
152+
expect(spy.called).to.be.false;
153+
154+
clock.tick(10);
155+
grid.generateCellClassNames();
156+
expect(spy.called).to.be.true;
157+
});
158+
});
128159
});

0 commit comments

Comments
 (0)