Skip to content

Commit

Permalink
refactor(ui5-table-row): Make cells default slot (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MapTo0
MapTo0 authored Feb 19, 2019
1 parent e40840a commit a5fae96
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 88 deletions.
1 change: 1 addition & 0 deletions packages/main/src/TableRow.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const metadata = {
styleUrl: [
"TableRow.css",
],
defaultSlot: "cells",
slots: /** @lends sap.ui.webcomponents.main.TableRow.prototype */ {
/**
* Defines the cells of the <code>ui5-table-row</code>.
Expand Down
60 changes: 30 additions & 30 deletions packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,104 +442,104 @@
</ui5-table-column>

<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 1</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="red">40%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 2</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 3</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 4</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="yellow">80%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 5</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="red">45%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 6</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="yellow">70%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
Expand Down
60 changes: 30 additions & 30 deletions packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.openui5.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,104 +455,104 @@
</ui5-table-column>

<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 1</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="red">40%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 2</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 3</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 4</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="yellow">80%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 5</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="red">45%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
<ui5-table-row data-ui5-slot="rows">
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span>Component 6</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="yellow">70%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<span class="green">100%</span>
</ui5-table-cell>
</ui5-table-row>
Expand Down
10 changes: 5 additions & 5 deletions packages/main/test/sap/ui/webcomponents/main/pages/Table.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2895,7 +2895,7 @@
let html = '';
products.ProductCollection.forEach((product, index) => {
test = `<ui5-table-row data-ui5-slot="rows" id=roll-${index}>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<div class="double-line-content">
<ui5-label>
<b>${product.Name}</b>
Expand All @@ -2904,20 +2904,20 @@
</div>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<ui5-label class="middle" >${product.SupplierName}</ui5-label>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<ui5-label class="middle" >${product.Width} x ${product.Depth} x ${product.Height} ${product.DimUnit}</ui5-label>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<ui5-label style="color: #2b7c2b" class="middle">
<b>${product.WeightMeasure}</b> ${product.WeightUnit}</ui5-label>
</ui5-table-cell>
<ui5-table-cell data-ui5-slot="cells">
<ui5-table-cell>
<ui5-label class="middle" >
<b>${product.Price}</b> ${product.CurrencyCode}</ui5-label>
</ui5-table-cell>
Expand Down
4 changes: 2 additions & 2 deletions packages/main/test/sap/ui/webcomponents/main/qunit/Table.qunit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ TestHelper.ready(function () {
' <span data-ui5-slot="header" >Column 1</span>' +
'</ui5-table-column>' +
'<ui5-table-row data-ui5-slot="rows" id="roll1">' +
' <ui5-table-cell data-ui5-slot="cells" id="cell1">' +
' <ui5-table-cell id="cell1">' +
' <span>World</span>' +
' </ui5-table-cell>' +
' <ui5-table-cell data-ui5-slot="cells" id="cell2">' +
' <ui5-table-cell id="cell2">' +
' <span>World</span>' +
' </ui5-table-cell>' +
'</ui5-table-row>' +
Expand Down
Loading

0 comments on commit a5fae96

Please sign in to comment.