From ade4d6b3575d48042d5ce3fe77754b145d3fbe4b Mon Sep 17 00:00:00 2001 From: Petar Dimov Date: Fri, 5 Jul 2024 13:41:28 +0300 Subject: [PATCH 1/3] fix(ui5-upload-collection): make empty upload collection focusable --- packages/fiori/src/UploadCollection.hbs | 16 ++++++++-------- packages/fiori/src/UploadCollection.ts | 2 ++ packages/fiori/src/themes/UploadCollection.css | 4 ++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/fiori/src/UploadCollection.hbs b/packages/fiori/src/UploadCollection.hbs index 2b8e17d66849..da7178a347db 100644 --- a/packages/fiori/src/UploadCollection.hbs +++ b/packages/fiori/src/UploadCollection.hbs @@ -13,15 +13,15 @@ {{!-- forward slot header to inner list slot header --}} + {{#if _showNoData}} + + + {{_noDataText}} + {{_noDataDescription}} + + + {{/if}} - {{#if _showNoData}} -
- - {{_noDataText}} - {{_noDataDescription}} - -
- {{/if}} {{#if _showDndOverlay}}
Date: Fri, 5 Jul 2024 16:54:30 +0300 Subject: [PATCH 2/3] test: add test --- .../fiori/test/pages/UploadCollection.html | 4 ++ .../fiori/test/specs/UploadCollection.spec.js | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/packages/fiori/test/pages/UploadCollection.html b/packages/fiori/test/pages/UploadCollection.html index 20bfc2ab41b1..c5d81565e090 100644 --- a/packages/fiori/test/pages/UploadCollection.html +++ b/packages/fiori/test/pages/UploadCollection.html @@ -93,6 +93,8 @@ + +
Attachments (0) @@ -103,6 +105,8 @@
+ +
diff --git a/packages/fiori/test/specs/UploadCollection.spec.js b/packages/fiori/test/specs/UploadCollection.spec.js index 6a1740282d96..9468da1d9eaf 100644 --- a/packages/fiori/test/specs/UploadCollection.spec.js +++ b/packages/fiori/test/specs/UploadCollection.spec.js @@ -191,6 +191,47 @@ describe("UploadCollection", () => { }); }); + describe("Keyboard handling", () => { + const isActiveElement = (element) => { + return browser.executeAsync((expectedActiveElem, done) => { + const activeElement = document.activeElement; + done(activeElement.shadowRoot.activeElement === expectedActiveElem); + }, element); + }; + + it("Item tab order", async () => { + const item = await browser.$("#hiddenFileName"); + + await item.click(); + assert.ok(await item.isFocused(), "Item should be focused"); + + await browser.keys("Tab"); + assert.ok(await isActiveElement(await item.shadow$("[ui5-button][icon=refresh]")), "Retry button should be focused"); + + await browser.keys("Tab"); + assert.ok(await isActiveElement(await item.shadow$(".ui5-uci-edit")), "Edit button should be focused"); + + await browser.keys("Tab"); + assert.ok(await isActiveElement(await item.shadow$(".ui5-upload-collection-deletebtn")), "Delete button should be focused"); + }); + + it("Tab through empty upload collection", async () => { + const tabStop1 = await browser.$("#tabStop1"); + const tabStop2 = await browser.$("#tabStop2"); + const uploadCollection = await browser.$("#uploadCollectionDnD"); + + await tabStop1.click(); + await browser.keys("Tab"); + await browser.keys("Tab"); + + assert.ok(await isActiveElement(await uploadCollection.shadow$(".uc-no-files")), "No files item should be focused"); + + await browser.keys("Tab"); + + assert.ok(await tabStop2.isFocused(), "Should have passed the upload collection and focused the next tab stop"); + }); + }); + describe("Edit - various file names", async () => { before(async () => { await browser.url(`test/pages/UploadCollection.html`); From ad143821a4981b9d24bc42d259b369f14de94598 Mon Sep 17 00:00:00 2001 From: Petar Dimov Date: Thu, 18 Jul 2024 14:54:20 +0300 Subject: [PATCH 3/3] fix: make list item inactive --- packages/fiori/src/UploadCollection.hbs | 4 ++-- packages/fiori/src/themes/UploadCollection.css | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/fiori/src/UploadCollection.hbs b/packages/fiori/src/UploadCollection.hbs index da7178a347db..341bc1009712 100644 --- a/packages/fiori/src/UploadCollection.hbs +++ b/packages/fiori/src/UploadCollection.hbs @@ -14,8 +14,8 @@ {{#if _showNoData}} - - + + {{_noDataText}} {{_noDataDescription}} diff --git a/packages/fiori/src/themes/UploadCollection.css b/packages/fiori/src/themes/UploadCollection.css index 20fb1ec8b206..21ca5e2a4a5a 100644 --- a/packages/fiori/src/themes/UploadCollection.css +++ b/packages/fiori/src/themes/UploadCollection.css @@ -11,10 +11,6 @@ background-color: var(--sapGroup_ContentBackground); } -.uc-no-files-illustration { - pointer-events: none; -} - /* Drag and Drop */ .uc-dnd-overlay { position: absolute;