Skip to content

fix(ui5-table): optimize non popin table rendering #1229

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 21, 2020
Merged

fix(ui5-table): optimize non popin table rendering #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions packages/main/src/TableRow.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,26 @@
@focusin="{{_onfocusin}}"
@ui5-_cellclick="{{_oncellclick}}"
data-sap-focus-ref>
{{#if shouldPopin}}
{{#each visibleCells}}
<slot name="{{this._individualSlot}}"></slot>
{{/each}}
</tr>

{{else}}
{{#each cells}}
<slot name="{{this._individualSlot}}"></slot>
{{/each}}
{{/if}}
</tr>

{{#each popinCells}}
<tr class="ui5-table-popin-row" @ui5-_cellclick="{{_oncellclick}}">
<td colspan="{{../visibleCellsCount}}">
<span class="ui5-table-row-popin-title">{{this.popinText}}:</span>
<div>
<slot name="{{this.cell._individualSlot}}"></slot>
</div>
</td>
</tr>
{{/each}}
{{#if shouldPopin}}
{{#each popinCells}}
<tr class="ui5-table-popin-row" @ui5-_cellclick="{{_oncellclick}}">
<td colspan="{{../visibleCellsCount}}">
<span class="ui5-table-row-popin-title">{{this.popinText}}:</span>
<div>
<slot name="{{this.cell._individualSlot}}"></slot>
</div>
</td>
</tr>
{{/each}}
{{/if}}
25 changes: 10 additions & 15 deletions packages/main/src/TableRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,17 @@ class TableRow extends UI5Element {
return document.activeElement.localName.toLocaleLowerCase();
}

get shouldPopin() {
return this._columnsInfo.filter(el => {
return el.demandPopin;
}).length;
}

onBeforeRendering() {
if (!this.shouldPopin) {
return;
}

this.visibleCells = [];
this.popinCells = [];

Expand Down Expand Up @@ -140,21 +150,6 @@ class TableRow extends UI5Element {
}
}

get styles() {
const gridTemplateColumns = this._columnsInfo.reduce((acc, info) => {
return info.visible ? `${acc}minmax(0, ${info.width || "1fr"}) ` : acc;
}, "");

return {
main: {
"grid-template-columns": gridTemplateColumns,
},
popin: {
"grid-column-end": 6,
},
};
}

get visibleCellsCount() {
return this.visibleCells.length;
}
Expand Down
72 changes: 72 additions & 0 deletions packages/main/test/pages/Table-perf-pure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Web components Table</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<script data-config type="application/json">
{
"language": "EN"
}
</script>

<script>
delete Document.prototype.adoptedStyleSheets
</script>

<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<script src="../../resources/bundle.esm.js" type="module"></script>
<script nomodule src="../../resources/bundle.es5.js"></script>

</head>

<!-- Initial - 2200 -->
<!-- shouldPopin - 2000 -->
<!-- remove ifDefined - 1850 -->

<body style="background-color: var(--sapBackgroundColor);">
<table id="tbl">
<tr>
<th slot="columns">
First
</th>
<th slot="columns">
Second
</th>
<th slot="columns">
Third
</th>
<th slot="columns">
Fifth
</th>
<th slot="columns">
Sixth
</th>
</tr>
</table>


<script>
const tbl = document.getElementById("tbl");


[...Array(1000)].map(item => {
const row = document.createElement("tr");

[...Array(5)].map(_ => {
const cell = document.createElement("td");
const span = document.createElement("span");
span.innerText = "Hello World!";

cell.appendChild(span);
row.appendChild(cell);
});

tbl.appendChild(row);
})
</script>
</body>

</html>
70 changes: 70 additions & 0 deletions packages/main/test/pages/Table-perf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Web components Table</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<script data-ui5-config type="application/json">
{
"language": "EN"
}
</script>

<script>
delete Document.prototype.adoptedStyleSheets
</script>

<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
<script src="../../resources/bundle.esm.js" type="module"></script>
<script nomodule src="../../resources/bundle.es5.js"></script>

</head>

<!-- Initial - 2200 -->
<!-- shouldPopin - 2000 -->
<!-- remove ifDefined - 1850 -->

<body style="background-color: var(--sapBackgroundColor);">
<ui5-table id="tbl">
<ui5-table-column slot="columns">
First
</ui5-table-column>
<ui5-table-column slot="columns">
Second
</ui5-table-column>
<ui5-table-column slot="columns">
Third
</ui5-table-column>
<ui5-table-column slot="columns">
Fifth
</ui5-table-column>
<ui5-table-column slot="columns">
Sixth
</ui5-table-column>
</ui5-table>


<script>
const tbl = document.getElementById("tbl");


[...Array(1000)].map(item => {
const row = document.createElement("ui5-table-row");

[...Array(5)].map(_ => {
const cell = document.createElement("ui5-table-cell");
const span = document.createElement("span");
span.innerText = "Hello World!";

cell.appendChild(span);
row.appendChild(cell);
});

tbl.appendChild(row);
})
</script>
</body>

</html>