Skip to content
Draft
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
334 changes: 153 additions & 181 deletions packages/grid/src/styles/vaadin-grid-base-styles.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/grid/src/vaadin-grid-column-group-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -313,12 +313,14 @@ export const GridColumnGroupMixin = (superClass) =>
_colSpanChanged(colSpan, headerCell, footerCell) {
if (headerCell) {
headerCell.setAttribute('colspan', colSpan);
headerCell.style.setProperty('--_colspan', colSpan);
if (this._grid) {
this._grid._a11yUpdateCellColspan(headerCell, colSpan);
}
}
if (footerCell) {
footerCell.setAttribute('colspan', colSpan);
footerCell.style.setProperty('--_colspan', colSpan);
if (this._grid) {
this._grid._a11yUpdateCellColspan(footerCell, colSpan);
}
Expand Down
34 changes: 23 additions & 11 deletions packages/grid/src/vaadin-grid-column-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -374,32 +374,44 @@ export const ColumnBaseMixin = (superClass) =>
}

/** @private */
_flexGrowChanged(flexGrow) {
_flexGrowChanged(_flexGrow) {
if (this.parentElement && this.parentElement._columnPropChanged) {
this.parentElement._columnPropChanged('flexGrow');
}

this._allCells.forEach((cell) => {
cell.style.flexGrow = flexGrow;
});
if (this._grid && this._grid.__updateCSSGridTemplateColumns) {
this._grid.__updateCSSGridTemplateColumns();
}

// this._allCells.forEach((cell) => {
// cell.style.flexGrow = flexGrow;
// });
}

/** @private */
_orderChanged(order) {
this._allCells.forEach((cell) => {
cell.style.order = order;
});

if (this._grid && this._grid._cellOrderChanged) {
this._grid._cellOrderChanged();
}
}

/** @private */
_widthChanged(width) {
_widthChanged(_width) {
if (this.parentElement && this.parentElement._columnPropChanged) {
this.parentElement._columnPropChanged('width');
}

this._allCells.forEach((cell) => {
cell.style.width = width;
});
// this._allCells.forEach((cell) => {
// cell.style.width = width;
// });

if (this._grid && this._grid.__updateCSSGridTemplateColumns) {
this._grid.__updateCSSGridTemplateColumns();
}
}

/** @private */
Expand All @@ -419,9 +431,9 @@ export const ColumnBaseMixin = (superClass) =>

/** @private */
_frozenToEndChanged(frozenToEnd) {
if (this.parentElement && this.parentElement._columnPropChanged) {
this.parentElement._columnPropChanged('frozenToEnd', frozenToEnd);
}
// if (this.parentElement && this.parentElement._columnPropChanged) {
// this.parentElement._columnPropChanged('frozenToEnd', frozenToEnd);
// }

this._allCells.forEach((cell) => {
// Skip sizer cells to keep correct scrollWidth.
Expand Down
27 changes: 27 additions & 0 deletions packages/grid/src/vaadin-grid-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,24 @@ export const GridMixin = (superClass) =>
this._updateFirstAndLastColumnForRow(row);
}

/** @private */
__updateCSSGridTemplateColumns() {
if (!this._columnTree) {
return;
}

const templateColumns = this._columnTree[this._columnTree.length - 1]
.map((column) => {
if (column.flexGrow > 0) {
return `minmax(${column.width}, ${column.flexGrow}fr)`;
}
return column.width;
})
.join(' ');

this.$.table.style.setProperty('--_template-columns', templateColumns);
}

/**
* @param {HTMLTableRowElement} row
* @protected
Expand Down Expand Up @@ -639,6 +657,14 @@ export const GridMixin = (superClass) =>
row.hidden = !visibleRowCells.length;
}

if (row.parentElement === this.$.header) {
this.$.table.toggleAttribute('has-header', this.$.header.querySelector('tr:not([hidden])'));
}

if (row.parentElement === this.$.footer) {
this.$.table.toggleAttribute('has-footer', this.$.footer.querySelector('tr:not([hidden])'));
}

// Make sure the section has a tabbable element
this._resetKeyboardNavigation();
this._a11yUpdateGridSize(this.size, this._columnTree, this.__emptyState);
Expand Down Expand Up @@ -746,6 +772,7 @@ export const GridMixin = (superClass) =>
// Sizer rows
this.__initRow(this.$.sizer, columnTree[columnTree.length - 1]);

this.__updateCSSGridTemplateColumns();
this._resizeHandler();
this._frozenCellsChanged();
this._updateFirstAndLastColumn();
Expand Down
6 changes: 4 additions & 2 deletions packages/grid/src/vaadin-grid-row-details-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ export const RowDetailsMixin = (superClass) =>
/** @private */
__updateDetailsRowPadding(row, cell) {
if (cell.hidden) {
row.style.removeProperty('padding-bottom');
row.style.removeProperty('--_details-cell-height', '0px');
// row.style.removeProperty('padding-bottom');
} else {
row.style.setProperty('padding-bottom', `${cell.offsetHeight}px`);
row.style.setProperty('--_details-cell-height', `${cell.offsetHeight}px`);
// row.style.setProperty('padding-bottom', `${cell.offsetHeight}px`);
}
}

Expand Down
6 changes: 5 additions & 1 deletion packages/grid/test/column-rendering.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,13 @@ import { flushGrid, getCellContent, getHeaderCellContent } from './helpers.js';
});

it('should have a larger row height when details opened', () => {
// Disable cell padding for this test
// Disable cell padding and row borders for this test
fixtureSync(`
<style>
vaadin-grid {
--vaadin-grid-row-border-width: 0px;
}

vaadin-grid-cell-content {
padding: 0;
}
Expand Down
1 change: 1 addition & 0 deletions packages/grid/test/grid-test-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ style.textContent = css`
max-width: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
--vaadin-grid-row-border-width: 0px;
}

vaadin-grid::part(cell) {
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/test/row-details.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ describe('row details', () => {
const bounds = cells[1].getBoundingClientRect();
expect(bounds.top).to.be.closeTo(cells[0].getBoundingClientRect().bottom, 1);
expect(bounds.left).to.equal(cells[0].getBoundingClientRect().left);
expect(bounds.right).to.equal(grid.$.items.getBoundingClientRect().right);
expect(bounds.right).to.equal(cells[0].getBoundingClientRect().right);
expect(bounds.bottom).to.be.closeTo(bodyRows[2].getBoundingClientRect().top, 1);
expect(bounds.height).to.be.above(10);
};
Expand Down
Loading