Skip to content

Commit be5ce0b

Browse files
authored
fix(ui5-upload-collection-item): properly display deleteButton slot (#10797)
1 parent c34b6ca commit be5ce0b

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

packages/fiori/cypress/specs/UploadCollection.cy.tsx

+13
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,19 @@ describe("UploadCollection Rendering", () => {
251251
cy.get("#uc3-uploading-hidden-terminate").shadow().find("ui5-button[icon=stop]").should("not.exist");
252252
});
253253

254+
it("Tests rendering of 'deleteButton' slot", () => {
255+
cy.mount(
256+
<UploadCollection id="uploadCollection">
257+
<UploadCollectionItem id="item" fileName="File name">
258+
<button slot="deleteButton" id="deleteButton">custom delete button</button>
259+
</UploadCollectionItem>
260+
</UploadCollection>
261+
);
262+
263+
cy.get("#deleteButton").should("be.visible");
264+
cy.get("#item").shadow().find(".ui5-upload-collection-deletebtn").should("not.exist");
265+
});
266+
254267
it("Tests that 'header' and 'accessible-name' get forwarded to the inner list", () => {
255268
const EXPECTED_ACC_NAME = "Uploaded (4)";
256269

packages/fiori/src/UploadCollectionItemTemplate.tsx

+13-9
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,19 @@ function listItemContent(this: UploadCollectionItem) {
125125
/>
126126
)}
127127
{!this.hideDeleteButton && (
128-
<Button
129-
class="ui5-upload-collection-deletebtn"
130-
id={`${this._id}-deleteSelectionElement`}
131-
design="Transparent"
132-
icon={declineIcon}
133-
disabled={this.disableDeleteButton}
134-
onClick={this._onDelete}
135-
tooltip={this.deleteText}
136-
/>
128+
this.hasDeleteButtonSlot ? (
129+
<slot name="deleteButton"></slot>
130+
) : (
131+
<Button
132+
class="ui5-upload-collection-deletebtn"
133+
id={`${this._id}-deleteSelectionElement`}
134+
design="Transparent"
135+
icon={declineIcon}
136+
disabled={this.disableDeleteButton}
137+
onClick={this._onDelete}
138+
tooltip={this.deleteText}
139+
/>
140+
)
137141
)}
138142
</>
139143
)}

packages/fiori/test/pages/UploadCollection.html

+6
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@
108108
>
109109
<ui5-icon name="document-text" slot="thumbnail"></ui5-icon>
110110
</ui5-upload-collection-item>
111+
<ui5-upload-collection-item
112+
file-name="Graph.docx"
113+
>
114+
<ui5-icon name="document-text" slot="thumbnail"></ui5-icon>
115+
<ui5-button slot="deleteButton">custom delete button</ui5-button>
116+
</ui5-upload-collection-item>
111117
</ui5-upload-collection>
112118

113119
<button id="tabStop1">Tab stop helper</button>

0 commit comments

Comments
 (0)