Skip to content
Merged
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
4 changes: 1 addition & 3 deletions packages/compat/src/TableCellTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ export default function TableCellTemplate(this: TableCell) {
part="cell"
role="cell"
>
<div class="ui5-table-cell-content">
<slot></slot>
</div>
<slot></slot>
</td>
);
}
9 changes: 1 addition & 8 deletions packages/compat/src/themes/TableCell.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,14 @@
height: var(--ui5_table_row_height);
box-sizing: border-box;
color: var(--sapList_TextColor);
word-break: break-word;
vertical-align: middle;
overflow: hidden;
max-width: 0;
}

td {
display: contents;
}

.ui5-table-cell-content {
display: block;
width: 100%;
overflow: hidden;
}

:host([popined]) {
padding-left: 0;
padding-top: .25rem;
Expand Down
18 changes: 5 additions & 13 deletions packages/fiori/test/pages/F6TestPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,19 +88,11 @@
<br><br>

<ui5-table class="demo-table" id="testRowClick">
<ui5-table-column id="column-1" slot="columns">
<ui5-label>City</ui5-label>
</ui5-table-column>

<ui5-table-column id="column-2" slot="columns" min-width="500" popin-text="Supplier">
<ui5-label>Supplier</ui5-label>
</ui5-table-column>

<ui5-table-column id="column-3" slot="columns" min-width="500" popin-text="Country" demand-popin>
<div class="column-content">
<ui5-label>Country</ui5-label>
</div>
</ui5-table-column>
<ui5-table-header-row slot="headerRow">
<ui5-table-header-cell id="column-1">City</ui5-table-header-cell>
<ui5-table-header-cell id="column-2" min-width="500px" popin-text="Supplier" popin-hidden>Supplier</ui5-table-header-cell>
<ui5-table-header-cell id="column-3" min-width="500px" popin-text="Country" popin-hidden>Country</ui5-table-header-cell>
</ui5-table-header-row>

<ui5-table-row data-city="Dublin">
<ui5-table-cell><span id="testRowClickCell1">Dublin</span></ui5-table-cell>
Expand Down
5 changes: 2 additions & 3 deletions packages/main/cypress/specs/Text.cy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ describe("Text", () => {
cy.mount(<Text maxLines={1}>Text</Text>);

cy.get("[ui5-text]")
.should("have.css", "display", "inline-block")
.should("have.css", "overflow", "hidden")
.should("have.css", "text-overflow", "ellipsis")
.should("have.css", "white-space", "nowrap");
.should("have.css", "-webkit-line-clamp", "1")
.should("have.css", "-webkit-box-orient", "vertical");
});

it("tests maxLines > 1", () => {
Expand Down
13 changes: 4 additions & 9 deletions packages/main/src/themes/Text.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,6 @@
line-height: normal;
cursor: text;
overflow: hidden;
}

:host([max-lines="1"]) {
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
}

:host(:not([max-lines="1"])) {
display: -webkit-inline-box;
-webkit-line-clamp: var(--_ui5_text_max_lines);
line-clamp: var(--_ui5_text_max_lines);
Expand All @@ -23,6 +14,10 @@
word-wrap: break-word;
}

:host([max-lines="1"]) {
word-break: break-all;
}

.empty-indicator-aria-label {
position: absolute !important;
clip: rect(1px, 1px, 1px, 1px);
Expand Down
52 changes: 50 additions & 2 deletions packages/main/test/pages/Text.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
<body>
<ui5-text>Simple text</ui5-text>

<br><br>

<ui5-title level="H5">Long text</ui5-title>

<ui5-text id="text1">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Expand All @@ -24,7 +23,17 @@

<br><br>

<ui5-text id="text1" style="width: 6rem;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
</ui5-text>

<br><br>

<ui5-title level="H5">Long text and max-lines 1</ui5-title>

<ui5-text id="text2" max-lines="1">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Expand All @@ -34,7 +43,17 @@

<br><br>

<ui5-text id="text2" max-lines="1" style="width: 6rem;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
</ui5-text>

<br><br>

<ui5-title level="H5">Long text and max-lines 2</ui5-title>

<ui5-text max-lines="2">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Expand All @@ -44,7 +63,17 @@

<br><br>

<ui5-text max-lines="2" style="width: 6rem;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
</ui5-text>

<br><br>

<ui5-title level="H5">Long text and max-lines 3</ui5-title>

<ui5-text empty-indicator-mode="On" max-lines="3">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Expand All @@ -54,7 +83,17 @@

<br><br>

<ui5-text empty-indicator-mode="On" max-lines="3" style="width: 6rem;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
</ui5-text>

<br><br>

<ui5-title level="H5">Long text and max-lines 4</ui5-title>

<ui5-text max-lines="4">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Expand All @@ -64,6 +103,15 @@

<br><br>

<ui5-text max-lines="4" style="width: 6rem;">
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
</ui5-text>

<br><br>

<ui5-title level="H5">Empty Indicator Mode</ui5-title>
<ui5-switch id="emptyIndicatorMode" checked></ui5-switch>
<ui5-text id="emptyText" empty-indicator-mode="On"></ui5-text>
Expand Down
Loading