From e8d85ef3002e29aa998644142528cb5770542488 Mon Sep 17 00:00:00 2001 From: Nikola Anachkov Date: Fri, 7 Mar 2025 15:14:13 +0200 Subject: [PATCH 1/2] fix(ui5-dynamic-page): validate aria-controls reference before rendering --- packages/fiori/src/DynamicPage.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/fiori/src/DynamicPage.ts b/packages/fiori/src/DynamicPage.ts index 3756e044f0d9..0ca11d20c28e 100644 --- a/packages/fiori/src/DynamicPage.ts +++ b/packages/fiori/src/DynamicPage.ts @@ -242,9 +242,10 @@ class DynamicPage extends UI5Element { } get _accAttributesForHeaderActions() { - return { - controls: `${this._id}-header` as Lowercase, - }; + const headerElement = this.querySelector(`#${this._id}-header`); + return headerElement ? { + controls: `${this._id}-header` as Lowercase, + } : {}; } get headerTabIndex() { From c5910e572bd2cfa2da99e1d4d41d31773335d0fc Mon Sep 17 00:00:00 2001 From: Nikola Anachkov Date: Thu, 27 Mar 2025 16:57:15 +0200 Subject: [PATCH 2/2] fix: remove accAttributesForHeaderActions --- packages/fiori/src/DynamicPage.ts | 7 ------- packages/fiori/src/DynamicPageTemplate.tsx | 1 - 2 files changed, 8 deletions(-) diff --git a/packages/fiori/src/DynamicPage.ts b/packages/fiori/src/DynamicPage.ts index 6a417594982d..d838795cc228 100644 --- a/packages/fiori/src/DynamicPage.ts +++ b/packages/fiori/src/DynamicPage.ts @@ -241,13 +241,6 @@ class DynamicPage extends UI5Element { return !this._headerSnapped; } - get _accAttributesForHeaderActions() { - const headerElement = this.querySelector(`#${this._id}-header`); - return headerElement ? { - controls: `${this._id}-header` as Lowercase, - } : {}; - } - get headerTabIndex() { return (this._headerSnapped || this.showHeaderInStickArea) ? -1 : 0; } diff --git a/packages/fiori/src/DynamicPageTemplate.tsx b/packages/fiori/src/DynamicPageTemplate.tsx index 14687b242463..4406bb89c152 100644 --- a/packages/fiori/src/DynamicPageTemplate.tsx +++ b/packages/fiori/src/DynamicPageTemplate.tsx @@ -58,7 +58,6 @@ function headerActions(this: DynamicPage) { snapped={this.headerSnapped} pinned={this.headerPinned} hidePinButton={this.hidePinButton} - accessibilityAttributes={this._accAttributesForHeaderActions} onui5-expand-button-click={this.onExpandClick} onui5-pin-button-click={this.onPinClick} onui5-expand-button-hover-in={this.onExpandHoverIn}