From cf3b4ad7ff72867e3532031051f1902a89cd4190 Mon Sep 17 00:00:00 2001 From: PetyaMarkovaBogdanova Date: Thu, 5 Dec 2024 14:08:36 +0200 Subject: [PATCH] fix(ui5-dynamic-page): fix header role --- packages/fiori/src/DynamicPage.hbs | 3 +-- packages/fiori/src/DynamicPageHeader.hbs | 2 +- packages/fiori/test/specs/DynamicPage.spec.js | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/fiori/src/DynamicPage.hbs b/packages/fiori/src/DynamicPage.hbs index c037ba01571b..847eb676f92d 100644 --- a/packages/fiori/src/DynamicPage.hbs +++ b/packages/fiori/src/DynamicPage.hbs @@ -5,7 +5,6 @@ id="{{_id}}-header" aria-label="{{_headerLabel}}" aria-expanded="{{_headerExpanded}}" - role="region" @ui5-_toggle-title={{onToggleTitle}} > @@ -17,7 +16,7 @@ {{> header-actions}} {{/if}} - + {{#if headerInContent}} {{/if}} diff --git a/packages/fiori/src/DynamicPageHeader.hbs b/packages/fiori/src/DynamicPageHeader.hbs index ea608438ca76..ed67ab7843cb 100644 --- a/packages/fiori/src/DynamicPageHeader.hbs +++ b/packages/fiori/src/DynamicPageHeader.hbs @@ -1,3 +1,3 @@ -
+
diff --git a/packages/fiori/test/specs/DynamicPage.spec.js b/packages/fiori/test/specs/DynamicPage.spec.js index 0f70c5b6380f..e3fa40b14c57 100644 --- a/packages/fiori/test/specs/DynamicPage.spec.js +++ b/packages/fiori/test/specs/DynamicPage.spec.js @@ -406,6 +406,7 @@ describe("ARIA attributes", () => { const title = await browser.$("#page ui5-dynamic-page-title"); const titleFocusArea = await title.shadow$(".ui5-dynamic-page-title-focus-area"); const headerWrapper = await page.shadow$(".ui5-dynamic-page-title-header-wrapper"); + const headerRoot = await page.$("ui5-dynamic-page-header").shadow$(".ui5-dynamic-page-header-root"); const headerActions = await page.shadow$("ui5-dynamic-page-header-actions"); const expandButton = await headerActions.shadow$("ui5-button.ui5-dynamic-page-header-action-expand"); const pinButton = await headerActions.shadow$("ui5-toggle-button.ui5-dynamic-page-header-action-pin"); @@ -418,7 +419,7 @@ describe("ARIA attributes", () => { "aria-label value is correct"); assert.strictEqual(await headerWrapper.getAttribute("aria-expanded"), "true", "aria-expanded value is correct"); - assert.strictEqual(await headerWrapper.getAttribute("role"), "region", + assert.strictEqual(await headerRoot.getAttribute("role"), "region", "header role is correct"); assert.strictEqual(await titleFocusArea.getAttribute("aria-expanded"), "true", @@ -453,8 +454,6 @@ describe("ARIA attributes", () => { "aria-label value is correct"); assert.strictEqual(await headerWrapper.getAttribute("aria-expanded"), "false", "aria-expanded value is correct"); - assert.strictEqual(await headerWrapper.getAttribute("role"), "region", - "role is correct"); assert.strictEqual(await titleFocusArea.getAttribute("aria-expanded"), "false", "aria-expanded value is correct");