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.

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

feat(ui5-table): popin-text property added #10514

Merged
merged 1 commit into from
Jan 10, 2025
+58 −10
Merged

feat(ui5-table): popin-text property added #10514

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
32 changes: 31 additions & 1 deletion packages/main/cypress/specs/Table.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "../../src/TableHeaderRow.js";
import "../../src/TableCell.js";
import "../../src/TableRow.js";
import "../../src/TableSelection.js";
import type Table from "../../src/Table.js";

// Porting Table.spec.js (wdio tests) to cypress tests
const ROLE_COLUMN_HEADER = "columnheader";
Expand Down Expand Up @@ -60,7 +61,7 @@ describe("Table - Popin Mode", () => {
<ui5-table-header-cell id="colA" min-width="300px"><span>ColumnA</span></ui5-table-header-cell>
<ui5-table-header-cell id="colB" min-width="200px">Column B</ui5-table-header-cell>
<ui5-table-header-cell id="colC" min-width="200px">Column C</ui5-table-header-cell>
<ui5-table-header-cell id="colD" min-width="150px">Column D</ui5-table-header-cell>
<ui5-table-header-cell id="colD" min-width="150px" popin-text="Column ?">Column D</ui5-table-header-cell>
</ui5-table-header-row>
<ui5-table-row>
<ui5-table-cell><ui5-label>Cell A</ui5-label></ui5-table-cell>
Expand Down Expand Up @@ -194,6 +195,35 @@ describe("Table - Popin Mode", () => {
});
}
});

it("should show the popin-text in the popin area", () => {
cy.get("ui5-table").then($table => {
$table.css("width", "150px");
});

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(50);

cy.get("ui5-table").then($table => {
let popinCellCount = 0;
let validPopinTextCount = 0;
const table = $table[0] as Table;
// eslint-disable-next-line no-restricted-syntax
for (const row of table.rows) {
// eslint-disable-next-line no-restricted-syntax
for (const cell of row.cells) {
if (cell._popin) {
popinCellCount++;
const popinText = cell._headerCell.popinText || cell._headerCell.textContent;
if (cell.shadowRoot!.textContent === `${popinText}:`) {
validPopinTextCount++;
}
}
}
}
return popinCellCount && popinCellCount === validPopinTextCount;
}).should("be.true");
});
});

describe("Table - Horizontal alignment of cells", () => {
Expand Down
11 changes: 6 additions & 5 deletions packages/main/src/TableCell.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{{#if _popin}}
{{#if _popinHeader}}
<div class="popin-header-colon">
{{_popinHeader}}
<span class="popin-colon">{{_i18nPopinColon}}</span>
</div>
{{#if _popinText}}
{{_popinText}}
<span class="popin-colon">{{_i18nPopinColon}}</span>
{{else if _popinHeader}}
{{_popinHeader}}
<span class="popin-colon">{{_i18nPopinColon}}</span>
{{/if}}
<slot></slot>
{{else}}
Expand Down
13 changes: 10 additions & 3 deletions packages/main/src/TableCell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,19 @@ class TableCell extends TableCellBase {
}
}

get _popinHeader() {
get _headerCell() {
const row = this.parentElement as TableRow;
const table = row.parentElement as Table;
const index = row.cells.indexOf(this);
const headerCell = table.headerRow[0].cells[index];
return headerCell.content[0]?.cloneNode(true);
return table.headerRow[0].cells[index];
}

get _popinText() {
return this._headerCell?.popinText;
}

get _popinHeader() {
return this._headerCell?.content[0]?.cloneNode(true);
}

get _i18nPopinColon() {
Expand Down
10 changes: 10 additions & 0 deletions packages/main/src/TableHeaderCell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,16 @@ class TableHeaderCell extends TableCellBase {
@property({ type: Number })
importance = 0;

/**
* The text for the column when it pops in.
*
* @default undefined
* @since 2.7.0
* @public
*/
@property()
popinText?: string;

@property({ type: Boolean, noAttribute: true })
_popin = false;

Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/pages/TablePopin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<ui5-table-header-cell id="colA" min-width="300px"><span>ColumnA</span></ui5-table-header-cell>
<ui5-table-header-cell id="colB" min-width="200px">Column B</ui5-table-header-cell>
<ui5-table-header-cell id="colC" min-width="200px">Column C</ui5-table-header-cell>
<ui5-table-header-cell id="colD" min-width="150px">Column D</ui5-table-header-cell>
<ui5-table-header-cell id="colD" min-width="150px" popin-text="Column ?">Column D</ui5-table-header-cell>
</ui5-table-header-row>
<ui5-table-row>
<ui5-table-cell><ui5-label>Cell A</ui5-label></ui5-table-cell>
Expand Down
Loading