Skip to content
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.

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

fix: debounce an update after virtualizer size change (#7400) (CP: 24.4) #7404

Merged
merged 1 commit into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion packages/component-base/src/virtualizer-iron-list-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
/* eslint-disable @typescript-eslint/member-ordering */
// https://github.com/vaadin/eslint-config-vaadin/issues/33
import { animationFrame, timeOut } from './async.js';
import { animationFrame, microTask, timeOut } from './async.js';
import { isSafari } from './browser-utils.js';
import { Debouncer, flush } from './debounce.js';
import { ironList } from './iron-list-core.js';
Expand Down Expand Up @@ -353,6 +353,9 @@ export class IronListAdapter {
// Schedule and flush a resize handler
this._resizeHandler();
flush();
// Schedule an update to ensure item positions are correct after subsequent size changes
// Fix for https://github.com/vaadin/flow-components/issues/6269
this._debounce('_update', this._update, microTask);
}

/** @private */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
import { aTimeout, fixtureSync, nextFrame } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import { Virtualizer } from '../src/virtualizer.js';

Expand Down Expand Up @@ -233,3 +233,52 @@ describe('virtualizer - variable row height - large variance', () => {
expect(virtualizer.__adapter.__fixInvalidItemPositioning.callCount).to.equal(0);
});
});

describe('virtualizer - variable row height - size changes', () => {
let virtualizer;

beforeEach(async () => {
const reverseItemHeights = [50, 30];

const scrollTarget = fixtureSync(`
<div style="height: 500px; width: 200px;">
<div></div>
</div>
`);
const scrollContainer = scrollTarget.firstElementChild;

virtualizer = new Virtualizer({
createElements: (count) => Array.from(Array(count)).map(() => document.createElement('div')),
updateElement: (el, index) => {
el.style.height = `${reverseItemHeights[virtualizer.size - index - 1]}px`;
el.style.outline = '1px solid black';
el.style.outlineOffset = '-1px';
el.style.width = '100%';
el.textContent = `Item ${index}`;
el.id = `item-${index}`;
},
scrollTarget,
scrollContainer,
});

virtualizer.size = 2;
// Wait for a possible resize observer flush
await aTimeout(100);
});

it('should position the items correctly after subsequent size changes', async () => {
virtualizer.size = 1;
virtualizer.update();

virtualizer.size = 2;
virtualizer.update();

await nextFrame();

const item0 = document.getElementById('item-0');
const item1 = document.getElementById('item-1');
expect(item0.clientHeight).to.equal(30);
expect(item1.clientHeight).to.equal(50);
expect(item1.getBoundingClientRect().top).to.equal(item0.getBoundingClientRect().bottom);
});
});
Loading