diff --git a/packages/main/src/List.hbs b/packages/main/src/List.hbs index 20e036b25617..3ffa7d4e7653 100644 --- a/packages/main/src/List.hbs +++ b/packages/main/src/List.hbs @@ -19,7 +19,7 @@
@@ -96,6 +96,12 @@ @mouseup="{{_onLoadMoreMouseup}}" growing-button-inner > + {{#if loading}} + + + {{/if}} {{_growingButtonText}}
diff --git a/packages/main/src/List.ts b/packages/main/src/List.ts index 60b6d5979d09..c3b78212dcf9 100644 --- a/packages/main/src/List.ts +++ b/packages/main/src/List.ts @@ -652,6 +652,10 @@ class List extends UI5Element { return this.getItems().length !== 0; } + get showBusyIndicatorOverlay() { + return !this.growsWithButton && this.loading; + } + get showNoDataText() { return !this.hasData && this.noDataText; } diff --git a/packages/main/src/themes/GrowingButton.css b/packages/main/src/themes/GrowingButton.css index ad4d8cb8a345..1574536cdaa7 100644 --- a/packages/main/src/themes/GrowingButton.css +++ b/packages/main/src/themes/GrowingButton.css @@ -13,7 +13,7 @@ display: flex; align-items: center; justify-content: center; - flex-direction: column; + flex-direction: row; min-height: var(--_ui5_load_more_text_height); width: 100%; color: var(--sapButton_TextColor); @@ -46,7 +46,6 @@ [growing-button-text], [growing-button-subtext] { - width: 100%; text-align: center; font-family: "72override", var(--sapFontFamily); white-space: nowrap; @@ -62,6 +61,10 @@ font-weight: bold; } +:host([loading]) [growing-button-text]{ + padding-left: 0.5rem; +} + [growing-button-subtext] { font-size: var(--sapFontSize); padding: var(--_ui5_load_more_desc_padding);