Skip to content

Commit 3aadc0e

Browse files
authoredAug 4, 2020
fix(ui5-li): Scale image properly (#2059)
Use ui5-avatar internally to scale the user image within the list item properly FIXES #2045
1 parent dba7a2c commit 3aadc0e

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed
 

‎packages/main/src/StandardListItem.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
{{#*inline "imageBegin"}}
2121
{{#if displayImage}}
22-
<img part="img" src="{{image}}" class="ui5-li-img">
22+
<ui5-avatar image="{{image}}" image-fit-type="Contain" shape="Square" class="ui5-li-img"></ui5-avatar>
2323
{{/if}}
2424
{{/inline}}
2525

‎packages/main/src/StandardListItem.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
22
import ListItem from "./ListItem.js";
33
import Icon from "./Icon.js";
4+
import Avatar from "./Avatar.js";
45
import StandardListItemTemplate from "./generated/templates/StandardListItemTemplate.lit.js";
56

67
/**
@@ -151,7 +152,10 @@ class StandardListItem extends ListItem {
151152
}
152153

153154
static async onDefine() {
154-
await Icon.define();
155+
await Promise.all([
156+
Icon.define(),
157+
Avatar.define(),
158+
]);
155159
}
156160
}
157161

‎packages/main/src/themes/Avatar.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
height: 3rem;
1212
width: 3rem;
1313
border-radius: 50%;
14-
border: var(--ui5-avatar-initials-border);
14+
border: var(--ui5-avatar-initials-border);
1515
outline: none;
1616
color: var(--ui5-avatar-initials-color);
1717
}
@@ -22,11 +22,11 @@
2222
}
2323

2424
:host([shape="Square"]) .ui5-avatar-root {
25-
border-radius: .25rem;
25+
border-radius: inherit;
2626
}
2727

2828
:host([shape="Square"]) .ui5-avatar-img {
29-
border-radius: .25rem;
29+
border-radius: inherit;
3030
}
3131

3232
/* Sizes */

‎packages/main/src/themes/ListItem.css

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
height: var(--_ui5_list_item_img_size);
107107
min-height: var(--_ui5_list_item_img_size);
108108
margin: var(--_ui5_list_item_img_margin);
109+
border-radius: 0;
109110
}
110111

111112
.ui5-li-icon {

‎packages/main/test/pages/List.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ui5-list id="infiniteScrollEx" style="height: 300px" infinite-scroll>
2121
<ui5-li-groupheader>New Items</ui5-li-groupheader>
2222
<ui5-li image="./img/HT-1000.jpg" icon="navigation-right-arrow" info="Available">Voluptate do eu cupidatat elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore.</ui5-li>
23-
<ui5-li image="./img/HT-1010.jpg" icon="navigation-right-arrow" info="Re-stock" description="#12331232131" info-state="Error">Laptop Lenovo</ui5-li>
23+
<ui5-li image="./img/portrait.jpg" icon="navigation-right-arrow" info="Re-stock" description="#12331232131" info-state="Error">Laptop Lenovo</ui5-li>
2424
<ui5-li image="./img/HT-1022.jpg" icon="navigation-right-arrow" info="Re-stock" description="#12331232131" info-state="Information">IPhone 3</ui5-li>
2525

2626
<ui5-li-groupheader>Discounted Items</ui5-li-groupheader>
76.1 KB
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.