Skip to content

Commit 4cd6bd1

Browse files
authored
fix: update details row size manually after frame (#6742)
1 parent 5c770a3 commit 4cd6bd1

2 files changed

Lines changed: 61 additions & 0 deletions

File tree

‎packages/grid/src/vaadin-grid-row-details-mixin.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,13 @@ export const RowDetailsMixin = (superClass) =>
153153
return;
154154
}
155155

156+
this.__updateDetailsRowPadding(row, cell);
157+
// Ensure the row has correct padding after frame (the resize observer might miss it)
158+
requestAnimationFrame(() => this.__updateDetailsRowPadding(row, cell));
159+
}
160+
161+
/** @private */
162+
__updateDetailsRowPadding(row, cell) {
156163
if (cell.hidden) {
157164
row.style.removeProperty('padding-bottom');
158165
} else {

‎packages/grid/test/row-details.common.js‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,4 +403,58 @@ describe('row details', () => {
403403
expect(detailsCell.hidden).to.be.false;
404404
});
405405
});
406+
407+
describe('details cell height change', () => {
408+
let bodyRow;
409+
let updateDetailsCellHeight;
410+
411+
beforeEach(async () => {
412+
grid = fixtureSync(`
413+
<vaadin-grid>
414+
<vaadin-grid-column path="name"></vaadin-grid-column>
415+
</vaadin-grid>
416+
`);
417+
grid.rowDetailsRenderer = (root, _, { item }) => {
418+
// Render the details cell with a height of 100px
419+
root.innerHTML = `<div style="height: 100px; background: yellow;">Details</div>`;
420+
// Increase the details cell height to 200px in a microtask
421+
queueMicrotask(() => {
422+
root.firstElementChild.style.height = '150px';
423+
});
424+
425+
updateDetailsCellHeight = () => {
426+
root.firstElementChild.style.height = '200px';
427+
};
428+
};
429+
grid.items = [{ name: 'foo' }];
430+
await nextFrame();
431+
bodyRow = getRows(grid.$.items)[0];
432+
});
433+
434+
it('should update the row height when opened items are updated', async () => {
435+
grid.detailsOpenedItems = [...grid.items];
436+
await nextFrame();
437+
const detailsRowHeight = bodyRow.offsetHeight;
438+
439+
grid.detailsOpenedItems = [...grid.items];
440+
await nextFrame();
441+
expect(bodyRow.offsetHeight).to.equal(detailsRowHeight);
442+
});
443+
444+
it('should clear row padding bottom when opened items are cleared', async () => {
445+
grid.detailsOpenedItems = [...grid.items];
446+
grid.detailsOpenedItems = [];
447+
await nextFrame();
448+
expect(bodyRow.style.paddingBottom).to.equal('');
449+
});
450+
451+
it('should update the row height when details cell height changes', async () => {
452+
grid.detailsOpenedItems = [...grid.items];
453+
await nextFrame();
454+
const detailsRowHeight = bodyRow.offsetHeight;
455+
updateDetailsCellHeight();
456+
await nextFrame();
457+
expect(bodyRow.offsetHeight).to.equal(detailsRowHeight + 50);
458+
});
459+
});
406460
});

0 commit comments

Comments
 (0)