Skip to content

Commit ef35f84

Browse files
authored
fix(ui5-li-notification): It is now possible to not have a description (#2744)
1 parent e666353 commit ef35f84

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

packages/fiori/src/NotificationListItem.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ class NotificationListItem extends NotificationListItemBase {
401401
}
402402

403403
const headingWouldOverflow = this.headingHeight > this._headingOverflowHeight;
404-
const descWouldOverflow = this.descriptionHeight > this._descOverflowHeight;
404+
const descWouldOverflow = this.hasDesc && this.descriptionHeight > this._descOverflowHeight;
405405
const overflows = headingWouldOverflow || descWouldOverflow;
406406

407407
if (this._showMorePressed && overflows) {
@@ -411,7 +411,7 @@ class NotificationListItem extends NotificationListItemBase {
411411

412412
if (this.headingOverflows || this.descriptionOverflows) {
413413
this._headingOverflowHeight = this.headingHeight;
414-
this._descOverflowHeight = this.descriptionHeight;
414+
this._descOverflowHeight = this.hasDesc ? this.descriptionHeight : 0;
415415
this._showMore = true;
416416
return;
417417
}

packages/fiori/test/pages/NotificationListItem.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ <h3>Events on ui5-list level</h3>
182182
<span slot="footnotes">John Doe</span>
183183
<span slot="footnotes">2 Days</span>
184184
<span slot="footnotes">Other stuff</span>
185-
185+
186186
<ui5-notification-action id="acceptBtnInPopover" icon="accept" text="Accept" slot="actions"></ui5-notification-action>
187187
<ui5-notification-action
188188
id="rejectBtnInPopover"
@@ -192,41 +192,41 @@ <h3>Events on ui5-list level</h3>
192192
slot="actions">
193193
</ui5-notification-action>
194194
</ui5-li-notification>
195-
195+
196196
<ui5-li-notification
197197
show-close
198198
heading="New order (#2525) With a very long title - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent feugiat, turpis vel scelerisque pharetra, tellus odio vehicula dolor, nec elementum lectus turpis at nunc."
199199
priority="High"
200200
>
201201
And with a very long description and long labels of the action buttons - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent feugiat, turpis vel scelerisque pharetra, tellus odio vehicula dolor, nec elementum lectus turpis at nunc.
202202
<ui5-avatar icon="employee" size="XS" slot="avatar"></ui5-avatar>
203-
203+
204204
<span slot="footnotes">Office Notifications</span>
205205
<span slot="footnotes">3 Days</span>
206-
206+
207207
<ui5-notification-action id="acceptBtn2InPopover" icon="accept" text="Accept" slot="actions"></ui5-notification-action>
208208
</ui5-li-notification>
209-
209+
210210
<ui5-li-notification
211211
heading="New order (#2565) With a very long title - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent feugiat, turpis vel scelerisque pharetra, tellus odio vehicula dolor, nec elementum lectus turpis at nunc."
212212
priority="Medium"
213213
>
214214
Short description
215215
<ui5-avatar initials="JS" size="XS" slot="avatar"></ui5-avatar>
216-
216+
217217
<span slot="footnotes">Patricia Clarck</span>
218218
<span slot="footnotes">3 Days</span>
219-
219+
220220
<ui5-notification-action icon="accept" text="Accept All Requested Information" slot="actions"></ui5-notification-action>
221221
<ui5-notification-action icon="decline" design="Negative" text="Reject All Requested Information" slot="actions"></ui5-notification-action>
222222
</ui5-li-notification>
223-
223+
224224
<ui5-li-notification heading="New order (#2523)">
225225
<div>. With a very long description - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent feugiat, turpis vel scelerisque pharetra, tellus odio vehicula dolor, nec elementum lectus turpis at nunc.</div>
226-
226+
227227
<span slot="footnotes">John SMith</span>
228228
<span slot="footnotes">3 Days</span>
229-
229+
230230
<ui5-notification-action icon="message-error" design="Negative" text="Reject" slot="actions"></ui5-notification-action>
231231
</ui5-li-notification>
232232
</ui5-list>

0 commit comments

Comments
 (0)