Skip to content

fix(ui5-upload-collection): prevent item-delete event from firing when item name is deleted #11625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 5, 2025
Merged

fix(ui5-upload-collection): prevent item-delete event from firing when item name is deleted #11625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d5bfe0
fix(ui5-upload-collection): item delete event is now not fired when i…
dimovpetar May 30, 2025
d6b5f5b
Merge branch 'main' of github.com:SAP/ui5-webcomponents into fix_uci_…
dimovpetar May 30, 2025
2a712db
fix: broaden targets that supress delete event
dimovpetar Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 57 additions & 35 deletions packages/fiori/cypress/specs/UploadCollection.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,46 @@
import "@ui5/webcomponents/dist/Select.js";
import "@ui5/webcomponents/dist/Option.js";
import UploadCollection from "../../src/UploadCollection.js";
import UploadCollectionItem from "../../src/UploadCollectionItem.js";
import Label from "@ui5/webcomponents/dist/Label.js";
import Title from "@ui5/webcomponents/dist/Title.js";
import Button from "@ui5/webcomponents/dist/Button.js";
import FileUploader from "@ui5/webcomponents/dist/FileUploader.js";
import Icon from "@ui5/webcomponents/dist/Icon.js";
import documentTextIcon from "@ui5/webcomponents-icons/dist/document-text.js";

function UploadCollectionSample() {
return <UploadCollection id="uploadCollection" accessibleName="Uploaded (4)">
<div slot="header" class="header">
<div slot="header">
<Title id="uploadCollectionTitle">Uploaded (4)</Title>
<Label>Add new files and press to start uploading pending files:</Label>
<Button id="startUploading">Start</Button>
<div class="spacer"></div>
<FileUploader id="fileUploader" hideInput={true} multiple={true}>
<Button icon="add" design="Transparent"></Button>
</FileUploader>
</div>
<UploadCollectionItem
id="firstItem"
fileName="LaptopHT-1000.jpg"
fileNameClickable={true}
uploadState="Complete"
>
<img src="./img/HT-1000.jpg" slot="thumbnail" />
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
File name is clickable.
</UploadCollectionItem>
<UploadCollectionItem
id="secondItem"
fileName=".gitignore"
disable-delete-button
disableDeleteButton={true}
uploadState="Complete"
>
<Icon name="customize" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
You cannot delete this file.
</UploadCollectionItem>
<UploadCollectionItem
id="latestReportsPdf"
fileName="latest.reports.pdf"
uploadState="Complete"
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
Some description.
</UploadCollectionItem>
<UploadCollectionItem
id="reportPdf"
fileName="report.pdf"
uploadState="Complete"
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
Some description.
</UploadCollectionItem>
<UploadCollectionItem
Expand All @@ -59,30 +49,30 @@ function UploadCollectionSample() {
uploadState="Complete"
disabled={true}
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
Some description.
</UploadCollectionItem>
<UploadCollectionItem
id="noFileExtension"
fileName="noextension"
uploadState="Complete"
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
</UploadCollectionItem>
<UploadCollectionItem
id="keyboardNavigation"
fileName="Graph.docx"
hideDeleteButton={true}
uploadState="Complete"
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
</UploadCollectionItem>
</UploadCollection>;
}

function UploadCollectionStatesSample() {
return <UploadCollection id="uploadCollectionStates">
<div class="header" slot="header">
<div slot="header">
<Title>Upload States</Title>
</div>
<UploadCollectionItem
Expand All @@ -91,7 +81,6 @@ function UploadCollectionStatesSample() {
fileNameClickable={true}
uploadState="Complete"
>
<img src="./img/HT-1000.jpg" slot="thumbnail" />
uploadState="Complete"
</UploadCollectionItem>

Expand All @@ -103,7 +92,6 @@ function UploadCollectionStatesSample() {
uploadState="Uploading"
progress={37}
>
<img src="./img/HT-1000.jpg" slot="thumbnail" />
uploadState="Uploading"
</UploadCollectionItem>

Expand All @@ -115,7 +103,6 @@ function UploadCollectionStatesSample() {
uploadState="Error"
progress={89}
>
<img src="./img/HT-1000.jpg" slot="thumbnail" />
uploadState="Uploading" with hidden terminate button
</UploadCollectionItem>

Expand All @@ -126,7 +113,6 @@ function UploadCollectionStatesSample() {
uploadState="Uploading"
progress={89}
>
<img src="./img/HT-1000.jpg" slot="thumbnail" />
uploadState="Uploading" with hidden terminate button
</UploadCollectionItem>

Expand All @@ -137,7 +123,7 @@ function UploadCollectionStatesSample() {
uploadState="Error"
progress={59}
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Error"
</UploadCollectionItem>

Expand All @@ -146,7 +132,7 @@ function UploadCollectionStatesSample() {
fileName="noextension"
type="Detail"
>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Ready" (default)
</UploadCollectionItem>
</UploadCollection>;
Expand Down Expand Up @@ -203,37 +189,37 @@ describe("UploadCollection Rendering", () => {
it("Tests the visibility of buttons", () => {
cy.mount(
<UploadCollection id="uploadCollection3">
<div class="header" slot="header">
<div slot="header">
<Title>Hidden buttons</Title>
</div>

<UploadCollectionItem id="uc3-default" fileName="File name">
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
Default, delete button always visible
</UploadCollectionItem>

<UploadCollectionItem id="uc3-default-hidden-delete" fileName="File name" hideDeleteButton={true}>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
Default, delete button hidden
</UploadCollectionItem>

<UploadCollectionItem id="uc3-error" fileName="File name" uploadState="Error">
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Error" with retry button visible by default
</UploadCollectionItem>

<UploadCollectionItem id="uc3-error-hidden-retry" fileName="File name" uploadState="Error" hideRetryButton>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Error" with hidden retry button
</UploadCollectionItem>

<UploadCollectionItem id="uc3-uploading" fileName="File name" uploadState="Uploading">
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Uploading" with terminate button visible by default
</UploadCollectionItem>

<UploadCollectionItem id="uc3-uploading-hidden-terminate" fileName="File name" uploadState="Uploading" hideTerminateButton={true}>
<Icon name="document-text" slot="thumbnail"></Icon>
<Icon name={documentTextIcon} slot="thumbnail"></Icon>
uploadState="Uploading" with hidden terminate button
</UploadCollectionItem>
</UploadCollection>
Expand Down Expand Up @@ -387,6 +373,42 @@ describe("Events", () => {
.should("not.exist");
});

it.only("Tests that 'item-delete' is NOT fired when 'DELETE' key is pressed during rename", () => {
const itemDeleteStub = cy.stub();

cy.mount(
<UploadCollection id="uploadCollection" onItemDelete={itemDeleteStub}>
<UploadCollectionItem id="item" fileName="File name" type="Detail"/>
</UploadCollection>
);

cy.get("#item")
.shadow()
.find(".ui5-uci-root")
.should("have.attr", "tabindex", "0");

cy.get("#item")
.shadow()
.find(".ui5-uci-root")
.realClick();

cy.get("#item")
.should("have.focus");

cy.realPress("F2");
cy.realPress("Enter");

cy.get("#item")
.shadow()
.find("#ui5-uci-edit-input")
.should("be.focused");

cy.realPress("Delete");

cy.wrap(itemDeleteStub)
.should("not.have.been.called");
});

it("Tests that item fires 'retry'", () => {
const retryEventStub = cy.stub();

Expand Down Expand Up @@ -488,7 +510,7 @@ describe("Edit - various file names", () => {
it("Tests that dots are preserved in the file name", () => {
cy.mount(
<UploadCollection id="uploadCollection">
<UploadCollectionItem id="item" fileName="File name" type="Detail" upload-state="Error" />
<UploadCollectionItem id="item" fileName="File name" type="Detail" uploadState="Error" />
</UploadCollection>);

cy.get("#item")
Expand Down
4 changes: 4 additions & 0 deletions packages/fiori/src/UploadCollectionItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ class UploadCollectionItem extends ListItem {
_onkeyup(e: KeyboardEvent) {
super._onkeyup(e);

if (this.getFocusDomRef()!.matches(":has(:focus-within)")) {
return;
}

if (isDelete(e) && !this.disableDeleteButton && !this.hideDeleteButton && !this.disabled) {
this._onDelete();
}
Expand Down
Loading