Skip to content

Commit 5fd731c

Browse files
TeodorTaushanovilhan007
authored andcommitted
fix(ui5-upload-collection): fix "no files" heading HTML tag (#3930)
1 parent af808d4 commit 5fd731c

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

packages/fiori/src/UploadCollection.hbs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
<slot></slot>
1616
</ui5-list>
1717
{{#if _showNoData}}
18-
<div class="uc-no-files">
18+
<div class="{{classes.noFiles}}">
1919
<div class="icon-container">
2020
<ui5-icon name="document"></ui5-icon>
2121
</div>
22-
<ui5-title level="H2" wrap>{{_noDataText}}</ui5-title>
23-
<ui5-label class="subtitle" wrap>{{_noDataDescription}}</ui5-label>
22+
<ui5-label class="title" wrapping-type="Normal">{{_noDataText}}</ui5-label>
23+
<ui5-label class="subtitle" wrapping-type="Normal">{{_noDataDescription}}</ui5-label>
2424
</div>
25-
{{else if _showDndOverlay}}
25+
{{/if}}
26+
{{#if _showDndOverlay}}
2627
<div
2728
class="{{classes.dndOverlay}}"
2829
@dragenter="{{_ondragenter}}"

packages/fiori/src/UploadCollection.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,10 @@ class UploadCollection extends UI5Element {
320320
"uc-drag-overlay": this._dndOverlayMode === UploadCollectionDnDOverlayMode.Drag,
321321
"uc-drop-overlay": this._dndOverlayMode === UploadCollectionDnDOverlayMode.Drop,
322322
},
323+
noFiles: {
324+
"uc-no-files": true,
325+
"uc-no-files-dnd-overlay": this._showDndOverlay,
326+
},
323327
};
324328
}
325329

@@ -336,7 +340,7 @@ class UploadCollection extends UI5Element {
336340
}
337341

338342
get _showNoData() {
339-
return this.items.length === 0 && !this._showDndOverlay;
343+
return this.items.length === 0;
340344
}
341345

342346
get _noDataText() {

packages/fiori/src/themes/UploadCollection.css

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,8 @@
66
position: relative;
77
}
88

9-
.ui5-uc-content.ui5-uc-content-no-data {
10-
min-height: 20rem;
11-
}
12-
139
/* No Files */
1410
.uc-no-files {
15-
position: absolute;
16-
top: 0;
17-
right: 0;
18-
left: 0;
19-
bottom: 0;
2011
box-sizing: border-box;
2112
display: flex;
2213
flex-direction: column;
@@ -27,25 +18,28 @@
2718
}
2819

2920
.uc-no-files .icon-container {
21+
display: flex;
22+
align-items: center;
23+
justify-content: center;
24+
width: 100%;
3025
height: 8rem;
3126
}
3227

3328
.uc-no-files .icon-container [ui5-icon] {
34-
font-size: 6rem;
3529
width: 6rem;
3630
height: 6rem;
3731
color: var(--sapContent_NonInteractiveIconColor);
3832
opacity: 0.5;
3933
}
4034

41-
.uc-no-files [ui5-title] {
42-
font-size: var(--ui5_upload_collection_level_2Size);
35+
.uc-no-files .title {
36+
font-size: var(--sapFontHeader2Size);
4337
color: var(--sapGroup_TitleTextColor);
4438
margin: 1rem 0;
4539
}
4640

4741
.uc-no-files .subtitle {
48-
font-size: var(--ui5_upload_collection_level_5Size);
42+
font-size: var(--sapFontHeader5Size);
4943
color: var(--sapContent_LabelColor);
5044
margin-bottom: 2rem;
5145
}
@@ -118,3 +112,7 @@
118112
.uc-drop-overlay .dnd-overlay-text {
119113
color: var(--sapContent_DragAndDropActiveColor);
120114
}
115+
116+
.uc-no-files-dnd-overlay {
117+
visibility: hidden;
118+
}

packages/fiori/src/themes/base/UploadCollection-parameters.css

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
:root {
2-
--ui5_upload_collection_level_2Size: 1.375rem;
3-
--ui5_upload_collection_level_5Size: 1rem;
42
--ui5_upload_collection_drag_overlay_border: 0.125rem dashed var(--sapContent_ForegroundBorderColor);
53
--ui5_upload_collection_drop_overlay_border: 0.125rem solid var(--sapContent_DragAndDropActiveColor);
64
--ui5_upload_collection_drop_overlay_background: transparent;

0 commit comments

Comments
 (0)