Skip to content

Commit 549148d

Browse files
authored
fix(ui5-upload-collection): minimum height is guaranteed in no-data mode (#1683)
1 parent 168e505 commit 549148d

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

packages/fiori/src/UploadCollection.hbs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
<div class="ui5-uc-root">
32
<div class="ui5-uc-header">
43
<slot name="header"></slot>
54
</div>
6-
<div class="ui5-uc-content">
5+
<div class="{{classes.content}}">
76
<ui5-list
87
mode="{{mode}}"
98
@ui5-selectionChange="{{_onSelectionChange}}"
@@ -32,4 +31,4 @@
3231
</div>
3332
{{/if}}
3433
</div>
35-
</div>
34+
</div>

packages/fiori/src/UploadCollection.js

+4
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ class UploadCollection extends UI5Element {
273273

274274
get classes() {
275275
return {
276+
content: {
277+
"ui5-uc-content": true,
278+
"ui5-uc-content-no-data": this._showNoData,
279+
},
276280
dndOverlay: {
277281
"uc-dnd-overlay": true,
278282
"uc-drag-overlay": this._dndOverlayMode === UploadCollectionDnDOverlayMode.Drag,

packages/fiori/src/themes/UploadCollection.css

+6-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
flex: 1 1 auto;
1414
}
1515

16+
.ui5-uc-content.ui5-uc-content-no-data {
17+
min-height: 20rem;
18+
}
19+
1620
/* No Files */
1721
.uc-no-files {
1822
position: absolute;
@@ -50,7 +54,7 @@
5054
.uc-no-files .subtitle {
5155
font-size: var(--ui5_upload_collection_level_5Size);
5256
color: var(--sapContent_LabelColor);
53-
margin-bottom: 2rem;
57+
margin-bottom: 2rem;
5458
}
5559

5660
/* Drag and Drop */
@@ -120,4 +124,4 @@
120124
.uc-drop-overlay ui5-icon,
121125
.uc-drop-overlay .dnd-overlay-text {
122126
color: var(--sapContent_DragAndDropActiveColor);
123-
}
127+
}

packages/fiori/test/pages/UploadCollection.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
66
<title>UploadCollection</title>
7+
<script>
8+
delete Document.prototype.adoptedStyleSheets
9+
</script>
710

8-
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
11+
12+
<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
913
<script src="../../resources/bundle.esm.js" type="module"></script>
1014
<script nomodule src="../../resources/bundle.es5.js"></script>
1115

@@ -103,7 +107,7 @@
103107
</ui5-upload-collection-item>
104108
</ui5-upload-collection>
105109

106-
<ui5-upload-collection id="uploadCollectionDnD" style="height: 30rem;">
110+
<ui5-upload-collection id="uploadCollectionDnD">
107111
<div class="header" slot="header">
108112
<ui5-title>Attachments (0)</ui5-title>
109113
<div class="spacer"></div>

0 commit comments

Comments
 (0)